diff options
author | 2018-01-24 14:52:02 +0000 | |
---|---|---|
committer | 2018-01-24 14:52:11 +0000 | |
commit | fe8da17f5333a0134a01b9fe4d7f67e3df949c61 (patch) | |
tree | bcffa405e17967214abcc9efcf75ede8d9cff689 /src/gpu/glsl/GrGLSLProgramBuilder.cpp | |
parent | 3a08c65b9612dd845623f0e880fd68b3be75fceb (diff) |
Revert "Revert "converted vertex shaders to device coords""
This reverts commit 29b3434e48ca41672266ac40f5b9e8f8a0405cb5.
Reason for revert: The Chrome perf regression is suspect & the Nexus 5 is broken w/o this CL.
Original change's description:
> Revert "converted vertex shaders to device coords"
>
> This reverts commit e7e81c15c144b8133f696d0744ed9f7e8d06e936.
>
> Reason for revert: Chrome perf regressions
>
> Bug: skia:
> Change-Id: I17fadc97c4b8e80bfdccbf123554614a00c58473
> Reviewed-on: https://skia-review.googlesource.com/99040
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=csmartdalton@google.com,ethannicholas@google.com
Change-Id: Iff3c9fce65beeca16028ae59d4d08b1413b90530
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/99241
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.cpp')
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 118b904540..04ebc6ad8e 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -15,6 +15,7 @@ #include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLVarying.h" #include "glsl/GrGLSLXferProcessor.h" +#include "SkSLCompiler.h" const int GrGLSLProgramBuilder::kVarsPerBlock = 8; @@ -74,13 +75,16 @@ void GrGLSLProgramBuilder::emitAndInstallPrimProc(const GrPrimitiveProcessor& pr this->nameExpression(outputCoverage, "outputCoverage"); SkASSERT(!fUniformHandles.fRTAdjustmentUni.isValid()); - GrShaderFlags rtAdjustVisibility = kVertex_GrShaderFlag; + GrShaderFlags rtAdjustVisibility; if (proc.willUseGeoShader()) { - rtAdjustVisibility |= kGeometry_GrShaderFlag; + rtAdjustVisibility = kGeometry_GrShaderFlag; + } else { + rtAdjustVisibility = kVertex_GrShaderFlag; } - fUniformHandles.fRTAdjustmentUni = this->uniformHandler()->addUniform(rtAdjustVisibility, - kFloat4_GrSLType, - "rtAdjustment"); + fUniformHandles.fRTAdjustmentUni = this->uniformHandler()->addUniform( + rtAdjustVisibility, + kFloat4_GrSLType, + SkSL::Compiler::RTADJUST_NAME); const char* rtAdjustName = this->uniformHandler()->getUniformCStr(fUniformHandles.fRTAdjustmentUni); |