commit 422f95bce806b92cc890e52d465b43787004b945
author Brian Osman <brianosman@google.com> Mon Nov 05 16:49:04 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 05 23:46:20 2018 +0000
tree d5ac689d252f3ae0e516914f6aa3f7ca4f14ecd4
parent 7064a6efbd022907184d074aca075bc4c6b20981

Revert "Revert "Use float colors for blend constant""

This reverts commit 5a4f2a341a4a32d8f175afe1828a7796155dbcb8.

Bug: skia:
Change-Id: I706009343dc1976311a88d57800a140efd776861
Reviewed-on: https://skia-review.googlesource.com/c/168363
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/mtl/GrMtlPipelineState.mm

diff --git a/src/gpu/mtl/GrMtlPipelineState.mm b/src/gpu/mtl/GrMtlPipelineState.mm
index 590eff6..1d9562e 100644
--- a/src/gpu/mtl/GrMtlPipelineState.mm
+++ b/src/gpu/mtl/GrMtlPipelineState.mm
@@ -185,16 +185,14 @@
     GrBlendCoeff srcCoeff = blendInfo.fSrcBlend;
     GrBlendCoeff dstCoeff = blendInfo.fDstBlend;
     if (blend_coeff_refs_constant(srcCoeff) || blend_coeff_refs_constant(dstCoeff)) {
-        float floatColors[4];
         // Swizzle the blend to match what the shader will output.
         const GrSwizzle& swizzle = fGpu->caps()->shaderCaps()->configOutputSwizzle(config);
-        GrColor blendConst = swizzle.applyTo(blendInfo.fBlendConstant);
-        GrColorToRGBAFloat(blendConst, floatColors);
+        SkPMColor4f blendConst = swizzle.applyTo(blendInfo.fBlendConstant);
 
-        [renderCmdEncoder setBlendColorRed: floatColors[0]
-                                     green: floatColors[1]
-                                      blue: floatColors[2]
-                                     alpha: floatColors[3]];
+        [renderCmdEncoder setBlendColorRed: blendConst.fR
+                                     green: blendConst.fG
+                                      blue: blendConst.fB
+                                     alpha: blendConst.fA];
     }
 }