KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Set up the correct texture border color state struct for Ironlake. 

This doesn't actually fix border color on Ironlake, but it appears to
be a requirement, and gen6 needs it too.
This commit is contained in:
Eric Anholt 2010-06-15 17:58:14 -07:00
parent 14a9153a32
commit 30f25a1019
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/drivers/dri/i965/brw_structs.h
View File

@ -1064,6 +1064,15 @@ struct brw_sampler_default_color {
GLfloat color[4];
};
struct gen5_sampler_default_color {
uint8_t ub[4];
float f[4];
uint16_t hf[4];
uint16_t us[4];
int16_t s[4];
uint8_t b[4];
};
struct brw_sampler_state
{

41
src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
View File

@ -69,12 +69,43 @@ static GLuint translate_wrap_mode( GLenum wrap )
static drm_intel_bo *upload_default_color( struct brw_context *brw,
const GLfloat *color )
{
struct brw_sampler_default_color sdc;
struct intel_context *intel = &brw->intel;
COPY_4V(sdc.color, color);
return brw_cache_data(&brw->cache, BRW_SAMPLER_DEFAULT_COLOR,
&sdc, sizeof(sdc));
if (intel->gen >= 5) {
struct gen5_sampler_default_color sdc;
memset(&sdc, 0, sizeof(sdc));
UNCLAMPED_FLOAT_TO_UBYTE(sdc.ub[0], color[0]);
UNCLAMPED_FLOAT_TO_UBYTE(sdc.ub[1], color[1]);
UNCLAMPED_FLOAT_TO_UBYTE(sdc.ub[2], color[2]);
UNCLAMPED_FLOAT_TO_UBYTE(sdc.ub[3], color[3]);
UNCLAMPED_FLOAT_TO_USHORT(sdc.us[0], color[0]);
UNCLAMPED_FLOAT_TO_USHORT(sdc.us[1], color[1]);
UNCLAMPED_FLOAT_TO_USHORT(sdc.us[2], color[2]);
UNCLAMPED_FLOAT_TO_USHORT(sdc.us[3], color[3]);
UNCLAMPED_FLOAT_TO_SHORT(sdc.s[0], color[0]);
UNCLAMPED_FLOAT_TO_SHORT(sdc.s[1], color[1]);
UNCLAMPED_FLOAT_TO_SHORT(sdc.s[2], color[2]);
UNCLAMPED_FLOAT_TO_SHORT(sdc.s[3], color[3]);
/* XXX: Fill in half floats */
/* XXX: Fill in signed bytes */
COPY_4V(sdc.f, color);
return brw_cache_data(&brw->cache, BRW_SAMPLER_DEFAULT_COLOR,
&sdc, sizeof(sdc));
} else {
struct brw_sampler_default_color sdc;
COPY_4V(sdc.color, color);
return brw_cache_data(&brw->cache, BRW_SAMPLER_DEFAULT_COLOR,
&sdc, sizeof(sdc));
}
}