Index: src/gpu/gl/GrGLSL.cpp |
=================================================================== |
--- src/gpu/gl/GrGLSL.cpp (revision 8458) |
+++ src/gpu/gl/GrGLSL.cpp (working copy) |
@@ -9,8 +9,7 @@ |
#include "GrGLShaderVar.h" |
#include "SkString.h" |
-GrGLSLGeneration GrGetGLSLGeneration(GrGLBinding binding, |
- const GrGLInterface* gl) { |
+GrGLSLGeneration GrGetGLSLGeneration(GrGLBinding binding, const GrGLInterface* gl) { |
GrGLSLVersion ver = GrGLGetGLSLVersion(gl); |
switch (binding) { |
case kDesktop_GrGLBinding: |
@@ -34,8 +33,7 @@ |
} |
} |
-const char* GrGetGLSLVersionDecl(GrGLBinding binding, |
- GrGLSLGeneration gen) { |
+const char* GrGetGLSLVersionDecl(GrGLBinding binding, GrGLSLGeneration gen) { |
switch (gen) { |
case k110_GrGLSLGeneration: |
if (kES2_GrGLBinding == binding) { |
@@ -61,9 +59,7 @@ |
} |
} |
-bool GrGLSLSetupFSColorOuput(GrGLSLGeneration gen, |
- const char* nameIfDeclared, |
- GrGLShaderVar* var) { |
+bool GrGLSLSetupFSColorOuput(GrGLSLGeneration gen, const char* nameIfDeclared, GrGLShaderVar* var) { |
bool declaredOutput = k110_GrGLSLGeneration != gen; |
var->set(kVec4f_GrSLType, |
GrGLShaderVar::kOut_TypeModifier, |