Commit 7eced3d1 authored by Austin Eng's avatar Austin Eng Committed by Commit Bot

Fix WebGL conformance2/textures/misc/copy-texture-image.html test

Add additional internal formats for CopyTexImage2D
Unsuppresses previously failing test

# for webgl2_conformance_expectations.py

Bug: 905531
Change-Id: Ib9f525afa0188def6464c9f6134efc0090825f6b
TBR: kbr@chromium.org
Cq-Include-Trybots: luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_angle_rel_ng;luci.chromium.try:win_angle_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/c/1340369
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: default avatarKai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611562}
parent 2cf14c06
......@@ -56,9 +56,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
'conformance2/glsl3/const-struct-from-array-as-function-parameter.html',
['win', 'nvidia', 'opengl'], bug=874620)
# Failing test updated in https://github.com/KhronosGroup/WebGL/pull/2226
self.Fail('conformance2/textures/misc/copy-texture-image.html', bug=905531)
# Failing new test added in https://github.com/KhronosGroup/WebGL/pull/2665
self.Fail('conformance2/textures/misc/tex-subimage3d-canvas-bug.html',
['linux'], bug=859400)
......
......@@ -866,7 +866,8 @@ static const GLenum kSupportedInternalFormatsES3[] = {
GL_SRGB8_ALPHA8, GL_R8I, GL_R8UI, GL_R16I, GL_R16UI,
GL_R32I, GL_R32UI, GL_RG8I, GL_RG8UI, GL_RG16I,
GL_RG16UI, GL_RG32I, GL_RG32UI, GL_RGBA8I, GL_RGBA8UI,
GL_RGBA16I, GL_RGBA16UI, GL_RGBA32I, GL_RGBA32UI,
GL_RGBA16I, GL_RGBA16UI, GL_RGBA32I, GL_RGBA32UI, GL_RGB32I,
GL_RGB32UI, GL_RGB8I, GL_RGB8UI, GL_RGB16I, GL_RGB16UI,
};
// ES3 enums only supported by TexImage
......@@ -882,12 +883,6 @@ static const GLenum kSupportedInternalFormatsTexImageES3[] = {
GL_RGB9_E5,
GL_RGB16F,
GL_RGB32F,
GL_RGB8UI,
GL_RGB8I,
GL_RGB16UI,
GL_RGB16I,
GL_RGB32UI,
GL_RGB32I,
GL_RGBA8_SNORM,
GL_RGBA16F,
GL_RGBA32F,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment