diff options
author | 2016-10-18 09:09:49 -0400 | |
---|---|---|
committer | 2016-10-18 14:44:31 +0000 | |
commit | d7d1997643db3b9b5caaaac235c0e2cd0fa23ec2 (patch) | |
tree | a07313bdd338aaa90198908d927ad622ae22afff /src/gpu/glsl | |
parent | afc0b0f6a0c182435f316014df4e32460637b732 (diff) |
re-land of skslc now automatically turns on derivatives support
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3602
Change-Id: I822fc23f7d4eac76d5059412706117818f3738f0
Reviewed-on: https://skia-review.googlesource.com/3602
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/glsl')
-rw-r--r-- | src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp | 8 | ||||
-rw-r--r-- | src/gpu/glsl/GrGLSLFragmentShaderBuilder.h | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp index eb744a9915..db420c8439 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp @@ -96,14 +96,6 @@ GrGLSLFragmentShaderBuilder::GrGLSLFragmentShaderBuilder(GrGLSLProgramBuilder* p bool GrGLSLFragmentShaderBuilder::enableFeature(GLSLFeature feature) { const GrGLSLCaps& glslCaps = *fProgramBuilder->glslCaps(); switch (feature) { - case kStandardDerivatives_GLSLFeature: - if (!glslCaps.shaderDerivativeSupport()) { - return false; - } - if (const char* extension = glslCaps.shaderDerivativeExtensionString()) { - this->addFeature(1 << kStandardDerivatives_GLSLFeature, extension); - } - return true; case kPixelLocalStorage_GLSLFeature: if (glslCaps.pixelLocalStorageSize() <= 0) { return false; diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h index 6a4a184829..bf8569c073 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h @@ -29,8 +29,7 @@ public: * if code is added that uses one of these features without calling enableFeature() */ enum GLSLFeature { - kStandardDerivatives_GLSLFeature = kLastGLSLPrivateFeature + 1, - kPixelLocalStorage_GLSLFeature, + kPixelLocalStorage_GLSLFeature = kLastGLSLPrivateFeature + 1, kMultisampleInterpolation_GLSLFeature }; |