| 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 ec3a09bc9f675ec158fbe586fd3db3de7edfa317..6825091aa736bbe0c750fe150544b8290210ae8c 100644
|
| --- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| +++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
|
| @@ -13731,6 +13731,7 @@ struct ScheduleOverlayPlaneCHROMIUM {
|
|
|
| void Init(GLint _plane_z_order,
|
| GLenum _plane_transform,
|
| + GLuint _storage_format,
|
| GLuint _overlay_texture_id,
|
| GLint _bounds_x,
|
| GLint _bounds_y,
|
| @@ -13739,10 +13740,12 @@ struct ScheduleOverlayPlaneCHROMIUM {
|
| GLfloat _uv_x,
|
| GLfloat _uv_y,
|
| GLfloat _uv_width,
|
| - GLfloat _uv_height) {
|
| + GLfloat _uv_height,
|
| + GLboolean _handle_scaling) {
|
| SetHeader();
|
| plane_z_order = _plane_z_order;
|
| plane_transform = _plane_transform;
|
| + storage_format = _storage_format;
|
| overlay_texture_id = _overlay_texture_id;
|
| bounds_x = _bounds_x;
|
| bounds_y = _bounds_y;
|
| @@ -13752,11 +13755,13 @@ struct ScheduleOverlayPlaneCHROMIUM {
|
| uv_y = _uv_y;
|
| uv_width = _uv_width;
|
| uv_height = _uv_height;
|
| + handle_scaling = _handle_scaling;
|
| }
|
|
|
| void* Set(void* cmd,
|
| GLint _plane_z_order,
|
| GLenum _plane_transform,
|
| + GLuint _storage_format,
|
| GLuint _overlay_texture_id,
|
| GLint _bounds_x,
|
| GLint _bounds_y,
|
| @@ -13765,17 +13770,20 @@ struct ScheduleOverlayPlaneCHROMIUM {
|
| GLfloat _uv_x,
|
| GLfloat _uv_y,
|
| GLfloat _uv_width,
|
| - GLfloat _uv_height) {
|
| + GLfloat _uv_height,
|
| + GLboolean _handle_scaling) {
|
| static_cast<ValueType*>(cmd)->Init(_plane_z_order, _plane_transform,
|
| - _overlay_texture_id, _bounds_x,
|
| - _bounds_y, _bounds_width, _bounds_height,
|
| - _uv_x, _uv_y, _uv_width, _uv_height);
|
| + _storage_format, _overlay_texture_id,
|
| + _bounds_x, _bounds_y, _bounds_width,
|
| + _bounds_height, _uv_x, _uv_y, _uv_width,
|
| + _uv_height, _handle_scaling);
|
| return NextCmdAddress<ValueType>(cmd);
|
| }
|
|
|
| gpu::CommandHeader header;
|
| int32_t plane_z_order;
|
| uint32_t plane_transform;
|
| + uint32_t storage_format;
|
| uint32_t overlay_texture_id;
|
| int32_t bounds_x;
|
| int32_t bounds_y;
|
| @@ -13785,10 +13793,11 @@ struct ScheduleOverlayPlaneCHROMIUM {
|
| float uv_y;
|
| float uv_width;
|
| float uv_height;
|
| + uint32_t handle_scaling;
|
| };
|
|
|
| -static_assert(sizeof(ScheduleOverlayPlaneCHROMIUM) == 48,
|
| - "size of ScheduleOverlayPlaneCHROMIUM should be 48");
|
| +static_assert(sizeof(ScheduleOverlayPlaneCHROMIUM) == 56,
|
| + "size of ScheduleOverlayPlaneCHROMIUM should be 56");
|
| static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, header) == 0,
|
| "offset of ScheduleOverlayPlaneCHROMIUM header should be 0");
|
| static_assert(
|
| @@ -13798,26 +13807,32 @@ static_assert(
|
| offsetof(ScheduleOverlayPlaneCHROMIUM, plane_transform) == 8,
|
| "offset of ScheduleOverlayPlaneCHROMIUM plane_transform should be 8");
|
| static_assert(
|
| - offsetof(ScheduleOverlayPlaneCHROMIUM, overlay_texture_id) == 12,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM overlay_texture_id should be 12");
|
| -static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_x) == 16,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM bounds_x should be 16");
|
| -static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_y) == 20,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM bounds_y should be 20");
|
| + offsetof(ScheduleOverlayPlaneCHROMIUM, storage_format) == 12,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM storage_format should be 12");
|
| static_assert(
|
| - offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_width) == 24,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM bounds_width should be 24");
|
| + offsetof(ScheduleOverlayPlaneCHROMIUM, overlay_texture_id) == 16,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM overlay_texture_id should be 16");
|
| +static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_x) == 20,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM bounds_x should be 20");
|
| +static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_y) == 24,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM bounds_y should be 24");
|
| static_assert(
|
| - offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_height) == 28,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM bounds_height should be 28");
|
| -static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_x) == 32,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM uv_x should be 32");
|
| -static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_y) == 36,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM uv_y should be 36");
|
| -static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_width) == 40,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM uv_width should be 40");
|
| -static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_height) == 44,
|
| - "offset of ScheduleOverlayPlaneCHROMIUM uv_height should be 44");
|
| + offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_width) == 28,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM bounds_width should be 28");
|
| +static_assert(
|
| + offsetof(ScheduleOverlayPlaneCHROMIUM, bounds_height) == 32,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM bounds_height should be 32");
|
| +static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_x) == 36,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM uv_x should be 36");
|
| +static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_y) == 40,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM uv_y should be 40");
|
| +static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_width) == 44,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM uv_width should be 44");
|
| +static_assert(offsetof(ScheduleOverlayPlaneCHROMIUM, uv_height) == 48,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM uv_height should be 48");
|
| +static_assert(
|
| + offsetof(ScheduleOverlayPlaneCHROMIUM, handle_scaling) == 52,
|
| + "offset of ScheduleOverlayPlaneCHROMIUM handle_scaling should be 52");
|
|
|
| struct ScheduleCALayerCHROMIUM {
|
| typedef ScheduleCALayerCHROMIUM ValueType;
|
|
|