| commit | 63a9f842a12c8ce265ca7a8c43117e2e7129ac83 | [log] [tgz] |
|---|---|---|
| author | rmistry <rmistry@google.com> | Fri Oct 17 06:07:08 2014 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Oct 17 06:07:08 2014 -0700 |
| tree | 8b3b4982483ea2fe65d13d5523099631b48a8063 | |
| parent | 79b2b1fb12202d22411b607a095cb26c6e4fe8b7 [diff] [blame] |
Revert of Revert of Support GLSL es 3.00 (patchset #1 id:1 of https://codereview.chromium.org/661603009/) Reason for revert: DEPS roll still failing: https://codereview.chromium.org/661993002/ Reverting the revert. Original issue's description: > Revert of Support GLSL es 3.00 (patchset #5 id:80001 of https://codereview.chromium.org/659443007/) > > Reason for revert: > Trying to fix DEPS roll failure: > https://codereview.chromium.org/660113002/ > > Link to failing builds: > http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/29578 > http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/29354 > > Original issue's description: > > Support GLSL es 3.00 > > > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/62372bcc6abe3537dac98dd9b9172cf3b85afa2b > > TBR=bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/79b2b1fb12202d22411b607a095cb26c6e4fe8b7 TBR=bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/647043005
diff --git a/src/gpu/gl/GrGLContext.cpp b/src/gpu/gl/GrGLContext.cpp index 5373634..fc8b195 100644 --- a/src/gpu/gl/GrGLContext.cpp +++ b/src/gpu/gl/GrGLContext.cpp
@@ -47,6 +47,16 @@ fVendor = GrGLGetVendor(interface); + /* + * Qualcomm drivers have a horrendous bug with some drivers. Though they claim to + * support GLES 3.00, some perfectly valid GLSL300 shaders will only compile with + * #version 100, and will fail to compile with #version 300 es. In the long term, we + * need to lock this down to a specific driver version. + */ + if (kQualcomm_GrGLVendor == fVendor) { + fGLSLGeneration = k110_GrGLSLGeneration; + } + fRenderer = GrGLGetRendererFromString(renderer); fIsMesa = GrGLIsMesaFromVersionString(ver);