Put HWUI & Webview color space in a struct

The color space parameters are currently separate members. This was
making passing color space parameters to functions a bit messy.

This CL puts the color space parameters into their own struct which can
be cleanly passed to functions.

Test: Builds locally
Change-Id: I3709b88dbdedb9616d4905ee973c3099f95b3ca7
This commit is contained in:
Chris Blume
2019-01-11 16:52:12 -08:00
parent 94ae766a98
commit 1a2bdc8c65
2 changed files with 11 additions and 13 deletions

View File

@@ -52,17 +52,8 @@ struct DrawVkInfo {
// Input: Format of the destination surface.
VkFormat format;
// Input: Color space transfer params
float g;
float a;
float b;
float c;
float d;
float e;
float f;
// Input: Color space transformation from linear RGB to D50-adapted XYZ
float colorSpaceTransform[9];
// Input: Color space
const SkColorSpace* colorSpaceInfo;
// Input: current clip rect
int clipLeft;

View File

@@ -109,8 +109,15 @@ struct AwDrawFn_DrawVkParams {
// Input: Format of the destination surface.
VkFormat format;
// Input: Color space transformation from linear RGB to D50-adapted XYZ
float matrix[9];
// Input: Color space parameters.
float transfer_function_g;
float transfer_function_a;
float transfer_function_b;
float transfer_function_c;
float transfer_function_d;
float transfer_function_e;
float transfer_function_f;
float color_space_toXYZD50[9];
// Input: current clip rect
int clip_left;