Mesa (10.6): r600g: allow setting geometry shader sampler states

[Emil Velikov]

Module: Mesa
Branch: 10.6
Commit: 23bbe418fcce69447fb425012e9ac8d149fb5455
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=23bbe418fcce69447fb425012e9ac8d149fb5455

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Aug 11 21:37:59 2015 +0200

r600g: allow setting geometry shader sampler states

We were ignoring them. This is both hilarious and sad.

Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
(cherry picked from commit 8c0b943e87b48e7359230825cc06fbdd059a9e58)

---

 src/gallium/drivers/r600/r600_state_common.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 13dc9ee..baba849 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -399,11 +399,6 @@ static void r600_bind_sampler_states(struct pipe_context *pipe,
 
 	assert(start == 0); /* XXX fix below */
 
-	if (shader != PIPE_SHADER_VERTEX &&
-	    shader != PIPE_SHADER_FRAGMENT) {
-		return;
-	}
-
 	for (i = 0; i < count; i++) {
 		struct r600_pipe_sampler_state *rstate = rstates[i];