diff options
author | Brian Salomon <bsalomon@google.com> | 2017-11-15 14:28:33 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-15 20:06:12 +0000 |
commit | 559f556d9d70ef9d1202e436a56d48364b279ac6 (patch) | |
tree | 0371c13e6ed17e351066f1be46f4053e72c63365 /src/gpu/glsl/GrGLSLProgramBuilder.h | |
parent | 33d17cbb003975fff895954435183756f9893c17 (diff) |
Remove support for image load/store
This isn't used and has become a maintenance burden.
Change-Id: I5f3af8f91e5c4f073fe4ea30e0a7f1f61efeea47
Reviewed-on: https://skia-review.googlesource.com/70640
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.h')
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 83a437f84f..ac2d4965b5 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -31,7 +31,6 @@ public: using UniformHandle = GrGLSLUniformHandler::UniformHandle; using SamplerHandle = GrGLSLUniformHandler::SamplerHandle; using TexelBufferHandle = GrGLSLUniformHandler::TexelBufferHandle; - using ImageStorageHandle = GrGLSLUniformHandler::ImageStorageHandle; virtual ~GrGLSLProgramBuilder() {} @@ -57,10 +56,6 @@ public: return this->uniformHandler()->texelBufferVariable(handle); } - const GrShaderVar& imageStorageVariable(ImageStorageHandle handle) const { - return this->uniformHandler()->imageStorageVariable(handle); - } - // Handles for program uniforms (other than per-effect uniforms) struct BuiltinUniformHandles { UniformHandle fRTAdjustmentUni; @@ -156,19 +151,15 @@ private: const SkString& input, SkString output); void emitAndInstallXferProc(const SkString& colorIn, const SkString& coverageIn); - void emitSamplersAndImageStorages(const GrResourceIOProcessor& processor, - SkTArray<SamplerHandle>* outTexSamplerHandles, - SkTArray<TexelBufferHandle>* outTexelBufferHandles, - SkTArray<ImageStorageHandle>* outImageStorageHandles); + void emitSamplers(const GrResourceIOProcessor& processor, + SkTArray<SamplerHandle>* outTexSamplerHandles, + SkTArray<TexelBufferHandle>* outTexelBufferHandles); SamplerHandle emitSampler(GrSLType samplerType, GrPixelConfig, const char* name, GrShaderFlags visibility); TexelBufferHandle emitTexelBuffer(GrPixelConfig, const char* name, GrShaderFlags visibility); - ImageStorageHandle emitImageStorage(const GrResourceIOProcessor::ImageStorageAccess&, - const char* name); void emitFSOutputSwizzle(bool hasSecondaryOutput); void updateSamplerCounts(GrShaderFlags visibility); bool checkSamplerCounts(); - bool checkImageStorageCounts(); #ifdef SK_DEBUG void verify(const GrPrimitiveProcessor&); @@ -181,9 +172,6 @@ private: int fNumVertexSamplers; int fNumGeometrySamplers; int fNumFragmentSamplers; - int fNumVertexImageStorages; - int fNumGeometryImageStorages; - int fNumFragmentImageStorages; SkSTArray<4, GrShaderVar> fTransformedCoordVars; }; |