| 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 248ad46000114b5a6efb2c5035c06208aaa18cc6..91dfe8c9fc9f3d3e8e79154460b243fba1e473ab 100644
|
| --- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| +++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| @@ -8357,42 +8357,47 @@ struct BeginQueryEXT {
|
| }
|
|
|
| void Init(
|
| - GLenum _target, GLuint _id, uint32 _sync_data_shm_id,
|
| + GLenum _target, GLuint _id, uint32 _serial, uint32 _sync_data_shm_id,
|
| uint32 _sync_data_shm_offset) {
|
| SetHeader();
|
| target = _target;
|
| id = _id;
|
| + serial = _serial;
|
| sync_data_shm_id = _sync_data_shm_id;
|
| sync_data_shm_offset = _sync_data_shm_offset;
|
| }
|
|
|
| void* Set(
|
| - void* cmd, GLenum _target, GLuint _id, uint32 _sync_data_shm_id,
|
| - uint32 _sync_data_shm_offset) {
|
| + void* cmd, GLenum _target, GLuint _id, uint32 _serial,
|
| + uint32 _sync_data_shm_id, uint32 _sync_data_shm_offset) {
|
| static_cast<ValueType*>(
|
| - cmd)->Init(_target, _id, _sync_data_shm_id, _sync_data_shm_offset);
|
| + cmd)->Init(
|
| + _target, _id, _serial, _sync_data_shm_id, _sync_data_shm_offset);
|
| return NextCmdAddress<ValueType>(cmd);
|
| }
|
|
|
| gpu::CommandHeader header;
|
| uint32 target;
|
| uint32 id;
|
| + uint32 serial;
|
| uint32 sync_data_shm_id;
|
| uint32 sync_data_shm_offset;
|
| };
|
|
|
| -COMPILE_ASSERT(sizeof(BeginQueryEXT) == 20,
|
| - Sizeof_BeginQueryEXT_is_not_20);
|
| +COMPILE_ASSERT(sizeof(BeginQueryEXT) == 24,
|
| + Sizeof_BeginQueryEXT_is_not_24);
|
| COMPILE_ASSERT(offsetof(BeginQueryEXT, header) == 0,
|
| OffsetOf_BeginQueryEXT_header_not_0);
|
| COMPILE_ASSERT(offsetof(BeginQueryEXT, target) == 4,
|
| OffsetOf_BeginQueryEXT_target_not_4);
|
| COMPILE_ASSERT(offsetof(BeginQueryEXT, id) == 8,
|
| OffsetOf_BeginQueryEXT_id_not_8);
|
| -COMPILE_ASSERT(offsetof(BeginQueryEXT, sync_data_shm_id) == 12,
|
| - OffsetOf_BeginQueryEXT_sync_data_shm_id_not_12);
|
| -COMPILE_ASSERT(offsetof(BeginQueryEXT, sync_data_shm_offset) == 16,
|
| - OffsetOf_BeginQueryEXT_sync_data_shm_offset_not_16);
|
| +COMPILE_ASSERT(offsetof(BeginQueryEXT, serial) == 12,
|
| + OffsetOf_BeginQueryEXT_serial_not_12);
|
| +COMPILE_ASSERT(offsetof(BeginQueryEXT, sync_data_shm_id) == 16,
|
| + OffsetOf_BeginQueryEXT_sync_data_shm_id_not_16);
|
| +COMPILE_ASSERT(offsetof(BeginQueryEXT, sync_data_shm_offset) == 20,
|
| + OffsetOf_BeginQueryEXT_sync_data_shm_offset_not_20);
|
|
|
| struct EndQueryEXT {
|
| typedef EndQueryEXT ValueType;
|
| @@ -8407,30 +8412,34 @@ struct EndQueryEXT {
|
| header.SetCmd<ValueType>();
|
| }
|
|
|
| - void Init(GLenum _target, GLuint _submit_count) {
|
| + void Init(GLenum _target, uint32 _serial, GLuint _submit_count) {
|
| SetHeader();
|
| target = _target;
|
| + serial = _serial;
|
| submit_count = _submit_count;
|
| }
|
|
|
| - void* Set(void* cmd, GLenum _target, GLuint _submit_count) {
|
| - static_cast<ValueType*>(cmd)->Init(_target, _submit_count);
|
| + void* Set(void* cmd, GLenum _target, uint32 _serial, GLuint _submit_count) {
|
| + static_cast<ValueType*>(cmd)->Init(_target, _serial, _submit_count);
|
| return NextCmdAddress<ValueType>(cmd);
|
| }
|
|
|
| gpu::CommandHeader header;
|
| uint32 target;
|
| + uint32 serial;
|
| uint32 submit_count;
|
| };
|
|
|
| -COMPILE_ASSERT(sizeof(EndQueryEXT) == 12,
|
| - Sizeof_EndQueryEXT_is_not_12);
|
| +COMPILE_ASSERT(sizeof(EndQueryEXT) == 16,
|
| + Sizeof_EndQueryEXT_is_not_16);
|
| COMPILE_ASSERT(offsetof(EndQueryEXT, header) == 0,
|
| OffsetOf_EndQueryEXT_header_not_0);
|
| COMPILE_ASSERT(offsetof(EndQueryEXT, target) == 4,
|
| OffsetOf_EndQueryEXT_target_not_4);
|
| -COMPILE_ASSERT(offsetof(EndQueryEXT, submit_count) == 8,
|
| - OffsetOf_EndQueryEXT_submit_count_not_8);
|
| +COMPILE_ASSERT(offsetof(EndQueryEXT, serial) == 8,
|
| + OffsetOf_EndQueryEXT_serial_not_8);
|
| +COMPILE_ASSERT(offsetof(EndQueryEXT, submit_count) == 12,
|
| + OffsetOf_EndQueryEXT_submit_count_not_12);
|
|
|
| struct InsertEventMarkerEXT {
|
| typedef InsertEventMarkerEXT ValueType;
|
|
|