Checkpoint towards core profile support.

src/gpu/gl/GrGpuGL.cpp

Index: src/gpu/gl/GrGpuGL.cpp
===================================================================
--- src/gpu/gl/GrGpuGL.cpp	(revision 7894)
+++ src/gpu/gl/GrGpuGL.cpp	(working copy)
@@ -410,15 +410,17 @@
 
     if (kDesktop_GrGLBinding == this->glBinding()) {
         // Desktop-only state that we never change

[robertphillips, 2013/02/27 22:33:07]

Shouldn't we instead check if they are enabled and disable them as required?

[bsalomon, 2013/02/28 14:09:41]

You mean make glGetIntegerv calls? I assume that querying can only be worse than
disabling unconditionally. I don't expect desktop drivers to do much work if we
disable these redundantly. This is the onResetContext() call which hopefully
gets called very rarely (only after third party code has touched the GL
context).

-        GL_CALL(Disable(GR_GL_POINT_SMOOTH));
-        GL_CALL(Disable(GR_GL_LINE_SMOOTH));
-        GL_CALL(Disable(GR_GL_POLYGON_SMOOTH));
-        GL_CALL(Disable(GR_GL_POLYGON_STIPPLE));
-        GL_CALL(Disable(GR_GL_COLOR_LOGIC_OP));
+        if (!this->glCaps().isCoreProfile()) {
+            GL_CALL(Disable(GR_GL_POINT_SMOOTH));
+            GL_CALL(Disable(GR_GL_LINE_SMOOTH));
+            GL_CALL(Disable(GR_GL_POLYGON_SMOOTH));
+            GL_CALL(Disable(GR_GL_POLYGON_STIPPLE));
+            GL_CALL(Disable(GR_GL_COLOR_LOGIC_OP));
+            GL_CALL(Disable(GR_GL_INDEX_LOGIC_OP));
+        }

[robertphillips, 2013/02/27 22:33:07]

Why not these other two?

[bsalomon, 2013/02/28 14:09:41]

The offset fill and vp point size? They're still around in core profile. (well
VERTEX_PROGRAM_POINT_SIZE was renamed to PROGRAM_POINT_SIZE at some point, but
same integer value).

         if (this->glCaps().imagingSupport()) {
             GL_CALL(Disable(GR_GL_COLOR_TABLE));
         }
-        GL_CALL(Disable(GR_GL_INDEX_LOGIC_OP));
         GL_CALL(Disable(GR_GL_POLYGON_OFFSET_FILL));
         // Since ES doesn't support glPointSize at all we always use the VS to
         // set the point size