Mesa (master): r600g: enable EXT_draw_buffers2

Dave Airlie airlied at kemper.freedesktop.org
Sun Apr 24 13:51:28 PDT 2011


Module: Mesa
Branch: master
Commit: de48199693484fc903627ce53b007901af2e37a8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de48199693484fc903627ce53b007901af2e37a8

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr 25 06:55:09 2011 +1000

r600g: enable EXT_draw_buffers2

Doesn't cause any piglit regression and passes the fbo-draw-buffers-blend
test.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/r600/r600_pipe.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index d0d3803..4bc5644 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -375,6 +375,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
 		return 1;
 	case PIPE_CAP_INDEP_BLEND_ENABLE:
+	case PIPE_CAP_INDEP_BLEND_FUNC:
 		/* R600 doesn't support per-MRT blends */
 		if (family == CHIP_R600)
 			return 0;
@@ -387,12 +388,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	/* Unsupported features (boolean caps). */
 	case PIPE_CAP_STREAM_OUTPUT:
 	case PIPE_CAP_PRIMITIVE_RESTART:
-	case PIPE_CAP_INDEP_BLEND_FUNC: /* FIXME allow this */
 	case PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL:
-		/* R600 doesn't support per-MRT blends */
-		if (family == CHIP_R600)
-			return 0;
-		else
 			return 0;
 
 	case PIPE_CAP_ARRAY_TEXTURES:



More information about the mesa-commit mailing list