AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use constant swizzle syntax in GrDrawVerticesOp

Browse Source 
Change-Id: Id159552ce558d278fa124c99080025cd11b0a42c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/285784
Auto-Submit: Brian Osman <brianosman@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Brian Osman 2020-04-28 09:59:37 -04:00 committed by Skia Commit-Bot
parent fc75d5c52d
commit f1792cde0b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gpu/ops/GrDrawVerticesOp.cpp
View File

@ -224,7 +224,7 @@ public:
case Usage::kColor: {
// For RGB colors, expand to RGBA with A = 1
if (attr.gpuType() == kFloat3_GrSLType) {
varyingIn = SkStringPrintf("float4(%s, 1)", attr.name());
varyingIn = SkStringPrintf("%s.rgb1", attr.name());
}
// Convert to half (as expected by the color space transform functions)
varyingIn = SkStringPrintf("half4(%s)", varyingIn.c_str());
@ -244,10 +244,10 @@ public:
}
case Usage::kVector: {
if (attr.gpuType() == kFloat2_GrSLType) {
varyingIn = SkStringPrintf("float3(%s, 0)", attr.name());
varyingIn = SkStringPrintf("%s.xy0", attr.name());
}
if (matrixHandle.isValid()) {
varyingIn = SkStringPrintf("(%s * float4(%s, 0)).xyz",
varyingIn = SkStringPrintf("(%s * %s.xyz0).xyz",
uniformHandler->getUniformCStr(matrixHandle),
varyingIn.c_str());
}
@ -257,7 +257,7 @@ public:
}
case Usage::kNormalVector: {
if (attr.gpuType() == kFloat2_GrSLType) {
varyingIn = SkStringPrintf("float3(%s, 0)", attr.name());
varyingIn = SkStringPrintf("%s.xy0", attr.name());
}
if (matrixHandle.isValid()) {
varyingIn = SkStringPrintf("(%s * %s)",
@ -270,10 +270,10 @@ public:
}
case Usage::kPosition: {
if (attr.gpuType() == kFloat2_GrSLType) {
varyingIn = SkStringPrintf("float3(%s, 0)", attr.name());
varyingIn = SkStringPrintf("%s.xy0", attr.name());
}
if (matrixHandle.isValid()) {
vertBuilder->codeAppendf("float4 _tmp_pos_%d = %s * float4(%s, 1);",
vertBuilder->codeAppendf("float4 _tmp_pos_%d = %s * %s.xyz1;",
customIdx,
uniformHandler->getUniformCStr(matrixHandle),
varyingIn.c_str());