draw,gallivm: Fix draw_get_shader_param.
- Use LLVM limits when LLVM is being used, instead of TGSI limits - Provide draw_get_shader_param_no_llvm for when llvm is never used (softpipe) - Eliminate several of the hacks around draw shader caps in several drivers Unfortunately the hack for PIPE_MAX_VERTEX_SAMPLERS is still necessary. Reviewed-by: Marek Olšák <maraeo@gmail.com>
This commit is contained in:
@@ -177,9 +177,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
|
||||
static int
|
||||
softpipe_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe_shader_cap param)
|
||||
{
|
||||
#ifdef HAVE_LLVM
|
||||
struct softpipe_screen *sp_screen = softpipe_screen(screen);
|
||||
#endif
|
||||
switch(shader)
|
||||
{
|
||||
case PIPE_SHADER_FRAGMENT:
|
||||
@@ -188,20 +186,16 @@ softpipe_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe
|
||||
case PIPE_SHADER_GEOMETRY:
|
||||
switch (param) {
|
||||
case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
|
||||
#ifdef HAVE_LLVM
|
||||
if (sp_screen->use_llvm)
|
||||
/* Softpipe doesn't yet know how to tell draw/llvm about textures */
|
||||
return 0;
|
||||
#endif
|
||||
return PIPE_MAX_VERTEX_SAMPLERS;
|
||||
case PIPE_SHADER_CAP_INTEGERS:
|
||||
#ifdef HAVE_LLVM /* gallivm doesn't support integers yet */
|
||||
if (sp_screen->use_llvm)
|
||||
return 0;
|
||||
#endif
|
||||
/* fallthrough */
|
||||
else
|
||||
return PIPE_MAX_VERTEX_SAMPLERS;
|
||||
default:
|
||||
return draw_get_shader_param(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;
|
||||
|
Reference in New Issue
Block a user