aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-07-09 06:28:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-09 06:28:14 -0700
commit9cc1775e7230579ad15345bdcb59fa517c17f870 (patch)
tree9e555bccd9ec1161fe61f33d44ae77bba7ef6544 /src/gpu
parent426388eeb7fd5cb9226fb1d2067c04f3aba8d094 (diff)
rename GrShaderDataManager -> GrProcessorDataManager
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrProcessorDataManager.cpp (renamed from src/gpu/GrShaderDataManager.cpp)2
-rw-r--r--src/gpu/SkGr.cpp4
-rw-r--r--src/gpu/effects/GrCustomXfermode.cpp8
-rw-r--r--src/gpu/effects/GrCustomXfermodePriv.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/GrShaderDataManager.cpp b/src/gpu/GrProcessorDataManager.cpp
index 8497f31463..addf4d88bd 100644
--- a/src/gpu/GrShaderDataManager.cpp
+++ b/src/gpu/GrProcessorDataManager.cpp
@@ -5,4 +5,4 @@
* found in the LICENSE file.
*/
-#include "GrShaderDataManager.h"
+#include "GrProcessorDataManager.h"
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index b7568c3ba6..a703146c54 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -720,7 +720,7 @@ bool SkPaint2GrPaintNoShader(GrContext* context, GrRenderTarget* rt, const SkPai
} else {
SkTDArray<GrFragmentProcessor*> array;
// return false if failed?
- if (colorFilter->asFragmentProcessors(context, grPaint->getShaderDataManager(),
+ if (colorFilter->asFragmentProcessors(context, grPaint->getProcessorDataManager(),
&array)) {
for (int i = 0; i < array.count(); ++i) {
grPaint->addColorProcessor(array[i]);
@@ -772,7 +772,7 @@ bool SkPaint2GrPaint(GrContext* context, GrRenderTarget* rt, const SkPaint& skPa
// the first color effect on the GrPaint.
GrFragmentProcessor* fp = NULL;
if (!shader->asFragmentProcessor(context, skPaint, viewM, NULL, &paintColor,
- grPaint->getShaderDataManager(), &fp)) {
+ grPaint->getProcessorDataManager(), &fp)) {
return false;
}
if (fp) {
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index c1ff3af1ed..7fc65a477c 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -431,12 +431,12 @@ static void emit_custom_xfermode_code(SkXfermode::Mode mode,
// Fragment Processor
///////////////////////////////////////////////////////////////////////////////
-GrFragmentProcessor* GrCustomXfermode::CreateFP(GrShaderDataManager* shaderDataManager,
+GrFragmentProcessor* GrCustomXfermode::CreateFP(GrProcessorDataManager* procDataManager,
SkXfermode::Mode mode, GrTexture* background) {
if (!GrCustomXfermode::IsSupportedMode(mode)) {
return NULL;
} else {
- return SkNEW_ARGS(GrCustomXferFP, (shaderDataManager, mode, background));
+ return SkNEW_ARGS(GrCustomXferFP, (procDataManager, mode, background));
}
}
@@ -479,7 +479,7 @@ private:
///////////////////////////////////////////////////////////////////////////////
-GrCustomXferFP::GrCustomXferFP(GrShaderDataManager*, SkXfermode::Mode mode, GrTexture* background)
+GrCustomXferFP::GrCustomXferFP(GrProcessorDataManager*, SkXfermode::Mode mode, GrTexture* background)
: fMode(mode) {
this->initClassID<GrCustomXferFP>();
@@ -512,7 +512,7 @@ GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrCustomXferFP);
GrFragmentProcessor* GrCustomXferFP::TestCreate(GrProcessorTestData* d) {
int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode);
- return SkNEW_ARGS(GrCustomXferFP, (d->fShaderDataManager, static_cast<SkXfermode::Mode>(mode),
+ return SkNEW_ARGS(GrCustomXferFP, (d->fProcDataManager, static_cast<SkXfermode::Mode>(mode),
d->fTextures[0]));
}
diff --git a/src/gpu/effects/GrCustomXfermodePriv.h b/src/gpu/effects/GrCustomXfermodePriv.h
index b92debb16f..ab9d041eba 100644
--- a/src/gpu/effects/GrCustomXfermodePriv.h
+++ b/src/gpu/effects/GrCustomXfermodePriv.h
@@ -27,7 +27,7 @@ class GrTexture;
class GrCustomXferFP : public GrFragmentProcessor {
public:
- GrCustomXferFP(GrShaderDataManager*, SkXfermode::Mode mode, GrTexture* background);
+ GrCustomXferFP(GrProcessorDataManager*, SkXfermode::Mode mode, GrTexture* background);
void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;