gallium: remove PIPE_SHADER_CAP_SCALAR_ISA
authorMarek Olšák <marek.olsak@amd.com>
Tue, 8 Oct 2019 02:50:36 +0000 (22:50 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Thu, 10 Oct 2019 19:49:19 +0000 (15:49 -0400)
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
18 files changed:
src/gallium/auxiliary/gallivm/lp_bld_limits.h
src/gallium/auxiliary/tgsi/tgsi_exec.h
src/gallium/docs/source/screen.rst
src/gallium/drivers/etnaviv/etnaviv_screen.c
src/gallium/drivers/freedreno/freedreno_screen.c
src/gallium/drivers/iris/iris_screen.c
src/gallium/drivers/nouveau/nv30/nv30_screen.c
src/gallium/drivers/nouveau/nv50/nv50_screen.c
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
src/gallium/drivers/panfrost/pan_screen.c
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/radeonsi/si_get.c
src/gallium/drivers/svga/svga_screen.c
src/gallium/drivers/v3d/v3d_screen.c
src/gallium/drivers/vc4/vc4_screen.c
src/gallium/drivers/virgl/virgl_screen.c
src/gallium/include/pipe/p_defines.h

index 0f74d33148ddf88ae82839a129775304620c57c4..91fc95e5c1118988eb43ae79f05fde6eacd44c10 100644 (file)
@@ -147,8 +147,6 @@ gallivm_get_shader_param(enum pipe_shader_cap param)
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
       return 0;
-   case PIPE_SHADER_CAP_SCALAR_ISA:
-      return 1;
    case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT:
       return 32;
    case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS:
index abc422daf5e3324c1049797e585ace5fbf7a86cb..dea4c151975d27bbfb793c0c119eb067e91c164d 100644 (file)
@@ -530,8 +530,6 @@ tgsi_exec_get_shader_param(enum pipe_shader_cap param)
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
       return 0;
-   case PIPE_SHADER_CAP_SCALAR_ISA:
-      return 1;
    case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS:
       return PIPE_MAX_SHADER_BUFFERS;
    case PIPE_SHADER_CAP_MAX_SHADER_IMAGES:
index 961f0a9c3cc15ea7f76f7d40b2d7c7e63a9d7ab4..9acab6fafc5bc69f104167fd29dacfbfe2a32492 100644 (file)
@@ -665,7 +665,6 @@ MOV OUT[0], CONST[0][3]  # copy vector 3 of constbuf 0
   how many HW counters are available for this stage. (0 uses SSBO atomics).
 * ``PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS``: If atomic counters are
   separate, how many atomic counter buffers are available for this stage.
-* ``PIPE_SHADER_CAP_SCALAR_ISA``: Whether the ISA is a scalar one.
 
 .. _pipe_compute_cap:
 
index 0e5a949ba4d836bc51b9473d884205e6ea6a2e4d..1476ab206f5ee43e413c7b817c75907af57560f0 100644 (file)
@@ -354,7 +354,6 @@ etna_screen_get_shader_param(struct pipe_screen *pscreen,
    case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS:
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
-   case PIPE_SHADER_CAP_SCALAR_ISA:
       return 0;
    }
 
index a3bbd4c390bb08aae8c0fad591faa2ae2b251186..8c83ddb8041dfb72ad14b855485f45b9ba7b9fec 100644 (file)
@@ -538,8 +538,6 @@ fd_screen_get_shader_param(struct pipe_screen *pscreen,
                return (1 << PIPE_SHADER_IR_NIR) | (1 << PIPE_SHADER_IR_TGSI);
        case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT:
                return 32;
-       case PIPE_SHADER_CAP_SCALAR_ISA:
-               return is_ir3(screen) ? 1 : 0;
        case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS:
        case PIPE_SHADER_CAP_MAX_SHADER_IMAGES:
                if (is_a5xx(screen) || is_a6xx(screen)) {
index 60ad4ce537d707480707b7b96f97d46b1f38df24..83e88410b8f913819494454ca1562d4e95d8588e 100644 (file)
@@ -403,7 +403,6 @@ iris_get_shader_param(struct pipe_screen *pscreen,
    case PIPE_SHADER_CAP_SUBROUTINES:
       return 0;
    case PIPE_SHADER_CAP_INTEGERS:
-   case PIPE_SHADER_CAP_SCALAR_ISA:
       return 1;
    case PIPE_SHADER_CAP_INT64_ATOMICS:
    case PIPE_SHADER_CAP_FP16:
index acc8b0a13613e5e00ce180e0f9694eaa7024e3b4..bd25819b7177bb495e764ee30046ab537cfaf365 100644 (file)
@@ -361,7 +361,6 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen,
       case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS:
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
-      case PIPE_SHADER_CAP_SCALAR_ISA:
          return 0;
       default:
          debug_printf("unknown vertex shader param %d\n", param);
@@ -414,7 +413,6 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen,
       case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS:
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
-      case PIPE_SHADER_CAP_SCALAR_ISA:
          return 0;
       default:
          debug_printf("unknown fragment shader param %d\n", param);
index fe1f628a5ab6b996984ec099eb7eb2199075c2dd..41327858fd0d6251fe7473eef3906287c30840a2 100644 (file)
@@ -436,8 +436,6 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen,
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
       return 0;
-   case PIPE_SHADER_CAP_SCALAR_ISA:
-      return 1;
    default:
       NOUVEAU_ERR("unknown PIPE_SHADER_CAP %d\n", param);
       return 0;
index 8c04cda17aae5d13827e1478aea51f06a641494a..a5b8659d32117982a037e6d392f323f1614b5652 100644 (file)
@@ -472,8 +472,6 @@ nvc0_screen_get_shader_param(struct pipe_screen *pscreen,
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
       return 0;
-   case PIPE_SHADER_CAP_SCALAR_ISA:
-      return 1;
    case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS:
       return NVC0_MAX_BUFFERS;
    case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
index 55c66e0c9a79155f69a15ca2992799ce7cc02c89..0b7001c9ed8e64c2ad3ed6e9d1032e3d0dee9163 100644 (file)
@@ -260,9 +260,6 @@ panfrost_get_shader_param(struct pipe_screen *screen,
 
         /* this is probably not totally correct.. but it's a start: */
         switch (param) {
-        case PIPE_SHADER_CAP_SCALAR_ISA:
-                return 0;
-
         case PIPE_SHADER_CAP_MAX_INSTRUCTIONS:
         case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS:
         case PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS:
index 64ff5bbc67b56016e7a36a85da930dc8bc8e9835..0651a3ecdb14efbbbbe9fce358a42657e255bfef 100644 (file)
@@ -434,8 +434,6 @@ static int r300_get_shader_param(struct pipe_screen *pscreen,
             return PIPE_SHADER_IR_TGSI;
         case PIPE_SHADER_CAP_SUPPORTED_IRS:
             return 0;
-        case PIPE_SHADER_CAP_SCALAR_ISA:
-            return 0;
         }
         break;
     case PIPE_SHADER_VERTEX:
@@ -502,8 +500,6 @@ static int r300_get_shader_param(struct pipe_screen *pscreen,
             return PIPE_SHADER_IR_TGSI;
         case PIPE_SHADER_CAP_SUPPORTED_IRS:
             return 0;
-        case PIPE_SHADER_CAP_SCALAR_ISA:
-            return 0;
         }
         break;
     default:
index 793f86ef7062cd31f378a252cca234eb08e91009..ca8669b98b90195324a9145cfada04a1d45a22cb 100644 (file)
@@ -698,8 +698,6 @@ static int r600_get_shader_param(struct pipe_screen* pscreen,
                        return EG_MAX_ATOMIC_BUFFERS;
                }
                return 0;
-       case PIPE_SHADER_CAP_SCALAR_ISA:
-               return 0;
        case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT:
                /* due to a bug in the shader compiler, some loops hang
                 * if they are not unrolled, see:
index e37319750f4844c2f5479254f1ad3d67d273d3c6..4a7b9e3c5fc70da91b0e74faa0ca6a7defe7cc0d 100644 (file)
@@ -498,8 +498,6 @@ static int si_get_shader_param(struct pipe_screen* pscreen,
        case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
        case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
                return 0;
-       case PIPE_SHADER_CAP_SCALAR_ISA:
-               return 1;
        }
        return 0;
 }
index a8adf259967d07af4197a4464d82c9cb3e848a67..b9cd9db5cbca6e7f089d8610078ad1fe3425df73 100644 (file)
@@ -572,8 +572,6 @@ vgpu9_get_shader_param(struct pipe_screen *screen,
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
          return 0;
-      case PIPE_SHADER_CAP_SCALAR_ISA:
-         return 1;
       case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT:
          return 32;
       }
@@ -641,8 +639,6 @@ vgpu9_get_shader_param(struct pipe_screen *screen,
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
       case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
          return 0;
-      case PIPE_SHADER_CAP_SCALAR_ISA:
-         return 1;
       case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT:
          return 32;
       }
@@ -744,8 +740,6 @@ vgpu10_get_shader_param(struct pipe_screen *screen,
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
    case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
       return 0;
-   case PIPE_SHADER_CAP_SCALAR_ISA:
-      return 1;
    case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT:
       return 32;
    default:
index 083d2e96ee615c5cf2b79343e5ac05ef8b46a50f..563a0108e97dd8c55b47a1118c06391a066417e3 100644 (file)
@@ -348,8 +348,6 @@ v3d_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
         case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
         case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
                 return 0;
-        case PIPE_SHADER_CAP_SCALAR_ISA:
-                return 1;
         case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
         case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS:
                 return V3D_MAX_TEXTURE_SAMPLERS;
index 4aeacc832b8b0622df6770a96d1f20d72055b532..be20dc90406df116b8862717ac126baa4d2f3b84 100644 (file)
@@ -299,8 +299,6 @@ vc4_screen_get_shader_param(struct pipe_screen *pscreen,
         case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
         case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
                 return 0;
-        case PIPE_SHADER_CAP_SCALAR_ISA:
-                return 1;
         default:
                 fprintf(stderr, "unknown shader param %d\n", param);
                 return 0;
index fc898ff46256084a2b3c9ea009f4d3e995379848..13e5bf57d07a4c05ddb6bfa141081d7acda6f184 100644 (file)
@@ -463,8 +463,6 @@ virgl_get_shader_param(struct pipe_screen *screen,
       case PIPE_SHADER_CAP_INT64_ATOMICS:
       case PIPE_SHADER_CAP_FP16:
          return 0;
-      case PIPE_SHADER_CAP_SCALAR_ISA:
-         return 1;
       default:
          return 0;
       }
index 9e579e479e9a4429df20522cb49f3de08f13f2fa..564f37dd1b578312c785b59f45ffc1f1a20d111e 100644 (file)
@@ -987,7 +987,6 @@ enum pipe_shader_cap
    PIPE_SHADER_CAP_TGSI_LDEXP_SUPPORTED,
    PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS,
    PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS,
-   PIPE_SHADER_CAP_SCALAR_ISA,
 };
 
 /**