From: Dave Airlie <airlied@redhat.com>
Date: Wed, 29 Jan 2014 04:08:43 +0000 (+0000)
Subject: r600g: don't fail if we can't map VS->GS ring entries
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eeead9b8ed77804f228bd9ba434e26b5c12d73ed;p=mesa.git

r600g: don't fail if we can't map VS->GS ring entries

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

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 56067246874..73b290979fb 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;