diff options
| author | Eric Anholt <[email protected]> | 2018-07-30 12:57:31 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-07-30 14:29:01 -0700 |
| commit | 300e609feb173d40873020c3e250f9257b5f3321 (patch) | |
| tree | 52a1c25f6c430374a6d7e8a83dd496f35a82a852 /src/gallium/drivers/v3d/v3dx_emit.c | |
| parent | 3a8550ad06ecac6f4aac53807e416fc045cd871d (diff) | |
v3d: s/colour/color in the XML.
The CLIF format expects american english spelling, and the rest of Mesa is
too. I was previously adhering to the spec's spelling, which is
counterproductive.
Diffstat (limited to 'src/gallium/drivers/v3d/v3dx_emit.c')
| -rw-r--r-- | src/gallium/drivers/v3d/v3dx_emit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/v3d/v3dx_emit.c b/src/gallium/drivers/v3d/v3dx_emit.c index c371a53a199..59bcf126c78 100644 --- a/src/gallium/drivers/v3d/v3dx_emit.c +++ b/src/gallium/drivers/v3d/v3dx_emit.c @@ -294,11 +294,11 @@ emit_rt_blend(struct v3d_context *v3d, struct v3d_job *job, assert(rt == 0); #endif - config.colour_blend_mode = rtblend->rgb_func; - config.colour_blend_dst_factor = + config.color_blend_mode = rtblend->rgb_func; + config.color_blend_dst_factor = v3d_factor(rtblend->rgb_dst_factor, v3d->blend_dst_alpha_one); - config.colour_blend_src_factor = + config.color_blend_src_factor = v3d_factor(rtblend->rgb_src_factor, v3d->blend_dst_alpha_one); @@ -597,7 +597,7 @@ v3dX(emit_state)(struct pipe_context *pctx) if (v3d->dirty & VC5_DIRTY_BLEND) { struct pipe_blend_state *blend = &v3d->blend->base; - cl_emit(&job->bcl, COLOUR_WRITE_MASKS, mask) { + cl_emit(&job->bcl, COLOR_WRITE_MASKS, mask) { for (int i = 0; i < 4; i++) { int rt = blend->independent_blend_enable ? i : 0; int rt_mask = blend->rt[rt].colormask; @@ -613,15 +613,15 @@ v3dX(emit_state)(struct pipe_context *pctx) */ if (v3d->dirty & VC5_DIRTY_BLEND_COLOR || (V3D_VERSION < 41 && (v3d->dirty & VC5_DIRTY_BLEND))) { - cl_emit(&job->bcl, BLEND_CONSTANT_COLOUR, colour) { - colour.red_f16 = (v3d->swap_color_rb ? + cl_emit(&job->bcl, BLEND_CONSTANT_COLOR, color) { + color.red_f16 = (v3d->swap_color_rb ? v3d->blend_color.hf[2] : v3d->blend_color.hf[0]); - colour.green_f16 = v3d->blend_color.hf[1]; - colour.blue_f16 = (v3d->swap_color_rb ? + color.green_f16 = v3d->blend_color.hf[1]; + color.blue_f16 = (v3d->swap_color_rb ? v3d->blend_color.hf[0] : v3d->blend_color.hf[2]); - colour.alpha_f16 = v3d->blend_color.hf[3]; + color.alpha_f16 = v3d->blend_color.hf[3]; } } |