gallium: add a shader stage/type param to some draw functions

[mesa.git] / src / gallium / drivers / softpipe / sp_state_sampler.c

diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c
index 93ae9178928f811a36e953a3caa3ee7576d41cd5..fe33508a3322f7fd36d6a8e8f3a4090e63277ccf 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_state_sampler.c
+++ b/src/gallium/drivers/softpipe/sp_state_sampler.c
@@ -90,10 +90,11 @@ softpipe_bind_sampler_states(struct pipe_context *pipe,
 
    softpipe->num_samplers[shader] = num;
 
-   if (shader == PIPE_SHADER_VERTEX) {
+   if (shader == PIPE_SHADER_VERTEX || shader == PIPE_SHADER_GEOMETRY) {
       draw_set_samplers(softpipe->draw,
-                        softpipe->samplers[PIPE_SHADER_VERTEX],
-                        softpipe->num_samplers[PIPE_SHADER_VERTEX]);
+                        shader,
+                        softpipe->samplers[shader],
+                        softpipe->num_samplers[shader]);
    }
 
    softpipe->dirty |= SP_NEW_SAMPLER;
@@ -183,10 +184,11 @@ softpipe_set_sampler_views(struct pipe_context *pipe,
 
    softpipe->num_sampler_views[shader] = num;
 
-   if (shader == PIPE_SHADER_VERTEX) {
+   if (shader == PIPE_SHADER_VERTEX || shader == PIPE_SHADER_GEOMETRY) {
       draw_set_sampler_views(softpipe->draw,
-                             softpipe->sampler_views[PIPE_SHADER_VERTEX],
-                             softpipe->num_sampler_views[PIPE_SHADER_VERTEX]);
+                             shader,
+                             softpipe->sampler_views[shader],
+                             softpipe->num_sampler_views[shader]);
    }
 
    softpipe->dirty |= SP_NEW_TEXTURE;