diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-20 22:15:40 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-20 22:15:48 +0000 |
| commit | 2871436b2adf7fb126c2a113b70f7c1f2bbf9ef7 (patch) | |
| tree | 0d42230ada3f0b8fcb2e879de3757781b5bb66f4 /src/gpu/glsl | |
| parent | 41c26eaf957c8ab3260d05ceddc0ed3f6f86bb2e (diff) | |
Revert "CCPR: Initial semi-optimized vertex shader Impl"
This reverts commit a8f6aef13d0592305e05baf19ee724f31a53b466.
Reason for revert: Looks to failing on ANGLE bots
Original change's description:
> CCPR: Initial semi-optimized vertex shader Impl
>
> Bug: skia:
> Change-Id: If22f47a3b945ce7336f8e609c2e0c911f09e1d18
> Reviewed-on: https://skia-review.googlesource.com/86820
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com
Change-Id: Ic5a73434cba4246a72790db2c27d06e7a50f389a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/88220
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/glsl')
| -rw-r--r-- | src/gpu/glsl/GrGLSLVarying.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/glsl/GrGLSLVarying.h | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/gpu/glsl/GrGLSLVarying.cpp b/src/gpu/glsl/GrGLSLVarying.cpp index 5a57613b3a..4bcce0391a 100644 --- a/src/gpu/glsl/GrGLSLVarying.cpp +++ b/src/gpu/glsl/GrGLSLVarying.cpp @@ -37,7 +37,6 @@ void GrGLSLVaryingHandler::internalAddVarying(const char* name, GrGLSLVarying* v VaryingInfo& v = fVaryings.push_back(); SkASSERT(varying); - SkASSERT(kVoid_GrSLType != varying->fType); v.fType = varying->fType; v.fIsFlat = flat; fProgramBuilder->nameVariable(&v.fVsOut, 'v', name); diff --git a/src/gpu/glsl/GrGLSLVarying.h b/src/gpu/glsl/GrGLSLVarying.h index dac9bb771f..e6174a6197 100644 --- a/src/gpu/glsl/GrGLSLVarying.h +++ b/src/gpu/glsl/GrGLSLVarying.h @@ -24,15 +24,8 @@ public: kGeoToFrag }; - GrGLSLVarying() = default; GrGLSLVarying(GrSLType type, Scope scope = Scope::kVertToFrag) : fType(type), fScope(scope) {} - void reset(GrSLType type, Scope scope = Scope::kVertToFrag) { - *this = GrGLSLVarying(); - fType = type; - fScope = scope; - } - GrSLType type() const { return fType; } Scope scope() const { return fScope; } bool isInVertexShader() const { return Scope::kGeoToFrag != fScope; } @@ -44,8 +37,8 @@ public: const char* fsIn() const { SkASSERT(this->isInFragmentShader()); return fFsIn; } private: - GrSLType fType = kVoid_GrSLType; - Scope fScope = Scope::kVertToFrag; + const GrSLType fType; + const Scope fScope; const char* fVsOut = nullptr; const char* fGsIn = nullptr; const char* fGsOut = nullptr; |