summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/v3d/v3dx_state.c
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2018-07-30 12:57:31 -0700
committerEric Anholt <[email protected]>2018-07-30 14:29:01 -0700
commit300e609feb173d40873020c3e250f9257b5f3321 (patch)
tree52a1c25f6c430374a6d7e8a83dd496f35a82a852 /src/gallium/drivers/v3d/v3dx_state.c
parent3a8550ad06ecac6f4aac53807e416fc045cd871d (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_state.c')
-rw-r--r--src/gallium/drivers/v3d/v3dx_state.c12
1 files changed, 6 insertions, 6 deletions
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]);
}