Index: gpu/command_buffer/common/gles2_cmd_format_autogen.h |
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h |
index 34c50c2ab7e623b5f5b4509593949e7db4e868a0..06020ffb44708ad16e3be3570f00129883f07bac 100644 |
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h |
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h |
@@ -10297,7 +10297,8 @@ struct AsyncTexSubImage2DCHROMIUM { |
void Init( |
GLenum _target, GLint _level, GLint _xoffset, GLint _yoffset, |
GLsizei _width, GLsizei _height, GLenum _format, GLenum _type, |
- uint32 _data_shm_id, uint32 _data_shm_offset) { |
+ uint32 _data_shm_id, uint32 _data_shm_offset, uint32 _async_upload_token, |
+ uint32 _sync_data_shm_id, uint32 _sync_data_shm_offset) { |
SetHeader(); |
target = _target; |
level = _level; |
@@ -10309,16 +10310,21 @@ struct AsyncTexSubImage2DCHROMIUM { |
type = _type; |
data_shm_id = _data_shm_id; |
data_shm_offset = _data_shm_offset; |
+ async_upload_token = _async_upload_token; |
+ sync_data_shm_id = _sync_data_shm_id; |
+ sync_data_shm_offset = _sync_data_shm_offset; |
} |
void* Set( |
void* cmd, GLenum _target, GLint _level, GLint _xoffset, GLint _yoffset, |
GLsizei _width, GLsizei _height, GLenum _format, GLenum _type, |
- uint32 _data_shm_id, uint32 _data_shm_offset) { |
+ uint32 _data_shm_id, uint32 _data_shm_offset, uint32 _async_upload_token, |
+ uint32 _sync_data_shm_id, uint32 _sync_data_shm_offset) { |
static_cast<ValueType*>( |
cmd)->Init( |
_target, _level, _xoffset, _yoffset, _width, _height, _format, |
- _type, _data_shm_id, _data_shm_offset); |
+ _type, _data_shm_id, _data_shm_offset, _async_upload_token, |
+ _sync_data_shm_id, _sync_data_shm_offset); |
return NextCmdAddress<ValueType>(cmd); |
} |
@@ -10333,10 +10339,13 @@ struct AsyncTexSubImage2DCHROMIUM { |
uint32 type; |
uint32 data_shm_id; |
uint32 data_shm_offset; |
+ uint32 async_upload_token; |
+ uint32 sync_data_shm_id; |
+ uint32 sync_data_shm_offset; |
}; |
-COMPILE_ASSERT(sizeof(AsyncTexSubImage2DCHROMIUM) == 44, |
- Sizeof_AsyncTexSubImage2DCHROMIUM_is_not_44); |
+COMPILE_ASSERT(sizeof(AsyncTexSubImage2DCHROMIUM) == 56, |
+ Sizeof_AsyncTexSubImage2DCHROMIUM_is_not_56); |
COMPILE_ASSERT(offsetof(AsyncTexSubImage2DCHROMIUM, header) == 0, |
OffsetOf_AsyncTexSubImage2DCHROMIUM_header_not_0); |
COMPILE_ASSERT(offsetof(AsyncTexSubImage2DCHROMIUM, target) == 4, |
@@ -10359,6 +10368,13 @@ COMPILE_ASSERT(offsetof(AsyncTexSubImage2DCHROMIUM, data_shm_id) == 36, |
OffsetOf_AsyncTexSubImage2DCHROMIUM_data_shm_id_not_36); |
COMPILE_ASSERT(offsetof(AsyncTexSubImage2DCHROMIUM, data_shm_offset) == 40, |
OffsetOf_AsyncTexSubImage2DCHROMIUM_data_shm_offset_not_40); |
+COMPILE_ASSERT(offsetof(AsyncTexSubImage2DCHROMIUM, async_upload_token) == 44, |
+ OffsetOf_AsyncTexSubImage2DCHROMIUM_async_upload_token_not_44); |
+COMPILE_ASSERT(offsetof(AsyncTexSubImage2DCHROMIUM, sync_data_shm_id) == 48, |
+ OffsetOf_AsyncTexSubImage2DCHROMIUM_sync_data_shm_id_not_48); |
+COMPILE_ASSERT( |
+ offsetof(AsyncTexSubImage2DCHROMIUM, sync_data_shm_offset) == 52, |
+ OffsetOf_AsyncTexSubImage2DCHROMIUM_sync_data_shm_offset_not_52); |
struct AsyncTexImage2DCHROMIUM { |
typedef AsyncTexImage2DCHROMIUM ValueType; |
@@ -10377,7 +10393,9 @@ struct AsyncTexImage2DCHROMIUM { |
void Init( |
GLenum _target, GLint _level, GLint _internalformat, GLsizei _width, |
GLsizei _height, GLint _border, GLenum _format, GLenum _type, |
- uint32 _pixels_shm_id, uint32 _pixels_shm_offset) { |
+ uint32 _pixels_shm_id, uint32 _pixels_shm_offset, |
+ uint32 _async_upload_token, uint32 _sync_data_shm_id, |
+ uint32 _sync_data_shm_offset) { |
SetHeader(); |
target = _target; |
level = _level; |
@@ -10389,16 +10407,22 @@ struct AsyncTexImage2DCHROMIUM { |
type = _type; |
pixels_shm_id = _pixels_shm_id; |
pixels_shm_offset = _pixels_shm_offset; |
+ async_upload_token = _async_upload_token; |
+ sync_data_shm_id = _sync_data_shm_id; |
+ sync_data_shm_offset = _sync_data_shm_offset; |
} |
void* Set( |
void* cmd, GLenum _target, GLint _level, GLint _internalformat, |
GLsizei _width, GLsizei _height, GLint _border, GLenum _format, |
- GLenum _type, uint32 _pixels_shm_id, uint32 _pixels_shm_offset) { |
+ GLenum _type, uint32 _pixels_shm_id, uint32 _pixels_shm_offset, |
+ uint32 _async_upload_token, uint32 _sync_data_shm_id, |
+ uint32 _sync_data_shm_offset) { |
static_cast<ValueType*>( |
cmd)->Init( |
_target, _level, _internalformat, _width, _height, _border, _format, |
- _type, _pixels_shm_id, _pixels_shm_offset); |
+ _type, _pixels_shm_id, _pixels_shm_offset, _async_upload_token, |
+ _sync_data_shm_id, _sync_data_shm_offset); |
return NextCmdAddress<ValueType>(cmd); |
} |
@@ -10413,10 +10437,13 @@ struct AsyncTexImage2DCHROMIUM { |
uint32 type; |
uint32 pixels_shm_id; |
uint32 pixels_shm_offset; |
+ uint32 async_upload_token; |
+ uint32 sync_data_shm_id; |
+ uint32 sync_data_shm_offset; |
}; |
-COMPILE_ASSERT(sizeof(AsyncTexImage2DCHROMIUM) == 44, |
- Sizeof_AsyncTexImage2DCHROMIUM_is_not_44); |
+COMPILE_ASSERT(sizeof(AsyncTexImage2DCHROMIUM) == 56, |
+ Sizeof_AsyncTexImage2DCHROMIUM_is_not_56); |
COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, header) == 0, |
OffsetOf_AsyncTexImage2DCHROMIUM_header_not_0); |
COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, target) == 4, |
@@ -10439,6 +10466,12 @@ COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, pixels_shm_id) == 36, |
OffsetOf_AsyncTexImage2DCHROMIUM_pixels_shm_id_not_36); |
COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, pixels_shm_offset) == 40, |
OffsetOf_AsyncTexImage2DCHROMIUM_pixels_shm_offset_not_40); |
+COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, async_upload_token) == 44, |
+ OffsetOf_AsyncTexImage2DCHROMIUM_async_upload_token_not_44); |
+COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, sync_data_shm_id) == 48, |
+ OffsetOf_AsyncTexImage2DCHROMIUM_sync_data_shm_id_not_48); |
+COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, sync_data_shm_offset) == 52, |
+ OffsetOf_AsyncTexImage2DCHROMIUM_sync_data_shm_offset_not_52); |
struct WaitAsyncTexImage2DCHROMIUM { |
typedef WaitAsyncTexImage2DCHROMIUM ValueType; |