summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/common/gles2_cmd_utils.cc
diff options
context:
space:
mode:
authorbajones <bajones@chromium.org>2014-10-13 14:38:59 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-13 21:39:17 +0000
commit2a2ea235a39a4b0bcad1f75934bdc09fb4d41733 (patch)
tree6773258acbf73b33a8b77f932442b6cdae5a532d /gpu/command_buffer/common/gles2_cmd_utils.cc
parent193a17dd58eeec9586c9ddc83f6a83581b6a0be0 (diff)
downloadchromium_src-2a2ea235a39a4b0bcad1f75934bdc09fb4d41733.zip
chromium_src-2a2ea235a39a4b0bcad1f75934bdc09fb4d41733.tar.gz
chromium_src-2a2ea235a39a4b0bcad1f75934bdc09fb4d41733.tar.bz2
Enabled EXT_sRGB WebGL extension support in the command buffer.
BUG=386048 Review URL: https://codereview.chromium.org/638143003 Cr-Commit-Position: refs/heads/master@{#299371}
Diffstat (limited to 'gpu/command_buffer/common/gles2_cmd_utils.cc')
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc
index 3b5097c..41db0b8 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils.cc
+++ b/gpu/command_buffer/common/gles2_cmd_utils.cc
@@ -232,6 +232,10 @@ int GLES2Util::GLGetNumValuesReturned(int id) const {
// GL_EXT_multisampled_render_to_texture
case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT:
return 1;
+ // -- glGetFramebufferAttachmentParameteriv with
+ // GL_EXT_sRGB
+ case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT:
+ return 1;
// -- glGetProgramiv
case GL_DELETE_STATUS:
@@ -352,11 +356,13 @@ int ElementsPerGroup(int format, int type) {
switch (format) {
case GL_RGB:
+ case GL_SRGB_EXT:
return 3;
case GL_LUMINANCE_ALPHA:
return 2;
case GL_RGBA:
case GL_BGRA_EXT:
+ case GL_SRGB_ALPHA_EXT:
return 4;
case GL_ALPHA:
case GL_LUMINANCE:
@@ -670,6 +676,7 @@ uint32 GLES2Util::GetChannelsForFormat(int format) {
case GL_RGB565:
case GL_RGB16F_EXT:
case GL_RGB32F_EXT:
+ case GL_SRGB_EXT:
return kRGB;
case GL_BGRA_EXT:
case GL_BGRA8_EXT:
@@ -679,6 +686,8 @@ uint32 GLES2Util::GetChannelsForFormat(int format) {
case GL_RGBA8_OES:
case GL_RGBA4:
case GL_RGB5_A1:
+ case GL_SRGB_ALPHA_EXT:
+ case GL_SRGB8_ALPHA8_EXT:
return kRGBA;
case GL_DEPTH_COMPONENT32_OES:
case GL_DEPTH_COMPONENT24_OES: