Kenneth Graunke <kenn...@whitecape.org> writes:
> v2: Also set the "oMask Present to Render Target" bit, which is required
> for shaders that write oMask. Otherwise the hardware won't expect
> the extra data.
>
> Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
> ---
> src/mesa/drivers/dri/i965/gen8_ps_state.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/gen8_ps_state.c
> b/src/mesa/drivers/dri/i965/gen8_ps_state.c
> index e0a1c9b..e93668e 100644
> --- a/src/mesa/drivers/dri/i965/gen8_ps_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c
> @@ -22,6 +22,7 @@
> */
>
> #include <stdbool.h>
> +#include "program/program.h"
> #include "brw_state.h"
> #include "brw_defines.h"
> #include "intel_batchbuffer.h"
> @@ -29,6 +30,7 @@
> static void
> upload_ps_extra(struct brw_context *brw)
> {
> + struct gl_context *ctx = &brw->ctx;
> /* BRW_NEW_FRAGMENT_PROGRAM */
> const struct brw_fragment_program *fp =
> brw_fragment_program_const(brw->fragment_program);
> @@ -63,6 +65,18 @@ upload_ps_extra(struct brw_context *brw)
> if (fp->program.Base.InputsRead & VARYING_BIT_POS)
> dw1 |= GEN8_PSX_USES_SOURCE_DEPTH | GEN8_PSX_USES_SOURCE_W;
>
> + /* _NEW_BUFFERS */
_mesa_get_min_invocations_per_fragment also depends on _NEW_MULTISAMPLE
(for its test of Multisample.Enabled).
> + bool multisampled_fbo = ctx->DrawBuffer->Visual.samples > 1;
> + if (multisampled_fbo &&
> + _mesa_get_min_invocations_per_fragment(ctx, &fp->program, false) > 1)
> + dw1 |= GEN8_PSX_SHADER_IS_PER_SAMPLE;
> +
> + if (fp->program.Base.SystemValuesRead & SYSTEM_BIT_SAMPLE_MASK_IN)
> + dw1 |= GEN8_PSX_SHADER_USES_INPUT_COVERAGE_MASK;
> +
> + if (brw->wm.prog_data->uses_omask)
> + dw1 |= GEN8_PSX_OMASK_TO_RENDER_TARGET;
> +
> BEGIN_BATCH(2);
> OUT_BATCH(_3DSTATE_PS_EXTRA << 16 | (2 - 2));
> OUT_BATCH(dw1);
> @@ -71,7 +85,7 @@ upload_ps_extra(struct brw_context *brw)
>
> const struct brw_tracked_state gen8_ps_extra = {
> .dirty = {
> - .mesa = 0,
> + .mesa = _NEW_BUFFERS,
> .brw = BRW_NEW_CONTEXT | BRW_NEW_FRAGMENT_PROGRAM,
> .cache = 0,
> },
> --
> 1.8.4.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
pgpmseqGu3Qeo.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
