summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2016-08-22 18:50:41 -0700
committerFrancisco Jerez <currojerez@riseup.net>2016-08-24 13:28:31 -0700
commitc8f5bd2c9960a8efe4d923e2a5aab7c169d68769 (patch)
tree47b835fdcb22025a8fbefb13ac9fbf576d1140b6
parent2018371692d9ea57805989b0390b833e785881bf (diff)
downloadexternal_mesa3d-c8f5bd2c9960a8efe4d923e2a5aab7c169d68769.zip
external_mesa3d-c8f5bd2c9960a8efe4d923e2a5aab7c169d68769.tar.gz
external_mesa3d-c8f5bd2c9960a8efe4d923e2a5aab7c169d68769.tar.bz2
i965/fs: Don't consider the stencil output to be a color output.
This would cause gl_FragStencilRef to be counted as a color output incorrectly during the precompile phase, which leads to unnecessary recompilation on master and could trigger an assertion failure in fs_visitor::emit_fb_writes() on my i965-fb-fetch branch. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 7b1b839..d725a16 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -608,7 +608,8 @@ brw_fs_precompile(struct gl_context *ctx,
key.nr_color_regions = _mesa_bitcount_64(fp->Base.OutputsWritten &
~(BITFIELD64_BIT(FRAG_RESULT_DEPTH) |
- BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)));
+ BITFIELD64_BIT(FRAG_RESULT_STENCIL) |
+ BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)));
key.program_string_id = bfp->id;