summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/skia/src/gpu/gl/GrGLSL.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/skia/src/gpu/gl/GrGLSL.h')
-rw-r--r--chromium/third_party/skia/src/gpu/gl/GrGLSL.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/third_party/skia/src/gpu/gl/GrGLSL.h b/chromium/third_party/skia/src/gpu/gl/GrGLSL.h
index 8c5da51bde0..ff39c2b6800 100644
--- a/chromium/third_party/skia/src/gpu/gl/GrGLSL.h
+++ b/chromium/third_party/skia/src/gpu/gl/GrGLSL.h
@@ -40,8 +40,7 @@ enum GrGLSLGeneration {
/**
* Gets the most recent GLSL Generation compatible with the OpenGL context.
*/
-GrGLSLGeneration GrGetGLSLGeneration(GrGLBinding binding,
- const GrGLInterface* gl);
+bool GrGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation);
/**
* Returns a string to include at the beginning of a shader to declare the GLSL
@@ -71,7 +70,7 @@ static inline const char* GrGLSLTypeString(GrSLType t) {
case kSampler2D_GrSLType:
return "sampler2D";
default:
- GrCrash("Unknown shader var type.");
+ SkFAIL("Unknown shader var type.");
return ""; // suppress warning
}
}