Module: Mesa Branch: master Commit: 225228a7f59e7435e39e72f9acda6aa125f05bf8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=225228a7f59e7435e39e72f9acda6aa125f05bf8
Author: Marek Olšák <[email protected]> Date: Thu Jan 31 19:40:24 2013 +0100 radeonsi: port some of get_shader_param changes from r600g Reviewed-by: Michel Dänzer <[email protected]> --- src/gallium/drivers/radeonsi/radeonsi_pipe.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index 471dd48..860e70f 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -438,7 +438,6 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e return 0; } - /* TODO: all these should be fixed, since r600 surely supports much more! */ switch (param) { case PIPE_SHADER_CAP_MAX_INSTRUCTIONS: case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS: @@ -446,12 +445,9 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e case PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS: return 16384; case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH: - return 8; /* FIXME */ + return 32; case PIPE_SHADER_CAP_MAX_INPUTS: - if(shader == PIPE_SHADER_FRAGMENT) - return 34; - else - return 32; + return 32; case PIPE_SHADER_CAP_MAX_TEMPS: return 256; /* Max native temporaries. */ case PIPE_SHADER_CAP_MAX_ADDRS: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
