1 files changed, 4 insertions, 14 deletions
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index f6fddfe66c1..956d59c02ba 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -242,20 +242,10 @@ softpipe_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe
       return tgsi_exec_get_shader_param(param);
    case PIPE_SHADER_VERTEX:
    case PIPE_SHADER_GEOMETRY:
-      switch (param) {
-      case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
-      case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS:
-         if (sp_screen->use_llvm)
-            /* Softpipe doesn't yet know how to tell draw/llvm about textures */
-            return 0;
-         else
-            return PIPE_MAX_SAMPLERS;
-      default:
-         if (sp_screen->use_llvm)
-            return draw_get_shader_param(shader, param);
-         else
-            return draw_get_shader_param_no_llvm(shader, param);
-      }
+      if (sp_screen->use_llvm)
+         return draw_get_shader_param(shader, param);
+      else
+         return draw_get_shader_param_no_llvm(shader, param);
    default:
       return 0;
    }