commit 8531c1cea2a9cf7702ef314ccd0a6cd1dd33c76c
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 13 19:52:45 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 13 19:52:45 2011 +0000
tree c760b89996fbc0c43eee1e100dcfee1a66ec4418
parent a76de3d1a92134c3e95ad7fce99234f92fa48268

Towards issue #106

Adds notion of texture multiple stages but currently just uses 1.


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

gpu/include/GrGLConfig.h

diff --git a/gpu/include/GrGLConfig.h b/gpu/include/GrGLConfig.h
index b183892..2bc535d 100644
--- a/gpu/include/GrGLConfig.h
+++ b/gpu/include/GrGLConfig.h
@@ -90,6 +90,8 @@
     #endif
 #endif
 
+#define GR_SUPPORT_GLES (GR_SUPPORT_GLES1 || GR_SUPPORT_GLES2)
+
 #ifndef GR_SUPPORT_GLDESKTOP
     #if defined(GR_INCLUDE_GLDESKTOP)
         #define GR_SUPPORT_GLDESKTOP    1
@@ -155,20 +157,6 @@
 //
 // End including GL headers
 
-#if GL_VERSION_1_1
-    #define GR_GL_DESKTOP   1
-    #define GR_GL_ES        0
-#else
-    #ifndef GL_ES_VERSION_2_0
-        GR_STATIC_ASSERT(GL_VERSION_ES_CM_1_0 || 
-                         GL_VERSION_ES_CL_1_0 || 
-                         GL_VERSION_ES_CM_1_1 ||
-                         GL_VERSION_ES_CL_1_1);
-    #endif
-    #define GR_GL_DESKTOP   0
-    #define GR_GL_ES        1
-#endif
-
 #if GR_SCALAR_IS_FIXED
     #define GrGLType   GL_FIXED
 #elif GR_SCALAR_IS_FLOAT