| 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 3ec79a26dbdcb0567690e45751d78ab3fb7be909..0454c492ef3e8de5f9ef69bfdba56d78f8cde78f 100644
|
| --- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| +++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| @@ -13925,6 +13925,44 @@ static_assert(
|
| offsetof(ScheduleDCLayerSharedStateCHROMIUM, shm_offset) == 20,
|
| "offset of ScheduleDCLayerSharedStateCHROMIUM shm_offset should be 20");
|
|
|
| +struct SetDCLayerTextureCHROMIUM {
|
| + typedef SetDCLayerTextureCHROMIUM ValueType;
|
| + static const CommandId kCmdId = kSetDCLayerTextureCHROMIUM;
|
| + static const cmd::ArgFlags kArgFlags = cmd::kFixed;
|
| + static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
|
| +
|
| + static uint32_t ComputeSize() {
|
| + return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT
|
| + }
|
| +
|
| + void SetHeader() { header.SetCmd<ValueType>(); }
|
| +
|
| + void Init(GLuint _index, GLuint _contents_texture_id) {
|
| + SetHeader();
|
| + index = _index;
|
| + contents_texture_id = _contents_texture_id;
|
| + }
|
| +
|
| + void* Set(void* cmd, GLuint _index, GLuint _contents_texture_id) {
|
| + static_cast<ValueType*>(cmd)->Init(_index, _contents_texture_id);
|
| + return NextCmdAddress<ValueType>(cmd);
|
| + }
|
| +
|
| + gpu::CommandHeader header;
|
| + uint32_t index;
|
| + uint32_t contents_texture_id;
|
| +};
|
| +
|
| +static_assert(sizeof(SetDCLayerTextureCHROMIUM) == 12,
|
| + "size of SetDCLayerTextureCHROMIUM should be 12");
|
| +static_assert(offsetof(SetDCLayerTextureCHROMIUM, header) == 0,
|
| + "offset of SetDCLayerTextureCHROMIUM header should be 0");
|
| +static_assert(offsetof(SetDCLayerTextureCHROMIUM, index) == 4,
|
| + "offset of SetDCLayerTextureCHROMIUM index should be 4");
|
| +static_assert(
|
| + offsetof(SetDCLayerTextureCHROMIUM, contents_texture_id) == 8,
|
| + "offset of SetDCLayerTextureCHROMIUM contents_texture_id should be 8");
|
| +
|
| struct ScheduleDCLayerCHROMIUM {
|
| typedef ScheduleDCLayerCHROMIUM ValueType;
|
| static const CommandId kCmdId = kScheduleDCLayerCHROMIUM;
|
| @@ -13937,14 +13975,12 @@ struct ScheduleDCLayerCHROMIUM {
|
|
|
| void SetHeader() { header.SetCmd<ValueType>(); }
|
|
|
| - void Init(GLuint _contents_texture_id,
|
| - GLuint _background_color,
|
| + void Init(GLuint _background_color,
|
| GLuint _edge_aa_mask,
|
| GLuint _filter,
|
| GLuint _shm_id,
|
| GLuint _shm_offset) {
|
| SetHeader();
|
| - contents_texture_id = _contents_texture_id;
|
| background_color = _background_color;
|
| edge_aa_mask = _edge_aa_mask;
|
| filter = _filter;
|
| @@ -13953,20 +13989,17 @@ struct ScheduleDCLayerCHROMIUM {
|
| }
|
|
|
| void* Set(void* cmd,
|
| - GLuint _contents_texture_id,
|
| GLuint _background_color,
|
| GLuint _edge_aa_mask,
|
| GLuint _filter,
|
| GLuint _shm_id,
|
| GLuint _shm_offset) {
|
| - static_cast<ValueType*>(cmd)->Init(_contents_texture_id, _background_color,
|
| - _edge_aa_mask, _filter, _shm_id,
|
| - _shm_offset);
|
| + static_cast<ValueType*>(cmd)->Init(_background_color, _edge_aa_mask,
|
| + _filter, _shm_id, _shm_offset);
|
| return NextCmdAddress<ValueType>(cmd);
|
| }
|
|
|
| gpu::CommandHeader header;
|
| - uint32_t contents_texture_id;
|
| uint32_t background_color;
|
| uint32_t edge_aa_mask;
|
| uint32_t filter;
|
| @@ -13974,23 +14007,20 @@ struct ScheduleDCLayerCHROMIUM {
|
| uint32_t shm_offset;
|
| };
|
|
|
| -static_assert(sizeof(ScheduleDCLayerCHROMIUM) == 28,
|
| - "size of ScheduleDCLayerCHROMIUM should be 28");
|
| +static_assert(sizeof(ScheduleDCLayerCHROMIUM) == 24,
|
| + "size of ScheduleDCLayerCHROMIUM should be 24");
|
| static_assert(offsetof(ScheduleDCLayerCHROMIUM, header) == 0,
|
| "offset of ScheduleDCLayerCHROMIUM header should be 0");
|
| -static_assert(
|
| - offsetof(ScheduleDCLayerCHROMIUM, contents_texture_id) == 4,
|
| - "offset of ScheduleDCLayerCHROMIUM contents_texture_id should be 4");
|
| -static_assert(offsetof(ScheduleDCLayerCHROMIUM, background_color) == 8,
|
| - "offset of ScheduleDCLayerCHROMIUM background_color should be 8");
|
| -static_assert(offsetof(ScheduleDCLayerCHROMIUM, edge_aa_mask) == 12,
|
| - "offset of ScheduleDCLayerCHROMIUM edge_aa_mask should be 12");
|
| -static_assert(offsetof(ScheduleDCLayerCHROMIUM, filter) == 16,
|
| - "offset of ScheduleDCLayerCHROMIUM filter should be 16");
|
| -static_assert(offsetof(ScheduleDCLayerCHROMIUM, shm_id) == 20,
|
| - "offset of ScheduleDCLayerCHROMIUM shm_id should be 20");
|
| -static_assert(offsetof(ScheduleDCLayerCHROMIUM, shm_offset) == 24,
|
| - "offset of ScheduleDCLayerCHROMIUM shm_offset should be 24");
|
| +static_assert(offsetof(ScheduleDCLayerCHROMIUM, background_color) == 4,
|
| + "offset of ScheduleDCLayerCHROMIUM background_color should be 4");
|
| +static_assert(offsetof(ScheduleDCLayerCHROMIUM, edge_aa_mask) == 8,
|
| + "offset of ScheduleDCLayerCHROMIUM edge_aa_mask should be 8");
|
| +static_assert(offsetof(ScheduleDCLayerCHROMIUM, filter) == 12,
|
| + "offset of ScheduleDCLayerCHROMIUM filter should be 12");
|
| +static_assert(offsetof(ScheduleDCLayerCHROMIUM, shm_id) == 16,
|
| + "offset of ScheduleDCLayerCHROMIUM shm_id should be 16");
|
| +static_assert(offsetof(ScheduleDCLayerCHROMIUM, shm_offset) == 20,
|
| + "offset of ScheduleDCLayerCHROMIUM shm_offset should be 20");
|
|
|
| struct MatrixLoadfCHROMIUMImmediate {
|
| typedef MatrixLoadfCHROMIUMImmediate ValueType;
|
|
|