fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 00:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Fix texture border color on Broadwell.

Browse source 
The Gen7 sampler state code still works.  Increasing the alignment to
64 bytes makes bit 5 zero, which is good because it's now reserved.

Since we don't use the new filter bits, we can leave those as zero too,
which means we don't need to update the code to update the pointer.
(We probably should anyway, for clarity, but alas, another day.)

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke 2013-01-22 12:20:31 -08:00
parent bc9d3a0254
commit 8ed9f69b36
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
View file

@ -143,7 +143,17 @@ upload_default_color(struct brw_context *brw,
if (firstImage->_BaseFormat == GL_RGB) if (firstImage->_BaseFormat == GL_RGB)
color[3] = 1.0; color[3] = 1.0;
if (brw->gen == 5 || brw->gen == 6) { if (brw->gen >= 8) {
/* On Broadwell, the border color is represented as four 32-bit floats,
* integers, or unsigned values, interpreted according to the surface
* format. This matches the sampler->BorderColor union exactly. Since
* we use floats both here and in the above reswizzling code, we preserve
* the original bit pattern. So we actually handle all three formats.
*/
float *sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR,
4 * 4, 64, sdc_offset);
COPY_4FV(sdc, color);
} else if (brw->gen == 5 || brw->gen == 6) {
struct gen5_sampler_default_color *sdc; struct gen5_sampler_default_color *sdc;
sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR, sdc = brw_state_batch(brw, AUB_TRACE_SAMPLER_DEFAULT_COLOR,