On 02/03/2014 01:29 AM, Chris Forbes wrote:
> Signed-off-by: Chris Forbes <chr...@ijw.co.nz>
> ---
> src/mesa/drivers/dri/i965/brw_program.h | 11 +++++++++++
> src/mesa/drivers/dri/i965/brw_wm.c | 20 ++++++++++++++++++++
> 2 files changed, 31 insertions(+)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_program.h
> b/src/mesa/drivers/dri/i965/brw_program.h
> index 51182ea..c071b5b 100644
> --- a/src/mesa/drivers/dri/i965/brw_program.h
> +++ b/src/mesa/drivers/dri/i965/brw_program.h
> @@ -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 */
Funny indentation here...probably should align the comments.
> + 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
> diff --git a/src/mesa/drivers/dri/i965/brw_wm.c
> b/src/mesa/drivers/dri/i965/brw_wm.c
> index a0758d2..97016c6 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm.c
> @@ -317,6 +317,20 @@ brw_wm_debug_recompile(struct brw_context *brw,
> }
> }
>
> +static uint8_t
> +_gen6_gather_wa(GLenum internalformat)
We normally don't prefix static functions with '_'...I'd just call this
gen6_gather_wa() or gen6_gather_workaround().
> +{
> + 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,12 @@ 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. */
Closing */ should go on it's own line.
> + if (brw->gen == 6 && prog->UsesGather) {
> + key->gen6_gather_wa[s] = _gen6_gather_wa(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.
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
