fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

genxml: Make Border Color Pointer an address on Gen4-5, not an offset.

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-08-31 15:45:57 -07:00
parent b8cd8a7545
commit 23b7c7a630
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/genxml/gen4.xml
View file

@ -586,7 +586,7 @@
<field name="TCX Address Control Mode" start="38" end="40" type="Texture_Coordinate_Mode"/>
<field name="TCY Address Control Mode" start="35" end="37" type="Texture_Coordinate_Mode"/>
<field name="TCZ Address Control Mode" start="32" end="34" type="Texture_Coordinate_Mode"/>
<field name="Border Color Pointer" start="69" end="95" type="offset"/>
<field name="Border Color Pointer" start="69" end="95" type="address"/>
<field name="ChromaKey Enable" start="121" end="121" type="bool"/>
<field name="ChromaKey Index" start="119" end="120" type="uint"/>
<field name="ChromaKey Mode" start="118" end="118" type="uint" prefix="KEYFILTER">

2
src/intel/genxml/gen45.xml
View file

@ -593,7 +593,7 @@
<field name="TCX Address Control Mode" start="38" end="40" type="Texture_Coordinate_Mode"/>
<field name="TCY Address Control Mode" start="35" end="37" type="Texture_Coordinate_Mode"/>
<field name="TCZ Address Control Mode" start="32" end="34" type="Texture_Coordinate_Mode"/>
<field name="Border Color Pointer" start="69" end="95" type="offset"/>
<field name="Border Color Pointer" start="69" end="95" type="address"/>
<field name="Monochrome Filter Height" start="125" end="127" type="uint"/>
<field name="Monochrome Filter Width" start="122" end="124" type="uint"/>
<field name="ChromaKey Enable" start="121" end="121" type="bool"/>

2
src/intel/genxml/gen5.xml
View file

@ -571,7 +571,7 @@
<field name="TCX Address Control Mode" start="38" end="40" type="Texture_Coordinate_Mode"/>
<field name="TCY Address Control Mode" start="35" end="37" type="Texture_Coordinate_Mode"/>
<field name="TCZ Address Control Mode" start="32" end="34" type="Texture_Coordinate_Mode"/>
<field name="Border Color Pointer" start="69" end="95" type="offset"/>
<field name="Border Color Pointer" start="69" end="95" type="address"/>
<field name="Monochrome Filter Height" start="125" end="127" type="uint"/>
<field name="Monochrome Filter Width" start="122" end="124" type="uint"/>
<field name="ChromaKey Enable" start="121" end="121" type="bool"/>

10
src/mesa/drivers/dri/i965/genX_state_upload.c
View file

@ -5008,13 +5008,11 @@ genX(update_sampler_state)(struct brw_context *brw,
texObj->StencilSampling,
&border_color_offset);
}
if (GEN_GEN < 6) {
samp_st.BorderColorPointer =
brw_emit_reloc(&brw->batch, batch_offset_for_sampler_state + 8,
brw->batch.bo, border_color_offset, 0);
} else {
#if GEN_GEN < 6
samp_st.BorderColorPointer = ro_bo(brw->batch.bo, border_color_offset);
#else
samp_st.BorderColorPointer = border_color_offset;
}
#endif
#if GEN_GEN >= 8
samp_st.LODPreClampMode = CLAMP_MODE_OGL;