From 11c886a1f4eaa1162baeb4d5dabead330aaf425f Mon Sep 17 00:00:00 2001 From: David Riley Date: Wed, 3 Apr 2019 15:55:05 -0700 Subject: gpu_renderer: update virglrenderer bindings Results of: gpu_renderer/src/generated/generate --sysroot /build/$BOARD cargo fmt BUG=chromium:945033 TEST=builds Change-Id: I9c681314431bb442688759b93e43cc85e9928aa0 Reviewed-on: https://chromium-review.googlesource.com/1553559 Commit-Ready: David Riley Tested-by: David Riley Tested-by: kokoro Reviewed-by: David Riley Reviewed-by: Zach Reizner --- gpu_renderer/src/generated/p_defines.rs | 6 ++++++ gpu_renderer/src/generated/virgl_protocol.rs | 17 ++++++++++++++++- gpu_renderer/src/generated/virglrenderer.rs | 17 +++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) (limited to 'gpu_renderer') diff --git a/gpu_renderer/src/generated/p_defines.rs b/gpu_renderer/src/generated/p_defines.rs index 4b0f8bb..70f59c7 100644 --- a/gpu_renderer/src/generated/p_defines.rs +++ b/gpu_renderer/src/generated/p_defines.rs @@ -140,6 +140,7 @@ pub const PIPE_BIND_GLOBAL: u32 = 262144; pub const PIPE_BIND_SHADER_RESOURCE: u32 = 524288; pub const PIPE_BIND_COMPUTE_RESOURCE: u32 = 1048576; pub const PIPE_BIND_COMMAND_ARGS_BUFFER: u32 = 2097152; +pub const PIPE_BIND_QUERY_BUFFER: u32 = 4194304; pub const PIPE_BIND_SCANOUT: u32 = 16384; pub const PIPE_BIND_SHARED: u32 = 32768; pub const PIPE_BIND_LINEAR: u32 = 2097152; @@ -606,6 +607,11 @@ pub union pipe_query_result { pub pipeline_statistics: pipe_query_data_pipeline_statistics, _bindgen_union_align: [u64; 11usize], } +pub const PIPE_QUERY_TYPE_I32: pipe_query_value_type = 0; +pub const PIPE_QUERY_TYPE_U32: pipe_query_value_type = 1; +pub const PIPE_QUERY_TYPE_I64: pipe_query_value_type = 2; +pub const PIPE_QUERY_TYPE_U64: pipe_query_value_type = 3; +pub type pipe_query_value_type = u32; #[repr(C)] #[derive(Copy, Clone)] pub union pipe_color_union { diff --git a/gpu_renderer/src/generated/virgl_protocol.rs b/gpu_renderer/src/generated/virgl_protocol.rs index 96711fa..3ca06b6 100644 --- a/gpu_renderer/src/generated/virgl_protocol.rs +++ b/gpu_renderer/src/generated/virgl_protocol.rs @@ -223,6 +223,18 @@ 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 const VIRGL_QUERY_RESULT_QBO_SIZE: u32 = 6; +pub const VIRGL_QUERY_RESULT_QBO_HANDLE: u32 = 1; +pub const VIRGL_QUERY_RESULT_QBO_QBO_HANDLE: u32 = 2; +pub const VIRGL_QUERY_RESULT_QBO_WAIT: u32 = 3; +pub const VIRGL_QUERY_RESULT_QBO_RESULT_TYPE: u32 = 4; +pub const VIRGL_QUERY_RESULT_QBO_OFFSET: u32 = 5; +pub const VIRGL_QUERY_RESULT_QBO_INDEX: u32 = 6; +pub const VIRGL_TRANSFER_TO_HOST: u32 = 1; +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 type __uint32_t = ::std::os::raw::c_uint; pub type __uint64_t = ::std::os::raw::c_ulong; #[repr(C)] @@ -287,5 +299,8 @@ 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 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 type virgl_context_cmd = u32; diff --git a/gpu_renderer/src/generated/virglrenderer.rs b/gpu_renderer/src/generated/virglrenderer.rs index 9a2e4c1..4f50325 100644 --- a/gpu_renderer/src/generated/virglrenderer.rs +++ b/gpu_renderer/src/generated/virglrenderer.rs @@ -18,8 +18,10 @@ 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 const VIRGL_RES_BIND_SCANOUT: u32 = 262144; 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; #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct virgl_box { @@ -125,6 +127,9 @@ pub struct virgl_renderer_resource_create_args { pub nr_samples: u32, pub flags: u32, } +pub type virgl_debug_callback_type = ::std::option::Option< + unsafe extern "C" fn(fmt: *const ::std::os::raw::c_char, ap: *mut __va_list_tag), +>; extern "C" { pub fn virgl_renderer_resource_create( args: *mut virgl_renderer_resource_create_args, @@ -231,6 +236,9 @@ extern "C" { res_handle: ::std::os::raw::c_int, ); } +extern "C" { + pub fn virgl_set_debug_callback(cb: virgl_debug_callback_type) -> virgl_debug_callback_type; +} #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct virgl_renderer_resource_info { @@ -259,3 +267,12 @@ extern "C" { extern "C" { pub fn virgl_renderer_get_poll_fd() -> ::std::os::raw::c_int; } +pub type __builtin_va_list = [__va_list_tag; 1usize]; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct __va_list_tag { + pub gp_offset: ::std::os::raw::c_uint, + pub fp_offset: ::std::os::raw::c_uint, + pub overflow_arg_area: *mut ::std::os::raw::c_void, + pub reg_save_area: *mut ::std::os::raw::c_void, +} -- cgit 1.4.1