diff options
author | 2017-01-29 09:34:17 -0500 | |
---|---|---|
committer | 2017-01-30 16:39:41 +0000 | |
commit | 3de0aee181b8fe0013b15100cba7381eb0468db4 (patch) | |
tree | 5e08bf4394a36d800d07555112d1e1eb9c2a652d /src/gpu/GrDefaultGeoProcFactory.h | |
parent | 7f660e84189adc92b1996b4b2e0f5a1ad897dff9 (diff) |
Make SkGpuDevice::drawVertices perform color byte order swap and premul step using vertex shader.
Change-Id: I8153ba8c6bb48d8b15d524fbfafbe3c6d83f39c5
Reviewed-on: https://skia-review.googlesource.com/7727
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrDefaultGeoProcFactory.h')
-rw-r--r-- | src/gpu/GrDefaultGeoProcFactory.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/GrDefaultGeoProcFactory.h index 238c154489..00ee90d940 100644 --- a/src/gpu/GrDefaultGeoProcFactory.h +++ b/src/gpu/GrDefaultGeoProcFactory.h @@ -62,18 +62,13 @@ namespace GrDefaultGeoProcFactory { struct Color { enum Type { - kNone_Type, - kUniform_Type, - kAttribute_Type, + kPremulGrColorUniform_Type, + kPremulGrColorAttribute_Type, + kUnpremulSkColorAttribute_Type, }; - explicit Color(GrColor color) : fType(kUniform_Type), fColor(color) {} + explicit Color(GrColor color) : fType(kPremulGrColorUniform_Type), fColor(color) {} Color(Type type) : fType(type), fColor(GrColor_ILLEGAL) { - SkASSERT(type != kUniform_Type); - - // TODO This is temporary - if (kAttribute_Type == type) { - fColor = GrColor_WHITE; - } + SkASSERT(type != kPremulGrColorUniform_Type); } Type fType; |