diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-10-17 10:54:04 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-17 10:54:04 -0700 |
| commit | 2813f344921f05f634e54646bfc6b971b1a15fd3 (patch) | |
| tree | d6c430cb60c84bdbbe8aedbd89cd0a6265959ae8 | |
| parent | dc89ca56e6f33790cda2cd93ad772ca61497346b (diff) | |
bug fix for glsl identity string
BUG=skia:
Review URL: https://codereview.chromium.org/659313004
| -rw-r--r-- | src/gpu/gl/GrGLSL.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp index 34c805e21f..d388d9120a 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()); |