aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp3
-rw-r--r--dm/DMSrcSink.cpp7
-rw-r--r--dm/DMSrcSink.h5
3 files changed, 3 insertions, 12 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 0bd5b79292..0190262787 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -739,8 +739,7 @@ static Sink* create_sink(const SkCommandLineConfig* config) {
return nullptr;
}
return new GPUSink(contextType, contextOptions, gpuConfig->getSamples(),
- gpuConfig->getUseDIText(), gpuConfig->getColorType(),
- gpuConfig->getProfileType(), FLAGS_gpu_threading);
+ gpuConfig->getUseDIText(), FLAGS_gpu_threading);
}
}
#endif
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index c1db17814a..2d2a455e7b 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -856,15 +856,11 @@ GPUSink::GPUSink(GrContextFactory::GLContextType ct,
GrContextFactory::GLContextOptions options,
int samples,
bool diText,
- SkColorType colorType,
- SkColorProfileType profileType,
bool threaded)
: fContextType(ct)
, fContextOptions(options)
, fSampleCount(samples)
, fUseDIText(diText)
- , fColorType(colorType)
- , fProfileType(profileType)
, fThreaded(threaded) {}
void PreAbandonGpuContextErrorHandler(SkError, void*) {}
@@ -886,8 +882,7 @@ Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*, SkString* log) co
GrContextFactory factory(grOptions);
const SkISize size = src.size();
const SkImageInfo info =
- SkImageInfo::Make(size.width(), size.height(), fColorType,
- kPremul_SkAlphaType, fProfileType);
+ SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType);
#if SK_SUPPORT_GPU
const int maxDimension = factory.getContextInfo(fContextType, fContextOptions).
fGrContext->caps()->maxTextureSize();
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index babe14d135..bbf47cffd8 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -213,8 +213,7 @@ public:
class GPUSink : public Sink {
public:
GPUSink(GrContextFactory::GLContextType, GrContextFactory::GLContextOptions,
- int samples, bool diText, SkColorType colorType, SkColorProfileType profileType,
- bool threaded);
+ int samples, bool diText, bool threaded);
Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
bool serial() const override { return !fThreaded; }
@@ -225,8 +224,6 @@ private:
GrContextFactory::GLContextOptions fContextOptions;
int fSampleCount;
bool fUseDIText;
- SkColorType fColorType;
- SkColorProfileType fProfileType;
bool fThreaded;
};