| 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 c701dd4de33cd2b32bbe31bb6ea3935bfb0fe923..36f28f45e31c5950e5d3276e1409b9da9ccfe602 100644
|
| --- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| +++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| @@ -12444,7 +12444,8 @@ struct CopyTextureCHROMIUM {
|
|
|
| void SetHeader() { header.SetCmd<ValueType>(); }
|
|
|
| - void Init(GLenum _source_id,
|
| + void Init(GLenum _target,
|
| + GLenum _source_id,
|
| GLint _source_level,
|
| GLenum _dest_id,
|
| GLint _dest_level,
|
| @@ -12454,6 +12455,7 @@ struct CopyTextureCHROMIUM {
|
| GLboolean _unpack_premultiply_alpha,
|
| GLboolean _unpack_unmultiply_alpha) {
|
| SetHeader();
|
| + target = _target;
|
| source_id = _source_id;
|
| source_level = _source_level;
|
| dest_id = _dest_id;
|
| @@ -12466,6 +12468,7 @@ struct CopyTextureCHROMIUM {
|
| }
|
|
|
| void* Set(void* cmd,
|
| + GLenum _target,
|
| GLenum _source_id,
|
| GLint _source_level,
|
| GLenum _dest_id,
|
| @@ -12476,13 +12479,14 @@ struct CopyTextureCHROMIUM {
|
| GLboolean _unpack_premultiply_alpha,
|
| GLboolean _unpack_unmultiply_alpha) {
|
| static_cast<ValueType*>(cmd)->Init(
|
| - _source_id, _source_level, _dest_id, _dest_level, _internalformat,
|
| - _dest_type, _unpack_flip_y, _unpack_premultiply_alpha,
|
| + _target, _source_id, _source_level, _dest_id, _dest_level,
|
| + _internalformat, _dest_type, _unpack_flip_y, _unpack_premultiply_alpha,
|
| _unpack_unmultiply_alpha);
|
| return NextCmdAddress<ValueType>(cmd);
|
| }
|
|
|
| gpu::CommandHeader header;
|
| + uint32_t target;
|
| uint32_t source_id;
|
| int32_t source_level;
|
| uint32_t dest_id;
|
| @@ -12494,30 +12498,32 @@ struct CopyTextureCHROMIUM {
|
| uint32_t unpack_unmultiply_alpha;
|
| };
|
|
|
| -static_assert(sizeof(CopyTextureCHROMIUM) == 40,
|
| - "size of CopyTextureCHROMIUM should be 40");
|
| +static_assert(sizeof(CopyTextureCHROMIUM) == 44,
|
| + "size of CopyTextureCHROMIUM should be 44");
|
| static_assert(offsetof(CopyTextureCHROMIUM, header) == 0,
|
| "offset of CopyTextureCHROMIUM header should be 0");
|
| -static_assert(offsetof(CopyTextureCHROMIUM, source_id) == 4,
|
| - "offset of CopyTextureCHROMIUM source_id should be 4");
|
| -static_assert(offsetof(CopyTextureCHROMIUM, source_level) == 8,
|
| - "offset of CopyTextureCHROMIUM source_level should be 8");
|
| -static_assert(offsetof(CopyTextureCHROMIUM, dest_id) == 12,
|
| - "offset of CopyTextureCHROMIUM dest_id should be 12");
|
| -static_assert(offsetof(CopyTextureCHROMIUM, dest_level) == 16,
|
| - "offset of CopyTextureCHROMIUM dest_level should be 16");
|
| -static_assert(offsetof(CopyTextureCHROMIUM, internalformat) == 20,
|
| - "offset of CopyTextureCHROMIUM internalformat should be 20");
|
| -static_assert(offsetof(CopyTextureCHROMIUM, dest_type) == 24,
|
| - "offset of CopyTextureCHROMIUM dest_type should be 24");
|
| -static_assert(offsetof(CopyTextureCHROMIUM, unpack_flip_y) == 28,
|
| - "offset of CopyTextureCHROMIUM unpack_flip_y should be 28");
|
| -static_assert(
|
| - offsetof(CopyTextureCHROMIUM, unpack_premultiply_alpha) == 32,
|
| - "offset of CopyTextureCHROMIUM unpack_premultiply_alpha should be 32");
|
| -static_assert(
|
| - offsetof(CopyTextureCHROMIUM, unpack_unmultiply_alpha) == 36,
|
| - "offset of CopyTextureCHROMIUM unpack_unmultiply_alpha should be 36");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, target) == 4,
|
| + "offset of CopyTextureCHROMIUM target should be 4");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, source_id) == 8,
|
| + "offset of CopyTextureCHROMIUM source_id should be 8");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, source_level) == 12,
|
| + "offset of CopyTextureCHROMIUM source_level should be 12");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, dest_id) == 16,
|
| + "offset of CopyTextureCHROMIUM dest_id should be 16");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, dest_level) == 20,
|
| + "offset of CopyTextureCHROMIUM dest_level should be 20");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, internalformat) == 24,
|
| + "offset of CopyTextureCHROMIUM internalformat should be 24");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, dest_type) == 28,
|
| + "offset of CopyTextureCHROMIUM dest_type should be 28");
|
| +static_assert(offsetof(CopyTextureCHROMIUM, unpack_flip_y) == 32,
|
| + "offset of CopyTextureCHROMIUM unpack_flip_y should be 32");
|
| +static_assert(
|
| + offsetof(CopyTextureCHROMIUM, unpack_premultiply_alpha) == 36,
|
| + "offset of CopyTextureCHROMIUM unpack_premultiply_alpha should be 36");
|
| +static_assert(
|
| + offsetof(CopyTextureCHROMIUM, unpack_unmultiply_alpha) == 40,
|
| + "offset of CopyTextureCHROMIUM unpack_unmultiply_alpha should be 40");
|
|
|
| struct CopySubTextureCHROMIUM {
|
| typedef CopySubTextureCHROMIUM ValueType;
|
| @@ -12531,7 +12537,8 @@ struct CopySubTextureCHROMIUM {
|
|
|
| void SetHeader() { header.SetCmd<ValueType>(); }
|
|
|
| - void Init(GLenum _source_id,
|
| + void Init(GLenum _target,
|
| + GLenum _source_id,
|
| GLint _source_level,
|
| GLenum _dest_id,
|
| GLint _dest_level,
|
| @@ -12545,6 +12552,7 @@ struct CopySubTextureCHROMIUM {
|
| GLboolean _unpack_premultiply_alpha,
|
| GLboolean _unpack_unmultiply_alpha) {
|
| SetHeader();
|
| + target = _target;
|
| source_id = _source_id;
|
| source_level = _source_level;
|
| dest_id = _dest_id;
|
| @@ -12561,6 +12569,7 @@ struct CopySubTextureCHROMIUM {
|
| }
|
|
|
| void* Set(void* cmd,
|
| + GLenum _target,
|
| GLenum _source_id,
|
| GLint _source_level,
|
| GLenum _dest_id,
|
| @@ -12575,13 +12584,14 @@ struct CopySubTextureCHROMIUM {
|
| GLboolean _unpack_premultiply_alpha,
|
| GLboolean _unpack_unmultiply_alpha) {
|
| static_cast<ValueType*>(cmd)->Init(
|
| - _source_id, _source_level, _dest_id, _dest_level, _xoffset, _yoffset,
|
| - _x, _y, _width, _height, _unpack_flip_y, _unpack_premultiply_alpha,
|
| - _unpack_unmultiply_alpha);
|
| + _target, _source_id, _source_level, _dest_id, _dest_level, _xoffset,
|
| + _yoffset, _x, _y, _width, _height, _unpack_flip_y,
|
| + _unpack_premultiply_alpha, _unpack_unmultiply_alpha);
|
| return NextCmdAddress<ValueType>(cmd);
|
| }
|
|
|
| gpu::CommandHeader header;
|
| + uint32_t target;
|
| uint32_t source_id;
|
| int32_t source_level;
|
| uint32_t dest_id;
|
| @@ -12597,38 +12607,40 @@ struct CopySubTextureCHROMIUM {
|
| uint32_t unpack_unmultiply_alpha;
|
| };
|
|
|
| -static_assert(sizeof(CopySubTextureCHROMIUM) == 56,
|
| - "size of CopySubTextureCHROMIUM should be 56");
|
| +static_assert(sizeof(CopySubTextureCHROMIUM) == 60,
|
| + "size of CopySubTextureCHROMIUM should be 60");
|
| static_assert(offsetof(CopySubTextureCHROMIUM, header) == 0,
|
| "offset of CopySubTextureCHROMIUM header should be 0");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, source_id) == 4,
|
| - "offset of CopySubTextureCHROMIUM source_id should be 4");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, source_level) == 8,
|
| - "offset of CopySubTextureCHROMIUM source_level should be 8");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, dest_id) == 12,
|
| - "offset of CopySubTextureCHROMIUM dest_id should be 12");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, dest_level) == 16,
|
| - "offset of CopySubTextureCHROMIUM dest_level should be 16");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, xoffset) == 20,
|
| - "offset of CopySubTextureCHROMIUM xoffset should be 20");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, yoffset) == 24,
|
| - "offset of CopySubTextureCHROMIUM yoffset should be 24");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, x) == 28,
|
| - "offset of CopySubTextureCHROMIUM x should be 28");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, y) == 32,
|
| - "offset of CopySubTextureCHROMIUM y should be 32");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, width) == 36,
|
| - "offset of CopySubTextureCHROMIUM width should be 36");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, height) == 40,
|
| - "offset of CopySubTextureCHROMIUM height should be 40");
|
| -static_assert(offsetof(CopySubTextureCHROMIUM, unpack_flip_y) == 44,
|
| - "offset of CopySubTextureCHROMIUM unpack_flip_y should be 44");
|
| -static_assert(
|
| - offsetof(CopySubTextureCHROMIUM, unpack_premultiply_alpha) == 48,
|
| - "offset of CopySubTextureCHROMIUM unpack_premultiply_alpha should be 48");
|
| -static_assert(
|
| - offsetof(CopySubTextureCHROMIUM, unpack_unmultiply_alpha) == 52,
|
| - "offset of CopySubTextureCHROMIUM unpack_unmultiply_alpha should be 52");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, target) == 4,
|
| + "offset of CopySubTextureCHROMIUM target should be 4");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, source_id) == 8,
|
| + "offset of CopySubTextureCHROMIUM source_id should be 8");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, source_level) == 12,
|
| + "offset of CopySubTextureCHROMIUM source_level should be 12");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, dest_id) == 16,
|
| + "offset of CopySubTextureCHROMIUM dest_id should be 16");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, dest_level) == 20,
|
| + "offset of CopySubTextureCHROMIUM dest_level should be 20");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, xoffset) == 24,
|
| + "offset of CopySubTextureCHROMIUM xoffset should be 24");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, yoffset) == 28,
|
| + "offset of CopySubTextureCHROMIUM yoffset should be 28");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, x) == 32,
|
| + "offset of CopySubTextureCHROMIUM x should be 32");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, y) == 36,
|
| + "offset of CopySubTextureCHROMIUM y should be 36");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, width) == 40,
|
| + "offset of CopySubTextureCHROMIUM width should be 40");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, height) == 44,
|
| + "offset of CopySubTextureCHROMIUM height should be 44");
|
| +static_assert(offsetof(CopySubTextureCHROMIUM, unpack_flip_y) == 48,
|
| + "offset of CopySubTextureCHROMIUM unpack_flip_y should be 48");
|
| +static_assert(
|
| + offsetof(CopySubTextureCHROMIUM, unpack_premultiply_alpha) == 52,
|
| + "offset of CopySubTextureCHROMIUM unpack_premultiply_alpha should be 52");
|
| +static_assert(
|
| + offsetof(CopySubTextureCHROMIUM, unpack_unmultiply_alpha) == 56,
|
| + "offset of CopySubTextureCHROMIUM unpack_unmultiply_alpha should be 56");
|
|
|
| struct CompressedCopyTextureCHROMIUM {
|
| typedef CompressedCopyTextureCHROMIUM ValueType;
|
|
|