diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2016-10-18 08:16:41 -0400 |
|---|---|---|
| committer | Ethan Nicholas <ethannicholas@google.com> | 2016-10-18 12:18:33 +0000 |
| commit | 311742bd0eac6fad150bf8f0a4e2809679464e47 (patch) | |
| tree | a0c63d19850212b2b4c1353f6305d619dec381e3 /src/gpu/glsl | |
| parent | 4f2a88cdf0e72d6cdf8d870c5130f45c70c48e09 (diff) | |
skslc now automatically turns on derivatives support
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3569
Change-Id: I211f4a80ced951a0d2f29763f85fe75a5daccff7
Reviewed-on: https://skia-review.googlesource.com/3569
Reviewed-by: Ben Wagner <benjaminwagner@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 }; |