diff options
| author | Eric Anholt <[email protected]> | 2012-11-01 10:37:56 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-11-04 12:23:59 -0800 |
| commit | 3a937daf3f0e8e497431d371d4f1ea6a0ffc29ff (patch) | |
| tree | 6e94af10ba28357a2bad24bb9658348d0fd5cb8b /src/mesa | |
| parent | 1e08d5452eaf80d63e626119142facc6c549a58e (diff) | |
i965: Force border color A to 1 when it's not present in the GL format.
It's usually forced to 1 by the surface format, but sometimes we actually have
alpha present because it's the only format available.
Fixes piglit texwrap bordercolor tests for OpenGL 1.1, GL_EXT_texture_sRGB and
GL_ARB_texture_float.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c index e51381b855f..fb9cb83c7bc 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c @@ -105,6 +105,13 @@ upload_default_color(struct brw_context *brw, struct gl_sampler_object *sampler, color[3] = sampler->BorderColor.f[3]; } + /* In some cases we use an RGBA surface format for GL RGB textures, + * where we've initialized the A channel to 1.0. We also have to set + * the border color alpha to 1.0 in that case. + */ + if (firstImage->_BaseFormat == GL_RGB) + color[3] = 1.0; + if (intel->gen == 5 || intel->gen == 6) { struct gen5_sampler_default_color *sdc; |