diff options
| author |  rmistry <rmistry@google.com> | 2014-10-17 06:07:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-17 06:07:08 -0700 |
| commit | 63a9f842a12c8ce265ca7a8c43117e2e7129ac83 (patch) | |
| tree | 8b3b4982483ea2fe65d13d5523099631b48a8063 /src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp | |
| parent | 79b2b1fb12202d22411b607a095cb26c6e4fe8b7 (diff) | |
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
Diffstat (limited to 'src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp')
| -rw-r--r-- | src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp index 488d07b8db..5d5741ef9b 100644 --- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp +++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp @@ -42,8 +42,7 @@ static void append_default_precision_qualifier(GrGLShaderVar::Precision p, } GrGLFragmentShaderBuilder::DstReadKey -GrGLFragmentShaderBuilder::KeyForDstRead(const GrTexture* dstCopy, - const GrGLCaps& caps) { +GrGLFragmentShaderBuilder::KeyForDstRead(const GrTexture* dstCopy, const GrGLCaps& caps) { uint32_t key = kYesDstRead_DstReadKeyBit; if (caps.fbFetchSupport()) { return key; @@ -61,8 +60,7 @@ GrGLFragmentShaderBuilder::KeyForDstRead(const GrTexture* dstCopy, } GrGLFragmentShaderBuilder::FragPosKey -GrGLFragmentShaderBuilder::KeyForFragmentPosition(const GrRenderTarget* dst, - const GrGLCaps&) { +GrGLFragmentShaderBuilder::KeyForFragmentPosition(const GrRenderTarget* dst, const GrGLCaps&) { if (kTopLeft_GrSurfaceOrigin == dst->origin()) { return kTopLeftFragPosRead_FragPosKey; } else { @@ -88,7 +86,8 @@ bool GrGLFragmentShaderBuilder::enableFeature(GLSLFeature feature) { if (!gpu->glCaps().shaderDerivativeSupport()) { return false; } - if (kGLES_GrGLStandard == gpu->glStandard()) { + if (kGLES_GrGLStandard == gpu->glStandard() && + k110_GrGLSLGeneration == gpu->glslGeneration()) { this->addFeature(1 << kStandardDerivatives_GLSLFeature, "GL_OES_standard_derivatives"); } @@ -326,7 +325,9 @@ bool GrGLFragmentShaderBuilder::compileAndAttachShaders(GrGLuint programId, } void GrGLFragmentShaderBuilder::bindFragmentShaderLocations(GrGLuint programID) { - if (fHasCustomColorOutput) { + // ES 3.00 requires custom color output but doesn't support bindFragDataLocation + if (fHasCustomColorOutput && + kGLES_GrGLStandard != fProgramBuilder->gpu()->ctxInfo().standard()) { GL_CALL(BindFragDataLocation(programID, 0, declared_color_output_name())); } if (fHasSecondaryOutput) { |