Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: src/gpu/gl/GrGLSL.cpp

Issue 659313004: bug fix for glsl identity string (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLSL.cpp
diff --git a/src/gpu/gl/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp
index 34c805e21fcada65618a8874c9bffc9ee4cf083f..d388d9120a1d3fc43891ba47a50f2f4221ddb432 100644
--- a/src/gpu/gl/GrGLSL.cpp
+++ b/src/gpu/gl/GrGLSL.cpp
@@ -76,7 +76,11 @@ const char* GrGetGLSLVersionDecl(const GrGLContextInfo& info) {
return "#version 300 es\n";
} else {
SkASSERT(kGL_GrGLStandard == info.standard());
- return "#version 330 compatibility\n";
+ if (info.caps()->isCoreProfile()) {
+ return "#version 330\n";
+ } else {
+ return "#version 330 compatibility\n";
+ }
}
case k310es_GrGLSLGeneration:
SkASSERT(kGLES_GrGLStandard == info.standard());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698