commit 0f31ca79bde088e6caac219734c35c1ae3e9e8b9
author twiz@google.com <twiz@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 18 17:38:11 2011 +0000
committer twiz@google.com <twiz@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 18 17:38:11 2011 +0000
tree 00759d4aa6f3d706a2fe69e0142e5907ce3e2df1
parent 098611bd74367d9790b057f005675bdae53321e7

This CL removes all dependencies on GL headers across all of Ganesh.  New
GrGLint, etc. types are introduced, and new GR_GL_XXXX constants for use at all
GL call-sites.

Review:  http://codereview.appspot.com/4272061/



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

gpu/include/GrGLConfig.h

diff --git a/gpu/include/GrGLConfig.h b/gpu/include/GrGLConfig.h
index 0a86e72..3c1c597 100644
--- a/gpu/include/GrGLConfig.h
+++ b/gpu/include/GrGLConfig.h
@@ -20,6 +20,7 @@
 
 #include "GrTypes.h"
 #include "GrGLInterface.h"
+#include "GrGLDefines.h"
 
 /**
  * The following are optional defines that can be enabled at the compiler
@@ -66,19 +67,19 @@
 #if GR_SCALAR_IS_FIXED
     #define GrGLType   GL_FIXED
 #elif GR_SCALAR_IS_FLOAT
-    #define GrGLType   GL_FLOAT
+    #define GrGLType   GR_GL_FLOAT
 #else
     #error "unknown GR_SCALAR type"
 #endif
 
 #if GR_TEXT_SCALAR_IS_USHORT
-    #define GrGLTextType                    GL_UNSIGNED_SHORT
+    #define GrGLTextType                    GR_GL_UNSIGNED_SHORT
     #define GR_GL_TEXT_TEXTURE_NORMALIZED   1
 #elif GR_TEXT_SCALAR_IS_FLOAT
-    #define GrGLTextType                    GL_FLOAT
+    #define GrGLTextType                    GR_GL_FLOAT
     #define GR_GL_TEXT_TEXTURE_NORMALIZED   0
 #elif GR_TEXT_SCALAR_IS_FIXED
-    #define GrGLTextType                    GL_FIXED
+    #define GrGLTextType                    GR_GL_FIXED
     #define GR_GL_TEXT_TEXTURE_NORMALIZED   0
 #else
     #error "unknown GR_TEXT_SCALAR type"
@@ -90,7 +91,7 @@
     #if GR_WIN32_BUILD
         #define GR_GL_32BPP_COLOR_FORMAT    GR_BGRA //use GR prefix because this
     #else                                           //may be an extension.
-        #define GR_GL_32BPP_COLOR_FORMAT    GL_RGBA
+        #define GR_GL_32BPP_COLOR_FORMAT    GR_GL_RGBA
     #endif
 #endif
 
@@ -137,7 +138,7 @@
 extern void GrGLCheckErr(const char* location, const char* call);
 
 static inline void GrGLClearErr() {
-    while (GL_NO_ERROR != GrGLGetGLInterface()->fGetError()) {}
+    while (GR_GL_NO_ERROR != GrGLGetGLInterface()->fGetError()) {}
 }
 
 #if GR_GL_CHECK_ERROR
@@ -165,7 +166,7 @@
  */
 #if GR_SUPPORT_GLDESKTOP
     static inline void GrGL_RestoreResetRowLength() {
-        GR_GL(PixelStorei(GL_UNPACK_ROW_LENGTH, 0));
+        GR_GL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, 0));
     }
 #else
     #define GrGL_RestoreResetRowLength()