Re: [Mesa-dev] [PATCH 3/3] i965/fs: Don't consider the stencil output to be a color output.

2016-08-23 Thread Kenneth Graunke
On Monday, August 22, 2016 6:59:45 PM PDT Francisco Jerez wrote:
> 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.
> ---
>  src/mesa/drivers/dri/i965/brw_wm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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;
>  
> 

Patch 3 is:
Reviewed-by: Kenneth Graunke 


signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 3/3] i965/fs: Don't consider the stencil output to be a color output.

2016-08-22 Thread Francisco Jerez
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.
---
 src/mesa/drivers/dri/i965/brw_wm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
 
-- 
2.9.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev