Module: Mesa Branch: master Commit: 544c54114a39b890c525b0a2d1602b21e9e4c2ee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=544c54114a39b890c525b0a2d1602b21e9e4c2ee
Author: Tobias Klausmann <tobias.johannes.klausm...@mni.thm.de> Date: Sun Aug 17 17:16:08 2014 +0200 llvmpipe/softpipe: enable ARB_conditional_render_inverted Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> Reviewed-by: Roland Scheidegger <srol...@vmware.com> Signed-off-by: Tobias Klausmann <tobias.johannes.klausm...@mni.thm.de> --- src/gallium/drivers/llvmpipe/lp_screen.c | 3 ++- src/gallium/drivers/softpipe/sp_screen.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 08597fa..2a6e673 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -250,10 +250,11 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_TEXTURE_GATHER_OFFSETS: case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION: case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE: - case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: return 0; case PIPE_CAP_FAKE_SW_MSAA: return 1; + case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: + return 1; case PIPE_CAP_VENDOR_ID: return 0xFFFFFFFF; diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 8fd4a0d..d54112c 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -223,7 +223,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_UMA: return 0; case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: - return 0; + return 1; } /* should only get here on unhandled cases */ debug_printf("Unexpected PIPE_CAP %d query\n", param); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit