Mesa (master): r600g: disable ARB_draw_instanced

Marek Olšák mareko at kemper.freedesktop.org
Sun Apr 17 15:46:31 PDT 2011


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 17 01:57:13 2011 +0200

r600g: disable ARB_draw_instanced

The very presence of this extension breaks things.
This should bring us closer to being able to run Unigine Heaven.

The extension will be re-enabled once gl_InstanceID is implemented.

---

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

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 1a581c7..d0d3803 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -371,7 +371,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE:
 	case PIPE_CAP_DEPTH_CLAMP:
 	case PIPE_CAP_SHADER_STENCIL_EXPORT:
-	case PIPE_CAP_TGSI_INSTANCEID:
 	case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR:
 	case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
 		return 1;
@@ -382,6 +381,9 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 		else
 			return 1;
 
+	case PIPE_CAP_TGSI_INSTANCEID:
+		return 0;
+
 	/* Unsupported features (boolean caps). */
 	case PIPE_CAP_STREAM_OUTPUT:
 	case PIPE_CAP_PRIMITIVE_RESTART:



More information about the mesa-commit mailing list