Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Unified Diff: src/gpu/glsl/GrGLSLXferProcessor.h

Issue 1885863004: Refactor how we store and use samplers in Ganesh (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove unneeded assert Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/glsl/GrGLSLUniformHandler.h ('k') | src/gpu/vk/GrVkGLSLSampler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/glsl/GrGLSLXferProcessor.h
diff --git a/src/gpu/glsl/GrGLSLXferProcessor.h b/src/gpu/glsl/GrGLSLXferProcessor.h
index adc3d417658b46c85f7c054acc5248a86d88d31c..f4a8ebdfa029b0d6d5fbc11cf09463dbe8c2c019 100644
--- a/src/gpu/glsl/GrGLSLXferProcessor.h
+++ b/src/gpu/glsl/GrGLSLXferProcessor.h
@@ -22,7 +22,8 @@ public:
GrGLSLXferProcessor() {}
virtual ~GrGLSLXferProcessor() {}
- typedef GrGLSLSampler::SamplerArray SamplerArray;
+ typedef GrGLSLProgramDataManager::UniformHandle SamplerHandle;
+
struct EmitArgs {
EmitArgs(GrGLSLXPFragmentBuilder* fragBuilder,
GrGLSLUniformHandler* uniformHandler,
@@ -32,8 +33,8 @@ public:
const char* inputCoverage,
const char* outputPrimary,
const char* outputSecondary,
- const SamplerArray& texSamplers,
- const SamplerArray& bufferSamplers,
+ const SamplerHandle* texSamplers,
+ const SamplerHandle* bufferSamplers,
const bool usePLSDstRead)
: fXPFragBuilder(fragBuilder)
, fUniformHandler(uniformHandler)
@@ -55,8 +56,8 @@ public:
const char* fInputCoverage;
const char* fOutputPrimary;
const char* fOutputSecondary;
- const SamplerArray& fTexSamplers;
- const SamplerArray& fBufferSamplers;
+ const SamplerHandle* fTexSamplers;
+ const SamplerHandle* fBufferSamplers;
bool fUsePLSDstRead;
};
/**
« no previous file with comments | « src/gpu/glsl/GrGLSLUniformHandler.h ('k') | src/gpu/vk/GrVkGLSLSampler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698