gpu_renderer: update virglrenderer bindings

Results of:
  gpu_renderer/src/generated/generate --sysroot /build/$BOARD
  bin/fmt

BUG=chromium:972237
TEST=builds

Change-Id: I75063345a6cc77b54f51cfdaf244e5f73dffefcb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1657290
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: David Riley <davidriley@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>

7 files changed, 47 insertions, 45 deletions

diff --git a/gpu_renderer/src/generated/epoxy_egl.rs b/gpu_renderer/src/generated/epoxy_egl.rs
index b998b06..4c3f392 100644
--- a/gpu_renderer/src/generated/epoxy_egl.rs
+++ b/gpu_renderer/src/generated/epoxy_egl.rs
@@ -1,7 +1,3 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
 /* automatically generated by rust-bindgen */
 
 #[link(name = "epoxy")]
diff --git a/gpu_renderer/src/generated/generate.py b/gpu_renderer/src/generated/generate.py
index f89c857..1acf839 100755
--- a/gpu_renderer/src/generated/generate.py
+++ b/gpu_renderer/src/generated/generate.py
@@ -26,7 +26,8 @@ END_COLOR = '\033[0m'
 
 verbose = False
 
-def generate_module(module_name, whitelist, header, clang_args, lib_name):
+def generate_module(module_name, whitelist, header, clang_args, lib_name,
+                    derive_default):
   args = [
     'bindgen',
     '--no-layout-tests',
@@ -42,6 +43,9 @@ def generate_module(module_name, whitelist, header, clang_args, lib_name):
     args.extend(['--raw-line',
                  '#[link(name = "{}")] extern {{}}'.format(lib_name)])
 
+  if derive_default:
+    args.append('--with-derive-default')
+
   args.extend([header, '--'])
   args.extend(clang_args)
 
@@ -118,6 +122,7 @@ def main(argv):
       os.path.join(opts.sysroot, 'usr/include/virgl/virglrenderer.h'),
       clang_args,
       'virglrenderer',
+      True,
     ),
     (
       'epoxy_egl',
@@ -125,6 +130,7 @@ def main(argv):
       os.path.join(opts.sysroot, 'usr/include/epoxy/egl.h'),
       clang_args,
       'epoxy',
+      False,
     ),
     (
       'virgl_protocol',
@@ -132,6 +138,7 @@ def main(argv):
       os.path.join(virgl_src_dir, 'src/virgl_protocol.h'),
       clang_args,
       None,
+      False,
     ),
     (
       'p_defines',
@@ -139,6 +146,7 @@ def main(argv):
       os.path.join(virgl_src_dir, 'src/gallium/include/pipe/p_defines.h'),
       clang_args,
       None,
+      False,
     ),
     (
       'p_format',
@@ -146,6 +154,7 @@ def main(argv):
       os.path.join(virgl_src_dir, 'src/gallium/include/pipe/p_format.h'),
       clang_args,
       None,
+      False,
     ),
   )
 
diff --git a/gpu_renderer/src/generated/mod.rs b/gpu_renderer/src/generated/mod.rs
index 69e3ac4..edc49ce 100644
--- a/gpu_renderer/src/generated/mod.rs
+++ b/gpu_renderer/src/generated/mod.rs
@@ -1,7 +1,3 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
 /* generated by generate.py */
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
diff --git a/gpu_renderer/src/generated/p_defines.rs b/gpu_renderer/src/generated/p_defines.rs
index 637179a..03b9fdb 100644
--- a/gpu_renderer/src/generated/p_defines.rs
+++ b/gpu_renderer/src/generated/p_defines.rs
@@ -1,7 +1,3 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
 /* automatically generated by rust-bindgen */
 
 pub const _POSIX_PIPE_BUF: u32 = 512;
@@ -30,22 +26,6 @@ pub const PIPE_BLEND_SUBTRACT: u32 = 1;
 pub const PIPE_BLEND_REVERSE_SUBTRACT: u32 = 2;
 pub const PIPE_BLEND_MIN: u32 = 3;
 pub const PIPE_BLEND_MAX: u32 = 4;
-pub const PIPE_LOGICOP_CLEAR: u32 = 0;
-pub const PIPE_LOGICOP_NOR: u32 = 1;
-pub const PIPE_LOGICOP_AND_INVERTED: u32 = 2;
-pub const PIPE_LOGICOP_COPY_INVERTED: u32 = 3;
-pub const PIPE_LOGICOP_AND_REVERSE: u32 = 4;
-pub const PIPE_LOGICOP_INVERT: u32 = 5;
-pub const PIPE_LOGICOP_XOR: u32 = 6;
-pub const PIPE_LOGICOP_NAND: u32 = 7;
-pub const PIPE_LOGICOP_AND: u32 = 8;
-pub const PIPE_LOGICOP_EQUIV: u32 = 9;
-pub const PIPE_LOGICOP_NOOP: u32 = 10;
-pub const PIPE_LOGICOP_OR_INVERTED: u32 = 11;
-pub const PIPE_LOGICOP_COPY: u32 = 12;
-pub const PIPE_LOGICOP_OR_REVERSE: u32 = 13;
-pub const PIPE_LOGICOP_OR: u32 = 14;
-pub const PIPE_LOGICOP_SET: u32 = 15;
 pub const PIPE_MASK_R: u32 = 1;
 pub const PIPE_MASK_G: u32 = 2;
 pub const PIPE_MASK_B: u32 = 4;
@@ -230,6 +210,23 @@ pub const PIPE_ERROR_RETRY: pipe_error = -4;
 /// - A negative value always means failure.
 /// - The meaning of a positive value is function dependent.
 pub type pipe_error = i32;
+pub const PIPE_LOGICOP_CLEAR: pipe_logicop = 0;
+pub const PIPE_LOGICOP_NOR: pipe_logicop = 1;
+pub const PIPE_LOGICOP_AND_INVERTED: pipe_logicop = 2;
+pub const PIPE_LOGICOP_COPY_INVERTED: pipe_logicop = 3;
+pub const PIPE_LOGICOP_AND_REVERSE: pipe_logicop = 4;
+pub const PIPE_LOGICOP_INVERT: pipe_logicop = 5;
+pub const PIPE_LOGICOP_XOR: pipe_logicop = 6;
+pub const PIPE_LOGICOP_NAND: pipe_logicop = 7;
+pub const PIPE_LOGICOP_AND: pipe_logicop = 8;
+pub const PIPE_LOGICOP_EQUIV: pipe_logicop = 9;
+pub const PIPE_LOGICOP_NOOP: pipe_logicop = 10;
+pub const PIPE_LOGICOP_OR_INVERTED: pipe_logicop = 11;
+pub const PIPE_LOGICOP_COPY: pipe_logicop = 12;
+pub const PIPE_LOGICOP_OR_REVERSE: pipe_logicop = 13;
+pub const PIPE_LOGICOP_OR: pipe_logicop = 14;
+pub const PIPE_LOGICOP_SET: pipe_logicop = 15;
+pub type pipe_logicop = u32;
 pub const PIPE_BUFFER: pipe_texture_target = 0;
 pub const PIPE_TEXTURE_1D: pipe_texture_target = 1;
 pub const PIPE_TEXTURE_2D: pipe_texture_target = 2;
diff --git a/gpu_renderer/src/generated/p_format.rs b/gpu_renderer/src/generated/p_format.rs
index 709fa4d..b72ccaf 100644
--- a/gpu_renderer/src/generated/p_format.rs
+++ b/gpu_renderer/src/generated/p_format.rs
@@ -1,7 +1,3 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
 /* automatically generated by rust-bindgen */
 
 pub const PIPE_FORMAT_NONE: pipe_format = 0;
diff --git a/gpu_renderer/src/generated/virgl_protocol.rs b/gpu_renderer/src/generated/virgl_protocol.rs
index 8d09d61..d3c3de2 100644
--- a/gpu_renderer/src/generated/virgl_protocol.rs
+++ b/gpu_renderer/src/generated/virgl_protocol.rs
@@ -1,7 +1,3 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
 /* automatically generated by rust-bindgen */
 
 pub const VIRGL_QUERY_STATE_NEW: u32 = 0;
@@ -239,6 +235,10 @@ pub const VIRGL_TRANSFER_FROM_HOST: u32 = 2;
 pub const VIRGL_TRANSFER3D_SIZE: u32 = 13;
 pub const VIRGL_TRANSFER3D_DATA_OFFSET: u32 = 12;
 pub const VIRGL_TRANSFER3D_DIRECTION: u32 = 13;
+pub const VIRGL_COPY_TRANSFER3D_SIZE: u32 = 14;
+pub const VIRGL_COPY_TRANSFER3D_SRC_RES_HANDLE: u32 = 12;
+pub const VIRGL_COPY_TRANSFER3D_SRC_RES_OFFSET: u32 = 13;
+pub const VIRGL_COPY_TRANSFER3D_SYNCHRONIZED: u32 = 14;
 pub type __uint32_t = ::std::os::raw::c_uint;
 pub type __uint64_t = ::std::os::raw::c_ulong;
 #[repr(C)]
@@ -306,5 +306,6 @@ pub const VIRGL_CCMD_SET_DEBUG_FLAGS: virgl_context_cmd = 41;
 pub const VIRGL_CCMD_GET_QUERY_RESULT_QBO: virgl_context_cmd = 42;
 pub const VIRGL_CCMD_TRANSFER3D: virgl_context_cmd = 43;
 pub const VIRGL_CCMD_END_TRANSFERS: virgl_context_cmd = 44;
-pub const VIRGL_MAX_COMMANDS: virgl_context_cmd = 45;
+pub const VIRGL_CCMD_COPY_TRANSFER3D: virgl_context_cmd = 45;
+pub const VIRGL_MAX_COMMANDS: virgl_context_cmd = 46;
 pub type virgl_context_cmd = u32;
diff --git a/gpu_renderer/src/generated/virglrenderer.rs b/gpu_renderer/src/generated/virglrenderer.rs
index eb4d4d6..88d8455 100644
--- a/gpu_renderer/src/generated/virglrenderer.rs
+++ b/gpu_renderer/src/generated/virglrenderer.rs
@@ -1,7 +1,3 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
 /* automatically generated by rust-bindgen */
 
 #[link(name = "virglrenderer")]
@@ -23,6 +19,7 @@ pub const VIRGL_RES_BIND_STREAM_OUTPUT: u32 = 2048;
 pub const VIRGL_RES_BIND_CURSOR: u32 = 65536;
 pub const VIRGL_RES_BIND_CUSTOM: u32 = 131072;
 pub const VIRGL_RES_BIND_SCANOUT: u32 = 262144;
+pub const VIRGL_RES_BIND_SHARED: u32 = 1048576;
 pub type __uint32_t = ::std::os::raw::c_uint;
 pub type __uint64_t = ::std::os::raw::c_ulong;
 pub type va_list = __builtin_va_list;
@@ -38,7 +35,7 @@ pub struct iovec {
 }
 pub type virgl_renderer_gl_context = *mut ::std::os::raw::c_void;
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct virgl_renderer_gl_ctx_param {
     pub version: ::std::os::raw::c_int,
     pub shared: bool,
@@ -73,6 +70,11 @@ pub struct virgl_renderer_callbacks {
         unsafe extern "C" fn(cookie: *mut ::std::os::raw::c_void) -> ::std::os::raw::c_int,
     >,
 }
+impl Default for virgl_renderer_callbacks {
+    fn default() -> Self {
+        unsafe { ::std::mem::zeroed() }
+    }
+}
 extern "C" {
     pub fn virgl_renderer_init(
         cookie: *mut ::std::os::raw::c_void,
@@ -117,7 +119,7 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 #[repr(C)]
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct virgl_renderer_resource_create_args {
     pub handle: u32,
     pub target: u32,
@@ -244,7 +246,7 @@ extern "C" {
     pub fn virgl_set_debug_callback(cb: virgl_debug_callback_type) -> virgl_debug_callback_type;
 }
 #[repr(C)]
-#[derive(Default, Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub struct virgl_renderer_resource_info {
     pub handle: u32,
     pub virgl_format: u32,
@@ -280,3 +282,8 @@ pub struct __va_list_tag {
     pub overflow_arg_area: *mut ::std::os::raw::c_void,
     pub reg_save_area: *mut ::std::os::raw::c_void,
 }
+impl Default for __va_list_tag {
+    fn default() -> Self {
+        unsafe { ::std::mem::zeroed() }
+    }
+}