| Index: src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| index f97b8541d0b6dcf41fef56cc1537bf7b3a5cc7e4..90e20437e17ba4aeeb16546a078471c6158f1bad 100644
|
| --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "GrGLSLFragmentShaderBuilder.h"
|
| #include "GrRenderTarget.h"
|
| -#include "gl/GrGLGpu.h"
|
| #include "glsl/GrGLSL.h"
|
| #include "glsl/GrGLSLCaps.h"
|
| #include "glsl/GrGLSLProgramBuilder.h"
|
| @@ -88,14 +87,6 @@ bool GrGLSLFragmentShaderBuilder::enableFeature(GLSLFeature feature) {
|
| }
|
| return true;
|
| }
|
| - case kPixelLocalStorage_GLSLFeature: {
|
| - if (fProgramBuilder->glslCaps()->pixelLocalStorageSize() <= 0) {
|
| - return false;
|
| - }
|
| - this->addFeature(1 << kPixelLocalStorage_GLSLFeature,
|
| - "GL_EXT_shader_pixel_local_storage");
|
| - return true;
|
| - }
|
| default:
|
| SkFAIL("Unexpected GLSLFeature requested.");
|
| return false;
|
| @@ -169,11 +160,6 @@ const char* GrGLSLFragmentShaderBuilder::fragmentPosition() {
|
| const char* GrGLSLFragmentShaderBuilder::dstColor() {
|
| fHasReadDstColor = true;
|
|
|
| - const char* override = fProgramBuilder->primitiveProcessor().getDestColorOverride();
|
| - if (override != nullptr) {
|
| - return override;
|
| - }
|
| -
|
| const GrGLSLCaps* glslCaps = fProgramBuilder->glslCaps();
|
| if (glslCaps->fbFetchSupport()) {
|
| this->addFeature(1 << (GrGLSLFragmentShaderBuilder::kLastGLSLPrivateFeature + 1),
|
| @@ -241,13 +227,6 @@ const char* GrGLSLFragmentShaderBuilder::getPrimaryColorOutputName() const {
|
| return fHasCustomColorOutput ? DeclaredColorOutputName() : "gl_FragColor";
|
| }
|
|
|
| -void GrGLSLFragmentBuilder::declAppendf(const char* fmt, ...) {
|
| - va_list argp;
|
| - va_start(argp, fmt);
|
| - inputs().appendVAList(fmt, argp);
|
| - va_end(argp);
|
| -}
|
| -
|
| const char* GrGLSLFragmentShaderBuilder::getSecondaryColorOutputName() const {
|
| const GrGLSLCaps& caps = *fProgramBuilder->glslCaps();
|
| return caps.mustDeclareFragmentShaderOutput() ? DeclaredSecondaryColorOutputName()
|
|
|