radeonsi: port some of get_shader_param changes from r600g
authorMarek Olšák <maraeo@gmail.com>
Thu, 31 Jan 2013 18:40:24 +0000 (19:40 +0100)
committerMarek Olšák <maraeo@gmail.com>
Fri, 1 Feb 2013 14:16:35 +0000 (15:16 +0100)
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
src/gallium/drivers/radeonsi/radeonsi_pipe.c

index 471dd48b7ec04d483d4f20e29108c926757587e1..860e70f38c469a4688a9bb98d7f8e0c957493e77 100644 (file)
@@ -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: