[Mesa-dev] [PATCH 07/25] r600g: don't fail if we can't map VS->GS ring entries

Dave Airlie airlied at gmail.com
Wed Jan 29 16:42:08 PST 2014


From: Dave Airlie <airlied at redhat.com>

This can happen in normal operation, so don't report an error on it,
just continue.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/gallium/drivers/r600/r600_shader.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 0acb576..d9655c4 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1299,10 +1299,9 @@ static int emit_gs_ring_writes(struct r600_shader_ctx *ctx)
 				if (in->name == out->name && in->sid == out->sid)
 					ring_offset = in->ring_offset;
 			}
-			if (ring_offset == -1) {
-				R600_ERR("error mapping VS->GS outputs\n");
-				return -1;
-			}
+
+			if (ring_offset == -1)
+				continue;
 		} else
 			ring_offset = i * 16;
 
-- 
1.8.3.1



More information about the mesa-dev mailing list