aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGLCaps.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2016-11-15 13:26:08 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-15 19:09:49 +0000
commitd327e8c3d0ff9e9038c60f486d3f4023318e29a8 (patch)
tree7a77cc594925a8cae91ec512edf3714b936d500e /src/gpu/gl/GrGLCaps.cpp
parent918fb1fe6ff5349a2d1e5fb6872139f5fb931480 (diff)
Add 4.20 as a GLSL output version.
GLSL 4.20 adds support for image functions which will be used in forthcoming changes. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4833 Change-Id: I8cab511d95f04b45faaf916628148117b8be2128 Reviewed-on: https://skia-review.googlesource.com/4833 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLCaps.cpp')
-rw-r--r--src/gpu/gl/GrGLCaps.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index ed3c38180e..d1c1162a9e 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -622,6 +622,14 @@ const char* get_glsl_version_decl_string(GrGLStandard standard, GrGLSLGeneration
} else {
return "#version 400 compatibility\n";
}
+ case k420_GrGLSLGeneration:
+ SkASSERT(kGL_GrGLStandard == standard);
+ if (isCoreProfile) {
+ return "#version 420\n";
+ }
+ else {
+ return "#version 420 compatibility\n";
+ }
case k310es_GrGLSLGeneration:
SkASSERT(kGLES_GrGLStandard == standard);
return "#version 310 es\n";