diff options
3 files changed, 4 insertions, 10 deletions
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py index b8417ae..6745c9c 100644 --- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py +++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py @@ -87,6 +87,10 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): self.Fail('conformance2/textures/misc/tex-storage-and-subimage-3d.html', bug=570453) + # Remove after we roll in https://github.com/KhronosGroup/WebGL/pull/1473. + self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html', + ['mac', 'linux'], bug=570453) + # Windows only. self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' + '-with-canvas-r8-red-unsigned_byte.html', diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 8cd382f..b38c6de 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -1628,9 +1628,6 @@ _NAMED_TYPE_INFO = { 'GL_RGB_INTEGER', 'GL_RGBA_INTEGER', ], - 'deprecated_es3': [ - 'GL_ALPHA', - ], }, 'PixelType': { 'type': 'GLenum', 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 97f2260..7e6122cc 100644 --- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h @@ -779,10 +779,6 @@ static const GLenum valid_read_pixel_format_table_es3[] = { GL_RG_INTEGER, GL_RGB_INTEGER, GL_RGBA_INTEGER, }; -static const GLenum deprecated_read_pixel_format_table_es3[] = { - GL_ALPHA, -}; - static const GLenum valid_read_pixel_type_table[] = { GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_5_5_5_1, @@ -1481,9 +1477,6 @@ void Validators::UpdateValuesES3() { pixel_type.AddValues(valid_pixel_type_table_es3, arraysize(valid_pixel_type_table_es3)); program_parameter.SetIsES3(true); - read_pixel_format.RemoveValues( - deprecated_read_pixel_format_table_es3, - arraysize(deprecated_read_pixel_format_table_es3)); read_pixel_format.AddValues(valid_read_pixel_format_table_es3, arraysize(valid_read_pixel_format_table_es3)); read_pixel_type.AddValues(valid_read_pixel_type_table_es3, |