| Index: gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
|
| index 2f8324021e2200faec57190229d8d0bafcb8c710..ee63b3aecad4ff9c3f5d129ef0e705f8d9a72281 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
|
| @@ -325,6 +325,21 @@ static const GLenum valid_pixel_type_table[] = {
|
| GL_UNSIGNED_SHORT_5_5_5_1,
|
| };
|
|
|
| +static const GLenum valid_pixel_type_table_es3[] = {
|
| + GL_BYTE,
|
| + GL_UNSIGNED_SHORT,
|
| + GL_SHORT,
|
| + GL_UNSIGNED_INT,
|
| + GL_INT,
|
| + GL_HALF_FLOAT,
|
| + GL_FLOAT,
|
| + GL_UNSIGNED_INT_2_10_10_10_REV,
|
| + GL_UNSIGNED_INT_10F_11F_11F_REV,
|
| + GL_UNSIGNED_INT_5_9_9_9_REV,
|
| + GL_UNSIGNED_INT_24_8,
|
| + GL_FLOAT_32_UNSIGNED_INT_24_8_REV,
|
| +};
|
| +
|
| static const GLenum valid_program_parameter_table[] = {
|
| GL_DELETE_STATUS,
|
| GL_LINK_STATUS,
|
| @@ -497,6 +512,11 @@ static const GLenum valid_texture_bind_target_table[] = {
|
| GL_TEXTURE_CUBE_MAP,
|
| };
|
|
|
| +static const GLenum valid_texture_bind_target_table_es3[] = {
|
| + GL_TEXTURE_3D,
|
| + GL_TEXTURE_2D_ARRAY,
|
| +};
|
| +
|
| static const GLenum valid_texture_format_table[] = {
|
| GL_ALPHA,
|
| GL_LUMINANCE,
|
| @@ -505,6 +525,17 @@ static const GLenum valid_texture_format_table[] = {
|
| GL_RGBA,
|
| };
|
|
|
| +static const GLenum valid_texture_format_table_es3[] = {
|
| + GL_RED,
|
| + GL_RED_INTEGER,
|
| + GL_RG,
|
| + GL_RG_INTEGER,
|
| + GL_RGB_INTEGER,
|
| + GL_RGBA_INTEGER,
|
| + GL_DEPTH_COMPONENT,
|
| + GL_DEPTH_STENCIL,
|
| +};
|
| +
|
| static const GLenum valid_texture_internal_format_table[] = {
|
| GL_ALPHA,
|
| GL_LUMINANCE,
|
| @@ -513,6 +544,63 @@ static const GLenum valid_texture_internal_format_table[] = {
|
| GL_RGBA,
|
| };
|
|
|
| +static const GLenum valid_texture_internal_format_table_es3[] = {
|
| + GL_R8,
|
| + GL_R8_SNORM,
|
| + GL_R16F,
|
| + GL_R32F,
|
| + GL_R8UI,
|
| + GL_R8I,
|
| + GL_R16UI,
|
| + GL_R16I,
|
| + GL_R32UI,
|
| + GL_R32I,
|
| + GL_RG8,
|
| + GL_RG8_SNORM,
|
| + GL_RG16F,
|
| + GL_RG32F,
|
| + GL_RG8UI,
|
| + GL_RG8I,
|
| + GL_RG16UI,
|
| + GL_RG16I,
|
| + GL_RG32UI,
|
| + GL_RG32I,
|
| + GL_RGB8,
|
| + GL_SRGB8,
|
| + GL_RGB565,
|
| + GL_RGB8_SNORM,
|
| + GL_R11F_G11F_B10F,
|
| + GL_RGB9_E5,
|
| + GL_RGB16F,
|
| + GL_RGB32F,
|
| + GL_RGB8UI,
|
| + GL_RGB8I,
|
| + GL_RGB16UI,
|
| + GL_RGB16I,
|
| + GL_RGB32UI,
|
| + GL_RGB32I,
|
| + GL_RGBA8,
|
| + GL_SRGB8_ALPHA8,
|
| + GL_RGBA8_SNORM,
|
| + GL_RGB5_A1,
|
| + GL_RGBA4,
|
| + GL_RGB10_A2,
|
| + GL_RGBA16F,
|
| + GL_RGBA32F,
|
| + GL_RGBA8UI,
|
| + GL_RGBA8I,
|
| + GL_RGB10_A2UI,
|
| + GL_RGBA16UI,
|
| + GL_RGBA16I,
|
| + GL_RGBA32UI,
|
| + GL_RGBA32I,
|
| + GL_DEPTH_COMPONENT16,
|
| + GL_DEPTH_COMPONENT24,
|
| + GL_DEPTH_COMPONENT32F,
|
| + GL_DEPTH24_STENCIL8,
|
| + GL_DEPTH32F_STENCIL8,
|
| +};
|
| +
|
| static const GLenum valid_texture_internal_format_storage_table[] = {
|
| GL_RGB565,
|
| GL_RGBA4,
|
| @@ -524,6 +612,80 @@ static const GLenum valid_texture_internal_format_storage_table[] = {
|
| GL_RGBA8_OES,
|
| };
|
|
|
| +static const GLenum valid_texture_internal_format_storage_table_es3[] = {
|
| + GL_R8,
|
| + GL_R8_SNORM,
|
| + GL_R16F,
|
| + GL_R32F,
|
| + GL_R8UI,
|
| + GL_R8I,
|
| + GL_R16UI,
|
| + GL_R16I,
|
| + GL_R32UI,
|
| + GL_R32I,
|
| + GL_RG8,
|
| + GL_RG8_SNORM,
|
| + GL_RG16F,
|
| + GL_RG32F,
|
| + GL_RG8UI,
|
| + GL_RG8I,
|
| + GL_RG16UI,
|
| + GL_RG16I,
|
| + GL_RG32UI,
|
| + GL_RG32I,
|
| + GL_SRGB8,
|
| + GL_RGB8_SNORM,
|
| + GL_R11F_G11F_B10F,
|
| + GL_RGB9_E5,
|
| + GL_RGB16F,
|
| + GL_RGB32F,
|
| + GL_RGB8UI,
|
| + GL_RGB8I,
|
| + GL_RGB16UI,
|
| + GL_RGB16I,
|
| + GL_RGB32UI,
|
| + GL_RGB32I,
|
| + GL_SRGB8_ALPHA8,
|
| + GL_RGBA8_SNORM,
|
| + GL_RGB10_A2,
|
| + GL_RGBA16F,
|
| + GL_RGBA32F,
|
| + GL_RGBA8UI,
|
| + GL_RGBA8I,
|
| + GL_RGB10_A2UI,
|
| + GL_RGBA16UI,
|
| + GL_RGBA16I,
|
| + GL_RGBA32UI,
|
| + GL_RGBA32I,
|
| + GL_DEPTH_COMPONENT16,
|
| + GL_DEPTH_COMPONENT24,
|
| + GL_DEPTH_COMPONENT32F,
|
| + GL_DEPTH24_STENCIL8,
|
| + GL_DEPTH32F_STENCIL8,
|
| + GL_COMPRESSED_R11_EAC,
|
| + GL_COMPRESSED_SIGNED_R11_EAC,
|
| + GL_COMPRESSED_RG11_EAC,
|
| + GL_COMPRESSED_SIGNED_RG11_EAC,
|
| + GL_COMPRESSED_RGB8_ETC2,
|
| + GL_COMPRESSED_SRGB8_ETC2,
|
| + GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,
|
| + GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
|
| + GL_COMPRESSED_RGBA8_ETC2_EAC,
|
| + GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,
|
| +};
|
| +
|
| +static const GLenum deprecated_texture_internal_format_storage_table_es3[] = {
|
| + GL_ALPHA8_EXT,
|
| + GL_LUMINANCE8_EXT,
|
| + GL_LUMINANCE8_ALPHA8_EXT,
|
| + GL_ALPHA16F_EXT,
|
| + GL_LUMINANCE16F_EXT,
|
| + GL_LUMINANCE_ALPHA16F_EXT,
|
| + GL_ALPHA32F_EXT,
|
| + GL_LUMINANCE32F_EXT,
|
| + GL_LUMINANCE_ALPHA32F_EXT,
|
| +};
|
| +
|
| static const GLenum valid_texture_mag_filter_mode_table[] = {
|
| GL_NEAREST,
|
| GL_LINEAR,
|
| @@ -771,9 +933,24 @@ Validators::Validators()
|
| arraysize(valid_vertex_pointer_table)) {
|
| }
|
|
|
| -void Validators::AddES3Values() {
|
| +void Validators::UpdateValuesES3() {
|
| buffer_target.AddValues(valid_buffer_target_table_es3,
|
| arraysize(valid_buffer_target_table_es3));
|
| + pixel_type.AddValues(valid_pixel_type_table_es3,
|
| + arraysize(valid_pixel_type_table_es3));
|
| + texture_bind_target.AddValues(valid_texture_bind_target_table_es3,
|
| + arraysize(valid_texture_bind_target_table_es3));
|
| + texture_format.AddValues(valid_texture_format_table_es3,
|
| + arraysize(valid_texture_format_table_es3));
|
| + texture_internal_format.AddValues(
|
| + valid_texture_internal_format_table_es3,
|
| + arraysize(valid_texture_internal_format_table_es3));
|
| + texture_internal_format_storage.RemoveValues(
|
| + deprecated_texture_internal_format_storage_table_es3,
|
| + arraysize(deprecated_texture_internal_format_storage_table_es3));
|
| + texture_internal_format_storage.AddValues(
|
| + valid_texture_internal_format_storage_table_es3,
|
| + arraysize(valid_texture_internal_format_storage_table_es3));
|
| }
|
|
|
| #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_VALIDATION_IMPLEMENTATION_AUTOGEN_H_
|
|
|