fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

v3d: s/colour/color in the XML.

Browse source 
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.
This commit is contained in:
Eric Anholt 2018-07-30 12:57:31 -07:00
parent 3a8550ad06
commit 300e609feb
4 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/broadcom/cle/v3d_packet_v33.xml
View file

@ -92,7 +92,7 @@
<value name="ANISOTROPIC_16_1" value="15"/>
</enum>
<enum name="Border Colour Mode" prefix="V3D_BORDER_COLOUR" min_ver="41">
<enum name="Border Color Mode" prefix="V3D_BORDER_COLOR" min_ver="41">
<value name="0000" value="0"/>
<value name="0001" value="1"/>
<value name="1111" value="2"/>
@ -300,7 +300,7 @@
<field name="Enable Z write" size="1" start="7" type="bool"/>
<field name="Enable Stencil write" size="1" start="6" type="bool"/>
<!-- bit 5 unused -->
<field name="Disable Colour buffer(s) clear on write" size="1" start="4" type="bool"/>
<field name="Disable Color buffer(s) clear on write" size="1" start="4" type="bool"/>
<field name="Disable Stencil buffer clear on write" size="1" start="3" type="bool"/>
<field name="Disable Z buffer clear on write" size="1" start="2" type="bool"/>
<field name="Disable fast opportunistic write out in multisample mode" size="1" start="1" type="bool"/>
@ -312,8 +312,8 @@
<field name="Clear all Render Targets" size="1" start="0" type="bool"/>
</packet>
<packet code="26" name="Reload Tile Colour Buffer" cl="R" max_ver="33">
<field name="Disable Colour Buffer load" size="8" start="8" type="uint"/>
<packet code="26" name="Reload Tile Color Buffer" cl="R" max_ver="33">
<field name="Disable Color Buffer load" size="8" start="8" type="uint"/>
<field name="Enable Z load" size="1" start="7" type="bool"/>
<field name="Enable Stencil load" size="1" start="6" type="bool"/>
</packet>
@ -327,7 +327,7 @@
<field name="Padded height of output image in UIF blocks" size="13" start="11" type="uint"/>
<field name="XOR UIF" size="1" start="10" type="bool"/>
<field name="Last Tile of Frame" size="1" start="8" type="bool"/>
<field name="Disable Colour buffer(s) clear on write" size="1" start="7" type="bool"/>
<field name="Disable Color buffer(s) clear on write" size="1" start="7" type="bool"/>
<field name="Disable Stencil buffer clear on write" size="1" start="6" type="bool"/>
<field name="Disable Z buffer clear on write" size="1" start="5" type="bool"/>
<field name="Raw Mode" size="1" start="4" type="bool"/>
@ -580,9 +580,9 @@
</packet>
<packet code="84" name="Blend Config" max_ver="33">
<field name="Colour blend dst factor" size="4" start="20" type="Blend Factor"/>
<field name="Colour blend src factor" size="4" start="16" type="Blend Factor"/>
<field name="Colour blend mode" size="4" start="12" type="Blend Mode"/>
<field name="Color blend dst factor" size="4" start="20" type="Blend Factor"/>
<field name="Color blend src factor" size="4" start="16" type="Blend Factor"/>
<field name="Color blend mode" size="4" start="12" type="Blend Mode"/>
<field name="Alpha blend dst factor" size="4" start="8" type="Blend Factor"/>
<field name="Alpha blend src factor" size="4" start="4" type="Blend Factor"/>
<field name="Alpha blend mode" size="4" start="0" type="Blend Mode"/>
@ -590,22 +590,22 @@
<packet code="84" name="Blend Config" min_ver="41">
<field name="Render Target Mask" size="4" start="24" type="uint"/>
<field name="Colour blend dst factor" size="4" start="20" type="Blend Factor"/>
<field name="Colour blend src factor" size="4" start="16" type="Blend Factor"/>
<field name="Colour blend mode" size="4" start="12" type="Blend Mode"/>
<field name="Color blend dst factor" size="4" start="20" type="Blend Factor"/>
<field name="Color blend src factor" size="4" start="16" type="Blend Factor"/>
<field name="Color blend mode" size="4" start="12" type="Blend Mode"/>
<field name="Alpha blend dst factor" size="4" start="8" type="Blend Factor"/>
<field name="Alpha blend src factor" size="4" start="4" type="Blend Factor"/>
<field name="Alpha blend mode" size="4" start="0" type="Blend Mode"/>
</packet>
<packet code="86" name="Blend Constant Colour">
<packet code="86" name="Blend Constant Color">
<field name="Alpha (F16)" size="16" start="48" type="uint"/>
<field name="Blue (F16)" size="16" start="32" type="uint"/>
<field name="Green (F16)" size="16" start="16" type="uint"/>
<field name="Red (F16)" size="16" start="0" type="uint"/>
</packet>
<packet code="87" name="Colour Write Masks">
<packet code="87" name="Color Write Masks">
<field name="Mask" size="32" start="0" type="uint"/>
</packet>
@ -1396,7 +1396,7 @@
<field name="Texture base pointer" size="32" start="0" type="address"/>
<field name="Reverse Standard Border Colour" size="1" start="5" type="bool"/>
<field name="Reverse Standard Border Color" size="1" start="5" type="bool"/>
<field name="AHDR" size="1" start="4" type="bool"/>
<field name="sRGB" size="1" start="3" type="bool"/>
<field name="Flip S and T on incoming request" size="1" start="2" type="bool"/>
@ -1405,13 +1405,13 @@
</struct>
<struct name="Sampler State" min_ver="41">
<field name="Border colour Alpha" size="32" start="160" type="uint"/>
<field name="Border colour Blue" size="32" start="128" type="uint"/>
<field name="Border colour Green" size="32" start="96" type="uint"/>
<field name="Border colour Red" size="32" start="64" type="uint"/>
<field name="Border color Alpha" size="32" start="160" type="uint"/>
<field name="Border color Blue" size="32" start="128" type="uint"/>
<field name="Border color Green" size="32" start="96" type="uint"/>
<field name="Border color Red" size="32" start="64" type="uint"/>
<field name="Maximum Anisotropy" size="2" start="61" type="uint"/>
<field name="Border Colour Mode" size="3" start="58" type="Border Colour Mode"/>
<field name="Border Color Mode" size="3" start="58" type="Border Color Mode"/>
<field name="Wrap I Border" size="1" start="57" type="bool"/>
<field name="Wrap R" size="3" start="54" type="Wrap Mode"/>
<field name="Wrap T" size="3" start="51" type="Wrap Mode"/>

18
src/gallium/drivers/v3d/v3dx_emit.c
View file

@ -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];
}
}

10
src/gallium/drivers/v3d/v3dx_rcl.c
View file

@ -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;

12
src/gallium/drivers/v3d/v3dx_state.c
View file

@ -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]);
}