summary refs log tree commit diff
path: root/gpu_renderer
diff options
context:
space:
mode:
authorDavid Riley <davidriley@chromium.org>2019-01-30 11:47:45 -0800
committerchrome-bot <chrome-bot@chromium.org>2019-01-31 14:06:19 -0800
commit0f5e2af614de4a114b1ee7579c294bbae62e3129 (patch)
treecb04126e3a43ea823ac6450cb173f1958071da12 /gpu_renderer
parentfdc07a64661387bc166983859dee63e94d9eee4b (diff)
downloadcrosvm-0f5e2af614de4a114b1ee7579c294bbae62e3129.tar
crosvm-0f5e2af614de4a114b1ee7579c294bbae62e3129.tar.gz
crosvm-0f5e2af614de4a114b1ee7579c294bbae62e3129.tar.bz2
crosvm-0f5e2af614de4a114b1ee7579c294bbae62e3129.tar.lz
crosvm-0f5e2af614de4a114b1ee7579c294bbae62e3129.tar.xz
crosvm-0f5e2af614de4a114b1ee7579c294bbae62e3129.tar.zst
crosvm-0f5e2af614de4a114b1ee7579c294bbae62e3129.zip
gpu_renderer: update virglrenderer bindings
Results of:
  gpu_renderer/src/generated/generate --sysroot /build/$BOARD
  cargo fmt

BUG=chromium:925569
TEST=builds

Change-Id: If8bd92879970e97699570250fdd66dcea553b0a8
Reviewed-on: https://chromium-review.googlesource.com/1446931
Commit-Ready: David Riley <davidriley@chromium.org>
Tested-by: David Riley <davidriley@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'gpu_renderer')
-rw-r--r--gpu_renderer/src/generated/epoxy_egl.rs3
-rw-r--r--gpu_renderer/src/generated/p_defines.rs18
-rw-r--r--gpu_renderer/src/generated/p_format.rs3
-rw-r--r--gpu_renderer/src/generated/virgl_protocol.rs37
-rw-r--r--gpu_renderer/src/generated/virglrenderer.rs23
5 files changed, 83 insertions, 1 deletions
diff --git a/gpu_renderer/src/generated/epoxy_egl.rs b/gpu_renderer/src/generated/epoxy_egl.rs
index 1f61998..4c3f392 100644
--- a/gpu_renderer/src/generated/epoxy_egl.rs
+++ b/gpu_renderer/src/generated/epoxy_egl.rs
@@ -7067,6 +7067,9 @@ pub const EGL_FOREVER_KHR: i32 = -1;
 pub const EGL_FOREVER_NV: i32 = -1;
 pub const EGL_TRUE: u32 = 1;
 pub const EGL_DISPLAY_SCALING: u32 = 10000;
+pub type __int32_t = ::std::os::raw::c_int;
+pub type __int64_t = ::std::os::raw::c_long;
+pub type __uint64_t = ::std::os::raw::c_ulong;
 pub type khronos_int32_t = i32;
 pub type khronos_uint64_t = u64;
 pub type khronos_ssize_t = ::std::os::raw::c_long;
diff --git a/gpu_renderer/src/generated/p_defines.rs b/gpu_renderer/src/generated/p_defines.rs
index 08946b7..4b0f8bb 100644
--- a/gpu_renderer/src/generated/p_defines.rs
+++ b/gpu_renderer/src/generated/p_defines.rs
@@ -109,6 +109,20 @@ pub const PIPE_CLEAR_COLOR7: u32 = 512;
 pub const PIPE_CLEAR_COLOR: u32 = 1020;
 pub const PIPE_CLEAR_DEPTHSTENCIL: u32 = 3;
 pub const PIPE_BARRIER_MAPPED_BUFFER: u32 = 1;
+pub const PIPE_BARRIER_SHADER_BUFFER: u32 = 2;
+pub const PIPE_BARRIER_QUERY_BUFFER: u32 = 4;
+pub const PIPE_BARRIER_VERTEX_BUFFER: u32 = 8;
+pub const PIPE_BARRIER_INDEX_BUFFER: u32 = 16;
+pub const PIPE_BARRIER_CONSTANT_BUFFER: u32 = 32;
+pub const PIPE_BARRIER_INDIRECT_BUFFER: u32 = 64;
+pub const PIPE_BARRIER_TEXTURE: u32 = 128;
+pub const PIPE_BARRIER_IMAGE: u32 = 256;
+pub const PIPE_BARRIER_FRAMEBUFFER: u32 = 512;
+pub const PIPE_BARRIER_STREAMOUT_BUFFER: u32 = 1024;
+pub const PIPE_BARRIER_GLOBAL_BUFFER: u32 = 2048;
+pub const PIPE_BARRIER_ALL: u32 = 4095;
+pub const PIPE_TEXTURE_BARRIER_SAMPLER: u32 = 1;
+pub const PIPE_TEXTURE_BARRIER_FRAMEBUFFER: u32 = 2;
 pub const PIPE_BIND_DEPTH_STENCIL: u32 = 1;
 pub const PIPE_BIND_RENDER_TARGET: u32 = 2;
 pub const PIPE_BIND_BLENDABLE: u32 = 4;
@@ -192,8 +206,12 @@ pub const PIPE_SWIZZLE_ALPHA: u32 = 3;
 pub const PIPE_SWIZZLE_ZERO: u32 = 4;
 pub const PIPE_SWIZZLE_ONE: u32 = 5;
 pub const PIPE_TIMEOUT_INFINITE: i32 = -1;
+pub const PIPE_IMAGE_ACCESS_READ: u32 = 1;
+pub const PIPE_IMAGE_ACCESS_WRITE: u32 = 2;
+pub const PIPE_IMAGE_ACCESS_READ_WRITE: u32 = 3;
 pub const PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50: u32 = 1;
 pub const PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_R600: u32 = 2;
+pub type __uint64_t = ::std::os::raw::c_ulong;
 pub type boolean = ::std::os::raw::c_uchar;
 pub const PIPE_OK: pipe_error = 0;
 /// < Generic error
diff --git a/gpu_renderer/src/generated/p_format.rs b/gpu_renderer/src/generated/p_format.rs
index ee86907..b72ccaf 100644
--- a/gpu_renderer/src/generated/p_format.rs
+++ b/gpu_renderer/src/generated/p_format.rs
@@ -313,6 +313,7 @@ pub const PIPE_FORMAT_R10G10B10X2_UNORM: pipe_format = 308;
 pub const PIPE_FORMAT_A1B5G5R5_UNORM: pipe_format = 309;
 pub const PIPE_FORMAT_X1B5G5R5_UNORM: pipe_format = 310;
 pub const PIPE_FORMAT_A4B4G4R4_UNORM: pipe_format = 311;
-pub const PIPE_FORMAT_COUNT: pipe_format = 312;
+pub const PIPE_FORMAT_R8_SRGB: pipe_format = 312;
+pub const PIPE_FORMAT_COUNT: pipe_format = 313;
 /// Formats for textures, surfaces and vertex data
 pub type pipe_format = u32;
diff --git a/gpu_renderer/src/generated/virgl_protocol.rs b/gpu_renderer/src/generated/virgl_protocol.rs
index 7e06f93..96711fa 100644
--- a/gpu_renderer/src/generated/virgl_protocol.rs
+++ b/gpu_renderer/src/generated/virgl_protocol.rs
@@ -197,6 +197,34 @@ pub const VIRGL_BIND_SHADER_TYPE: u32 = 2;
 pub const VIRGL_TESS_STATE_SIZE: u32 = 6;
 pub const VIRGL_SET_MIN_SAMPLES_SIZE: u32 = 1;
 pub const VIRGL_SET_MIN_SAMPLES_MASK: u32 = 1;
+pub const VIRGL_SET_SHADER_BUFFER_ELEMENT_SIZE: u32 = 3;
+pub const VIRGL_SET_SHADER_BUFFER_SHADER_TYPE: u32 = 1;
+pub const VIRGL_SET_SHADER_BUFFER_START_SLOT: u32 = 2;
+pub const VIRGL_SET_SHADER_IMAGE_ELEMENT_SIZE: u32 = 5;
+pub const VIRGL_SET_SHADER_IMAGE_SHADER_TYPE: u32 = 1;
+pub const VIRGL_SET_SHADER_IMAGE_START_SLOT: u32 = 2;
+pub const VIRGL_MEMORY_BARRIER_SIZE: u32 = 1;
+pub const VIRGL_MEMORY_BARRIER_FLAGS: u32 = 1;
+pub const VIRGL_LAUNCH_GRID_SIZE: u32 = 8;
+pub const VIRGL_LAUNCH_BLOCK_X: u32 = 1;
+pub const VIRGL_LAUNCH_BLOCK_Y: u32 = 2;
+pub const VIRGL_LAUNCH_BLOCK_Z: u32 = 3;
+pub const VIRGL_LAUNCH_GRID_X: u32 = 4;
+pub const VIRGL_LAUNCH_GRID_Y: u32 = 5;
+pub const VIRGL_LAUNCH_GRID_Z: u32 = 6;
+pub const VIRGL_LAUNCH_INDIRECT_HANDLE: u32 = 7;
+pub const VIRGL_LAUNCH_INDIRECT_OFFSET: u32 = 8;
+pub const VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_SIZE: u32 = 2;
+pub const VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_WIDTH_HEIGHT: u32 = 1;
+pub const VIRGL_SET_FRAMEBUFFER_STATE_NO_ATTACH_LAYERS_SAMPLES: u32 = 2;
+pub const VIRGL_TEXTURE_BARRIER_SIZE: u32 = 1;
+pub const VIRGL_TEXTURE_BARRIER_FLAGS: u32 = 1;
+pub const VIRGL_SET_ATOMIC_BUFFER_ELEMENT_SIZE: u32 = 3;
+pub const VIRGL_SET_ATOMIC_BUFFER_START_SLOT: u32 = 1;
+pub const VIRGL_SET_DEBUG_FLAGS_MIN_SIZE: u32 = 2;
+pub const VIRGL_SET_DEBUG_FLAGSTRING_OFFSET: u32 = 1;
+pub type __uint32_t = ::std::os::raw::c_uint;
+pub type __uint64_t = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct virgl_host_query_state {
@@ -251,4 +279,13 @@ pub const VIRGL_CCMD_DESTROY_SUB_CTX: virgl_context_cmd = 30;
 pub const VIRGL_CCMD_BIND_SHADER: virgl_context_cmd = 31;
 pub const VIRGL_CCMD_SET_TESS_STATE: virgl_context_cmd = 32;
 pub const VIRGL_CCMD_SET_MIN_SAMPLES: virgl_context_cmd = 33;
+pub const VIRGL_CCMD_SET_SHADER_BUFFERS: virgl_context_cmd = 34;
+pub const VIRGL_CCMD_SET_SHADER_IMAGES: virgl_context_cmd = 35;
+pub const VIRGL_CCMD_MEMORY_BARRIER: virgl_context_cmd = 36;
+pub const VIRGL_CCMD_LAUNCH_GRID: virgl_context_cmd = 37;
+pub const VIRGL_CCMD_SET_FRAMEBUFFER_STATE_NO_ATTACH: virgl_context_cmd = 38;
+pub const VIRGL_CCMD_TEXTURE_BARRIER: virgl_context_cmd = 39;
+pub const VIRGL_CCMD_SET_ATOMIC_BUFFERS: virgl_context_cmd = 40;
+pub const VIRGL_CCMD_SET_DEBUG_FLAGS: virgl_context_cmd = 41;
+pub const VIRGL_MAX_COMMANDS: virgl_context_cmd = 42;
 pub type virgl_context_cmd = u32;
diff --git a/gpu_renderer/src/generated/virglrenderer.rs b/gpu_renderer/src/generated/virglrenderer.rs
index df45c1e..9a2e4c1 100644
--- a/gpu_renderer/src/generated/virglrenderer.rs
+++ b/gpu_renderer/src/generated/virglrenderer.rs
@@ -3,6 +3,23 @@
 #[link(name = "virglrenderer")]
 extern "C" {}
 
+pub const VIRGL_RENDERER_CALLBACKS_VERSION: u32 = 2;
+pub const VIRGL_RENDERER_USE_EGL: u32 = 1;
+pub const VIRGL_RENDERER_THREAD_SYNC: u32 = 2;
+pub const VIRGL_RENDERER_USE_GLX: u32 = 4;
+pub const VIRGL_RENDERER_USE_SURFACELESS: u32 = 8;
+pub const VIRGL_RENDERER_USE_GLES: u32 = 16;
+pub const VIRGL_RES_BIND_DEPTH_STENCIL: u32 = 1;
+pub const VIRGL_RES_BIND_RENDER_TARGET: u32 = 2;
+pub const VIRGL_RES_BIND_SAMPLER_VIEW: u32 = 8;
+pub const VIRGL_RES_BIND_VERTEX_BUFFER: u32 = 16;
+pub const VIRGL_RES_BIND_INDEX_BUFFER: u32 = 32;
+pub const VIRGL_RES_BIND_CONSTANT_BUFFER: u32 = 64;
+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 type __uint32_t = ::std::os::raw::c_uint;
+pub type __uint64_t = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct virgl_box {
@@ -125,6 +142,12 @@ extern "C" {
     pub fn virgl_renderer_resource_unref(res_handle: u32);
 }
 extern "C" {
+    pub fn virgl_renderer_resource_set_priv(res_handle: u32, priv_: *mut ::std::os::raw::c_void);
+}
+extern "C" {
+    pub fn virgl_renderer_resource_get_priv(res_handle: u32) -> *mut ::std::os::raw::c_void;
+}
+extern "C" {
     pub fn virgl_renderer_context_create(
         handle: u32,
         nlen: u32,