From 300e609feb173d40873020c3e250f9257b5f3321 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 30 Jul 2018 12:57:31 -0700 Subject: [PATCH] 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. --- src/broadcom/cle/v3d_packet_v33.xml | 38 ++++++++++++++-------------- src/gallium/drivers/v3d/v3dx_emit.c | 18 ++++++------- src/gallium/drivers/v3d/v3dx_rcl.c | 10 ++++---- src/gallium/drivers/v3d/v3dx_state.c | 12 ++++----- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet_v33.xml index 4dcba368be5..6fe9d7481c2 100644 --- a/src/broadcom/cle/v3d_packet_v33.xml +++ b/src/broadcom/cle/v3d_packet_v33.xml @@ -92,7 +92,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -312,8 +312,8 @@ - - + + @@ -327,7 +327,7 @@ - + @@ -580,9 +580,9 @@ - - - + + + @@ -590,22 +590,22 @@ - - - + + + - + - + @@ -1396,7 +1396,7 @@ - + @@ -1405,13 +1405,13 @@ - - - - + + + + - + 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]; } } diff --git a/src/gallium/drivers/v3d/v3dx_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c index c6aac7ebbc7..acd6e9297e4 100644 --- a/src/gallium/drivers/v3d/v3dx_rcl.c +++ b/src/gallium/drivers/v3d/v3dx_rcl.c @@ -161,11 +161,11 @@ store_general(struct v3d_job *job, assert(buffer != ZSTENCIL); store.raw_mode = true; if (!last_store) { - store.disable_colour_buffers_clear_on_write = true; + store.disable_color_buffers_clear_on_write = true; store.disable_z_buffer_clear_on_write = true; store.disable_stencil_buffer_clear_on_write = true; } else { - store.disable_colour_buffers_clear_on_write = + store.disable_color_buffers_clear_on_write = !(((pipe_bit & PIPE_CLEAR_COLOR_BUFFERS) && general_color_clear && (job->clear & pipe_bit))); @@ -246,8 +246,8 @@ v3d_rcl_emit_loads(struct v3d_job *job, struct v3d_cl *cl) * tile coordinates. */ if (loads_pending) { - cl_emit(cl, RELOAD_TILE_COLOUR_BUFFER, load) { - load.disable_colour_buffer_load = + cl_emit(cl, RELOAD_TILE_COLOR_BUFFER, load) { + load.disable_color_buffer_load = (~loads_pending & PIPE_CLEAR_COLOR_BUFFERS) >> PIPE_FIRST_COLOR_BUFFER_BIT; @@ -356,7 +356,7 @@ v3d_rcl_emit_stores(struct v3d_job *job, struct v3d_cl *cl) /* Note that when set this will clear all of the color * buffers. */ - store.disable_colour_buffers_clear_on_write = + store.disable_color_buffers_clear_on_write = !needs_color_clear; store.disable_z_buffer_clear_on_write = !needs_z_clear; diff --git a/src/gallium/drivers/v3d/v3dx_state.c b/src/gallium/drivers/v3d/v3dx_state.c index b7d60846d4a..a154936d048 100644 --- a/src/gallium/drivers/v3d/v3dx_state.c +++ b/src/gallium/drivers/v3d/v3dx_state.c @@ -603,21 +603,21 @@ v3d_create_sampler_state(struct pipe_context *pctx, sampler.maximum_anisotropy = 1; } - sampler.border_colour_mode = V3D_BORDER_COLOUR_FOLLOWS; - /* XXX: The border colour field is in the TMU blending format + sampler.border_color_mode = V3D_BORDER_COLOR_FOLLOWS; + /* XXX: The border color field is in the TMU blending format * (32, f16, or i16), and we need to customize it based on * that. * * XXX: for compat alpha formats, we need the alpha field to * be in the red channel. */ - sampler.border_colour_red = + sampler.border_color_red = util_float_to_half(cso->border_color.f[0]); - sampler.border_colour_green = + sampler.border_color_green = util_float_to_half(cso->border_color.f[1]); - sampler.border_colour_blue = + sampler.border_color_blue = util_float_to_half(cso->border_color.f[2]); - sampler.border_colour_alpha = + sampler.border_color_alpha = util_float_to_half(cso->border_color.f[3]); } -- 2.30.2