summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsenorblanco <senorblanco@chromium.org>2016-02-10 13:27:57 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-10 21:29:01 +0000
commit655530d81ebe07e4f52303b3863bf586f9d0cd4f (patch)
tree93e99e944b5a9d0d880c16f3e47ae4a655d9d810
parentb7904c220a3c17b729628c8ca9e97b35c6233d37 (diff)
downloadchromium_src-655530d81ebe07e4f52303b3863bf586f9d0cd4f.zip
chromium_src-655530d81ebe07e4f52303b3863bf586f9d0cd4f.tar.gz
chromium_src-655530d81ebe07e4f52303b3863bf586f9d0cd4f.tar.bz2
Add GL_RGB_YCBCR_422_CHROMIUM to the list of valid filterable formats.
BUG=585692,585211 CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel Review URL: https://codereview.chromium.org/1684173002 Cr-Commit-Position: refs/heads/master@{#374727}
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py3
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h3
-rw-r--r--gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h28
3 files changed, 29 insertions, 5 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 137516f..8cd382f 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -2022,6 +2022,9 @@ _NAMED_TYPE_INFO = {
'GL_RGBA4',
'GL_RGB10_A2',
'GL_RGBA16F',
+ 'GL_RGB_YUV_420_CHROMIUM',
+ 'GL_RGB_YCBCR_422_CHROMIUM',
+ 'GL_RGB_YCBCR_420V_CHROMIUM',
],
},
'TextureInternalFormatStorage': {
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 fc3b0de..86c181b 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -4843,6 +4843,9 @@ std::string GLES2Util::GetStringTextureSizedTextureFilterableInternalFormat(
{GL_RGBA4, "GL_RGBA4"},
{GL_RGB10_A2, "GL_RGB10_A2"},
{GL_RGBA16F, "GL_RGBA16F"},
+ {GL_RGB_YUV_420_CHROMIUM, "GL_RGB_YUV_420_CHROMIUM"},
+ {GL_RGB_YCBCR_422_CHROMIUM, "GL_RGB_YCBCR_422_CHROMIUM"},
+ {GL_RGB_YCBCR_420V_CHROMIUM, "GL_RGB_YCBCR_420V_CHROMIUM"},
};
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 ab35382..97f2260 100644
--- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h
@@ -1214,11 +1214,29 @@ static const GLenum
static const GLenum
valid_texture_sized_texture_filterable_internal_format_table[] = {
- GL_R8, GL_R8_SNORM, GL_R16F, GL_RG8,
- GL_RG8_SNORM, GL_RG16F, GL_RGB8, GL_SRGB8,
- GL_RGB565, GL_RGB8_SNORM, GL_R11F_G11F_B10F, GL_RGB9_E5,
- GL_RGB16F, GL_RGBA8, GL_SRGB8_ALPHA8, GL_RGBA8_SNORM,
- GL_RGB5_A1, GL_RGBA4, GL_RGB10_A2, GL_RGBA16F,
+ GL_R8,
+ GL_R8_SNORM,
+ GL_R16F,
+ GL_RG8,
+ GL_RG8_SNORM,
+ GL_RG16F,
+ GL_RGB8,
+ GL_SRGB8,
+ GL_RGB565,
+ GL_RGB8_SNORM,
+ GL_R11F_G11F_B10F,
+ GL_RGB9_E5,
+ GL_RGB16F,
+ GL_RGBA8,
+ GL_SRGB8_ALPHA8,
+ GL_RGBA8_SNORM,
+ GL_RGB5_A1,
+ GL_RGBA4,
+ GL_RGB10_A2,
+ GL_RGBA16F,
+ GL_RGB_YUV_420_CHROMIUM,
+ GL_RGB_YCBCR_422_CHROMIUM,
+ GL_RGB_YCBCR_420V_CHROMIUM,
};
static const GLenum