commit c1f56b518218d1caa65d6b7101bebf0d28c02a92
author joshualitt <joshualitt@chromium.org> Mon Jun 22 12:31:31 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 22 12:31:32 2015 -0700
tree 94f644bf6201616b4f3b31356ef7b34c7903603a
parent efbffedd68636e94d4379e84a2585bce80f6fb8f

fix for calling bindFragDataLocation on OpenGL 2.1

BUG=skia:3966

Review URL: https://codereview.chromium.org/1201623003

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index c7dc862..b23619d 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -47,6 +47,7 @@
     fUseNonVBOVertexAndIndexDynamicData = false;
     fIsCoreProfile = false;
     fFullClearIsFree = false;
+    fBindFragDataLocationSupport = false;
 
     fReadPixelsSupportedCache.reset();
 
@@ -270,6 +271,10 @@
         fMultisampleDisableSupport = false;
     }
 
+    if (kGL_GrGLStandard == standard && version >= GR_GL_VER(3, 0)) {
+        fBindFragDataLocationSupport = true;
+    }
+
     /**************************************************************************
     * GrShaderCaps fields
     **************************************************************************/

src/gpu/gl/GrGLCaps.h

diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 1f5d6c2..3d33199 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -257,6 +257,8 @@
 
     bool fullClearIsFree() const { return fFullClearIsFree; }
 
+    bool bindFragDataLocationSupport() const { return fBindFragDataLocationSupport; }
+
     /**
      * Returns a string containing the caps info.
      */
@@ -367,6 +369,7 @@
     bool fUseNonVBOVertexAndIndexDynamicData : 1;
     bool fIsCoreProfile : 1;
     bool fFullClearIsFree : 1;
+    bool fBindFragDataLocationSupport : 1;
 
     struct ReadPixelsSupportedFormat {
         GrGLenum fFormat;

src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp

diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp
index e6c07c2..557cdbf 100644
--- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp
@@ -264,9 +264,7 @@
 }
 
 void GrGLFragmentShaderBuilder::bindFragmentShaderLocations(GrGLuint programID) {
-    // ES 3.00 requires custom color output but doesn't support bindFragDataLocation
-    if (fHasCustomColorOutput &&
-        kGLES_GrGLStandard != fProgramBuilder->gpu()->ctxInfo().standard()) {
+    if (fHasCustomColorOutput && fProgramBuilder->gpu()->glCaps().bindFragDataLocationSupport()) {
         GL_CALL(BindFragDataLocation(programID, 0, declared_color_output_name()));
     }
     if (fHasSecondaryOutput) {