commit e76b7ccb860b7ffcd86a42af8eecfe30f96493fa
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 18 12:47:06 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 18 12:47:06 2012 +0000
tree a8e100dee1e9e0952eb2f5566031734b7f874791
parent 845eafddb09e9a28b45b502abb544df1e286a324

fix gl error of 'invalid enum' from GL_COLOR_TABLE

Committed on behalf of Guanqun.Lu@gmail.com

Review URL: http://codereview.appspot.com/6300106/



git-svn-id: http://skia.googlecode.com/svn/trunk@4272 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 7b2bb35..ec125b7 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -34,6 +34,7 @@
     fTextureUsageSupport = false;
     fTexStorageSupport = false;
     fTextureRedSupport = false;
+    fImagingSupport = false;
 }
 
 GrGLCaps::GrGLCaps(const GrGLCaps& caps) {
@@ -61,6 +62,7 @@
     fTextureUsageSupport = caps.fTextureUsageSupport;
     fTexStorageSupport = caps.fTexStorageSupport;
     fTextureRedSupport = caps.fTextureRedSupport;
+    fImagingSupport = caps.fImagingSupport;
 
     return *this;
 }
@@ -146,6 +148,9 @@
         fTextureRedSupport = ctxInfo.hasExtension("GL_EXT_texture_rg");
     }
 
+    fImagingSupport = kDesktop_GrGLBinding == binding &&
+                      ctxInfo.hasExtension("GL_ARB_imaging");
+
     this->initFSAASupport(ctxInfo);
     this->initStencilFormats(ctxInfo);
 }