diff options
author | Brian Salomon <bsalomon@google.com> | 2017-04-03 16:57:43 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-03 21:35:47 +0000 |
commit | 18dfa980765bee6a1ce7c5f430cb32f487da6590 (patch) | |
tree | f82444c520111b4710746480652fde74d2db3815 /src/gpu/glsl/GrGLSLProgramBuilder.h | |
parent | b9c4a6fc7de252633f16d11c2df10ee6de16af03 (diff) |
Store the dst texture used by an XP in GrPipeline rather than in the XP.
This will allow the XP to be created before the dst texture.
Change-Id: I3e5bdfa8e5d47e58a3560792ce5cf3899d30a024
Reviewed-on: https://skia-review.googlesource.com/11011
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.h')
-rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 748664625f..2d2ab47a5e 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -152,18 +152,14 @@ private: int transformedCoordVarsIdx, const GrGLSLExpr4& input, GrGLSLExpr4* output); - void emitAndInstallXferProc(const GrXferProcessor&, - const GrGLSLExpr4& colorIn, - const GrGLSLExpr4& coverageIn); + void emitAndInstallXferProc(const GrGLSLExpr4& colorIn, const GrGLSLExpr4& coverageIn); void emitSamplersAndImageStorages(const GrProcessor& processor, SkTArray<SamplerHandle>* outTexSamplerHandles, SkTArray<SamplerHandle>* outBufferSamplerHandles, SkTArray<ImageStorageHandle>* outImageStorageHandles); - void emitSampler(GrSLType samplerType, GrPixelConfig, const char* name, - GrShaderFlags visibility, SkTArray<SamplerHandle >* outSamplerHandles); - void emitImageStorage(const GrProcessor::ImageStorageAccess&, - const char* name, - SkTArray<ImageStorageHandle>* outImageStorageHandles); + SamplerHandle emitSampler(GrSLType samplerType, GrPixelConfig, const char* name, + GrShaderFlags visibility); + ImageStorageHandle emitImageStorage(const GrProcessor::ImageStorageAccess&, const char* name); void emitFSOutputSwizzle(bool hasSecondaryOutput); bool checkSamplerCounts(); bool checkImageStorageCounts(); |