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

i965: Add Gen6 gather wa to sampler key

Browse source 
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Chris Forbes 2014-02-03 22:13:03 +13:00
parent 1e12dafcac
commit 2b7bbd89e8
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/drivers/dri/i965/brw_program.h
View file

@ -24,6 +24,12 @@
#ifndef BRW_PROGRAM_H
#define BRW_PROGRAM_H
enum gen6_gather_sampler_wa {
WA_SIGN = 1, /* whether we need to sign extend */
WA_8BIT = 2, /* if we have an 8bit format needing wa */
WA_16BIT = 4, /* if we have a 16bit format needing wa */
};
/**
* Sampler information needed by VS, WM, and GS program cache keys.
*/
@ -50,6 +56,11 @@ struct brw_sampler_prog_key_data {
* Whether this sampler uses the compressed multisample surface layout.
*/
uint16_t compressed_multisample_layout_mask;
/**
* For Sandybridge, which shader w/a we need for gather quirks.
*/
uint8_t gen6_gather_wa[MAX_SAMPLERS];
};
#ifdef __cplusplus

21
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -317,6 +317,20 @@ brw_wm_debug_recompile(struct brw_context *brw,
}
}
static uint8_t
gen6_gather_workaround(GLenum internalformat)
{
switch (internalformat) {
case GL_R8I: return WA_SIGN | WA_8BIT;
case GL_R8UI: return WA_8BIT;
case GL_R16I: return WA_SIGN | WA_16BIT;
case GL_R16UI: return WA_16BIT;
/* note that even though GL_R32I and GL_R32UI have format overrides
* in the surface state, there is no shader w/a required */
default: return 0;
}
}
void
brw_populate_sampler_prog_key_data(struct gl_context *ctx,
const struct gl_program *prog,
@ -372,6 +386,13 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
key->gather_channel_quirk_mask |= 1 << s;
}
/* Gen6's gather4 is broken for UINT/SINT; we treat them as
* UNORM/FLOAT instead and fix it in the shader.
*/
if (brw->gen == 6 && prog->UsesGather) {
key->gen6_gather_wa[s] = gen6_gather_workaround(img->InternalFormat);
}
/* If this is a multisample sampler, and uses the CMS MSAA layout,
* then we need to emit slightly different code to first sample the
* MCS surface.