diff options
4 files changed, 3 insertions, 324 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index a47a846..bf5b19e 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -776,10 +776,6 @@ _NAMED_TYPE_INFO = { 'GL_TEXTURE_2D', 'GL_TEXTURE_CUBE_MAP', ], - 'valid_es3': [ - 'GL_TEXTURE_3D', - 'GL_TEXTURE_2D_ARRAY', - ], 'invalid': [ 'GL_TEXTURE_1D', 'GL_TEXTURE_3D', @@ -1227,22 +1223,9 @@ _NAMED_TYPE_INFO = { 'GL_UNSIGNED_SHORT_4_4_4_4', 'GL_UNSIGNED_SHORT_5_5_5_1', ], - 'valid_es3': [ - 'GL_BYTE', - 'GL_UNSIGNED_SHORT', + 'invalid': [ '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', - ], - 'invalid': [ - 'GL_UNSIGNED_BYTE_3_3_2', ], }, 'ReadPixelType': { @@ -1295,16 +1278,6 @@ _NAMED_TYPE_INFO = { 'GL_RGB', 'GL_RGBA', ], - 'valid_es3': [ - 'GL_RED', - 'GL_RED_INTEGER', - 'GL_RG', - 'GL_RG_INTEGER', - 'GL_RGB_INTEGER', - 'GL_RGBA_INTEGER', - 'GL_DEPTH_COMPONENT', - 'GL_DEPTH_STENCIL', - ], 'invalid': [ 'GL_BGRA', 'GL_BGR', @@ -1319,127 +1292,6 @@ _NAMED_TYPE_INFO = { 'GL_RGB', 'GL_RGBA', ], - 'valid_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', - ], - 'invalid': [ - 'GL_BGRA', - 'GL_BGR', - ], - }, - 'CopyTextureInternalFormat': { - 'type': 'GLenum', - 'valid': [ - 'GL_ALPHA', - 'GL_LUMINANCE', - 'GL_LUMINANCE_ALPHA', - 'GL_RGB', - 'GL_RGBA', - ], - 'valid_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', - ], 'invalid': [ 'GL_BGRA', 'GL_BGR', diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt index df0e907..1dd35fd 100644 --- a/gpu/command_buffer/cmd_buffer_functions.txt +++ b/gpu/command_buffer/cmd_buffer_functions.txt @@ -37,7 +37,7 @@ GL_APICALL void GL_APIENTRY glCompileShader (GLidShader shader); GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenumTextureTarget target, GLint level, GLenumCompressedTextureFormat internalformat, GLsizei width, GLsizei height, GLintTextureBorder border, GLsizei imageSize, const void* data); GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenumTextureTarget target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenumCompressedTextureFormat format, GLsizei imageSize, const void* data); GL_APICALL void GL_APIENTRY glCopyBufferSubData (GLenumBufferTarget readtarget, GLenumBufferTarget writetarget, GLintptrNotNegative readoffset, GLintptrNotNegative writeoffset, GLsizeiptr size); -GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenumTextureTarget target, GLint level, GLenumCopyTextureInternalFormat internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLintTextureBorder border); +GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenumTextureTarget target, GLint level, GLenumTextureInternalFormat internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLintTextureBorder border); GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenumTextureTarget target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); GL_APICALL void GL_APIENTRY glCopyTexSubImage3D (GLenumTexture3DTarget target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); GL_APICALL GLuint GL_APIENTRY glCreateProgram (void); @@ -133,7 +133,7 @@ GL_APICALL void GL_APIENTRY glPauseTransformFeedback (void); GL_APICALL void GL_APIENTRY glPixelStorei (GLenumPixelStore pname, GLintPixelStoreAlignment param); GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units); GL_APICALL void GL_APIENTRY glReadBuffer (GLenum src); -GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenumReadPixelFormat format, GLenumReadPixelType type, void* pixels); +GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenumReadPixelFormat format, GLenumPixelType type, void* pixels); GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void); GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTarget target, GLenumRenderBufferFormat internalformat, GLsizei width, GLsizei height); GL_APICALL void GL_APIENTRY glResumeTransformFeedback (void); diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h index accf1fc..52511ed 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h @@ -4887,18 +4887,6 @@ std::string GLES2Util::GetStringPixelType(uint32_t value) { {GL_UNSIGNED_SHORT_5_6_5, "GL_UNSIGNED_SHORT_5_6_5"}, {GL_UNSIGNED_SHORT_4_4_4_4, "GL_UNSIGNED_SHORT_4_4_4_4"}, {GL_UNSIGNED_SHORT_5_5_5_1, "GL_UNSIGNED_SHORT_5_5_5_1"}, - {GL_BYTE, "GL_BYTE"}, - {GL_UNSIGNED_SHORT, "GL_UNSIGNED_SHORT"}, - {GL_SHORT, "GL_SHORT"}, - {GL_UNSIGNED_INT, "GL_UNSIGNED_INT"}, - {GL_INT, "GL_INT"}, - {GL_HALF_FLOAT, "GL_HALF_FLOAT"}, - {GL_FLOAT, "GL_FLOAT"}, - {GL_UNSIGNED_INT_2_10_10_10_REV, "GL_UNSIGNED_INT_2_10_10_10_REV"}, - {GL_UNSIGNED_INT_10F_11F_11F_REV, "GL_UNSIGNED_INT_10F_11F_11F_REV"}, - {GL_UNSIGNED_INT_5_9_9_9_REV, "GL_UNSIGNED_INT_5_9_9_9_REV"}, - {GL_UNSIGNED_INT_24_8, "GL_UNSIGNED_INT_24_8"}, - {GL_FLOAT_32_UNSIGNED_INT_24_8_REV, "GL_FLOAT_32_UNSIGNED_INT_24_8_REV"}, }; return GLES2Util::GetQualifiedEnumString(string_table, arraysize(string_table), value); @@ -5164,8 +5152,6 @@ std::string GLES2Util::GetStringTextureBindTarget(uint32_t value) { static const EnumToString string_table[] = { {GL_TEXTURE_2D, "GL_TEXTURE_2D"}, {GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP"}, - {GL_TEXTURE_3D, "GL_TEXTURE_3D"}, - {GL_TEXTURE_2D_ARRAY, "GL_TEXTURE_2D_ARRAY"}, }; return GLES2Util::GetQualifiedEnumString(string_table, arraysize(string_table), value); @@ -5178,14 +5164,6 @@ std::string GLES2Util::GetStringTextureFormat(uint32_t value) { {GL_LUMINANCE_ALPHA, "GL_LUMINANCE_ALPHA"}, {GL_RGB, "GL_RGB"}, {GL_RGBA, "GL_RGBA"}, - {GL_RED, "GL_RED"}, - {GL_RED_INTEGER, "GL_RED_INTEGER"}, - {GL_RG, "GL_RG"}, - {GL_RG_INTEGER, "GL_RG_INTEGER"}, - {GL_RGB_INTEGER, "GL_RGB_INTEGER"}, - {GL_RGBA_INTEGER, "GL_RGBA_INTEGER"}, - {GL_DEPTH_COMPONENT, "GL_DEPTH_COMPONENT"}, - {GL_DEPTH_STENCIL, "GL_DEPTH_STENCIL"}, }; return GLES2Util::GetQualifiedEnumString(string_table, arraysize(string_table), value); @@ -5198,60 +5176,6 @@ std::string GLES2Util::GetStringTextureInternalFormat(uint32_t value) { {GL_LUMINANCE_ALPHA, "GL_LUMINANCE_ALPHA"}, {GL_RGB, "GL_RGB"}, {GL_RGBA, "GL_RGBA"}, - {GL_R8, "GL_R8"}, - {GL_R8_SNORM, "GL_R8_SNORM"}, - {GL_R16F, "GL_R16F"}, - {GL_R32F, "GL_R32F"}, - {GL_R8UI, "GL_R8UI"}, - {GL_R8I, "GL_R8I"}, - {GL_R16UI, "GL_R16UI"}, - {GL_R16I, "GL_R16I"}, - {GL_R32UI, "GL_R32UI"}, - {GL_R32I, "GL_R32I"}, - {GL_RG8, "GL_RG8"}, - {GL_RG8_SNORM, "GL_RG8_SNORM"}, - {GL_RG16F, "GL_RG16F"}, - {GL_RG32F, "GL_RG32F"}, - {GL_RG8UI, "GL_RG8UI"}, - {GL_RG8I, "GL_RG8I"}, - {GL_RG16UI, "GL_RG16UI"}, - {GL_RG16I, "GL_RG16I"}, - {GL_RG32UI, "GL_RG32UI"}, - {GL_RG32I, "GL_RG32I"}, - {GL_RGB8, "GL_RGB8"}, - {GL_SRGB8, "GL_SRGB8"}, - {GL_RGB565, "GL_RGB565"}, - {GL_RGB8_SNORM, "GL_RGB8_SNORM"}, - {GL_R11F_G11F_B10F, "GL_R11F_G11F_B10F"}, - {GL_RGB9_E5, "GL_RGB9_E5"}, - {GL_RGB16F, "GL_RGB16F"}, - {GL_RGB32F, "GL_RGB32F"}, - {GL_RGB8UI, "GL_RGB8UI"}, - {GL_RGB8I, "GL_RGB8I"}, - {GL_RGB16UI, "GL_RGB16UI"}, - {GL_RGB16I, "GL_RGB16I"}, - {GL_RGB32UI, "GL_RGB32UI"}, - {GL_RGB32I, "GL_RGB32I"}, - {GL_RGBA8, "GL_RGBA8"}, - {GL_SRGB8_ALPHA8, "GL_SRGB8_ALPHA8"}, - {GL_RGBA8_SNORM, "GL_RGBA8_SNORM"}, - {GL_RGB5_A1, "GL_RGB5_A1"}, - {GL_RGBA4, "GL_RGBA4"}, - {GL_RGB10_A2, "GL_RGB10_A2"}, - {GL_RGBA16F, "GL_RGBA16F"}, - {GL_RGBA32F, "GL_RGBA32F"}, - {GL_RGBA8UI, "GL_RGBA8UI"}, - {GL_RGBA8I, "GL_RGBA8I"}, - {GL_RGB10_A2UI, "GL_RGB10_A2UI"}, - {GL_RGBA16UI, "GL_RGBA16UI"}, - {GL_RGBA16I, "GL_RGBA16I"}, - {GL_RGBA32UI, "GL_RGBA32UI"}, - {GL_RGBA32I, "GL_RGBA32I"}, - {GL_DEPTH_COMPONENT16, "GL_DEPTH_COMPONENT16"}, - {GL_DEPTH_COMPONENT24, "GL_DEPTH_COMPONENT24"}, - {GL_DEPTH_COMPONENT32F, "GL_DEPTH_COMPONENT32F"}, - {GL_DEPTH24_STENCIL8, "GL_DEPTH24_STENCIL8"}, - {GL_DEPTH32F_STENCIL8, "GL_DEPTH32F_STENCIL8"}, }; return GLES2Util::GetQualifiedEnumString(string_table, arraysize(string_table), value); 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 4847157..2f83240 100644 --- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h @@ -325,21 +325,6 @@ 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, @@ -512,11 +497,6 @@ 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, @@ -525,17 +505,6 @@ 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, @@ -544,63 +513,6 @@ 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, @@ -862,15 +774,6 @@ Validators::Validators() void Validators::AddES3Values() { 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)); } #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_VALIDATION_IMPLEMENTATION_AUTOGEN_H_ |