mesa: Remove unused Mesa IR PROGRAM_* register files.

Now that glsl-to-tgsi is gone, a bunch of this is dead.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8044>

diff --git a/src/mesa/program/arbprogparse.c b/src/mesa/program/arbprogparse.c
index d1623d2..dd5c194 100644 (file)
--- a/src/mesa/program/arbprogparse.c
+++ b/src/mesa/program/arbprogparse.c
@@ -38,7 +38,6 @@ The instructions we emit will use six kinds of source registers:
   PROGRAM_INPUT      - input registers
   PROGRAM_TEMPORARY  - temp registers
   PROGRAM_ADDRESS    - address/indirect register
-  PROGRAM_SAMPLER    - texture sampler
   PROGRAM_CONSTANT   - indexes into program->Parameters, a known constant/literal
   PROGRAM_STATE_VAR  - indexes into program->Parameters, and may actually be:
                        + a state variable, like "state.fog.color", or

diff --git a/src/mesa/program/prog_parameter.h b/src/mesa/program/prog_parameter.h
index 3ee5e34..8e275a8 100644 (file)
--- a/src/mesa/program/prog_parameter.h
+++ b/src/mesa/program/prog_parameter.h
@@ -54,7 +54,6 @@ extern "C" {
 typedef enum
 {
    PROGRAM_TEMPORARY,   /**< machine->Temporary[] */
-   PROGRAM_ARRAY,       /**< Arrays & Matrixes */
    PROGRAM_INPUT,       /**< machine->Inputs[] */
    PROGRAM_OUTPUT,      /**< machine->Outputs[] */
    PROGRAM_STATE_VAR,   /**< gl_program->Parameters[] */
@@ -62,14 +61,8 @@ typedef enum
    PROGRAM_UNIFORM,     /**< gl_program->Parameters[] */
    PROGRAM_WRITE_ONLY,  /**< A dummy, write-only register */
    PROGRAM_ADDRESS,     /**< machine->AddressReg */
-   PROGRAM_SAMPLER,     /**< for shader samplers, compile-time only */
    PROGRAM_SYSTEM_VALUE,/**< InstanceId, PrimitiveID, etc. */
    PROGRAM_UNDEFINED,   /**< Invalid/TBD value */
-   PROGRAM_IMMEDIATE,   /**< Immediate value, used by TGSI */
-   PROGRAM_BUFFER,      /**< for shader buffers, compile-time only */
-   PROGRAM_MEMORY,      /**< for shared, global and local memory */
-   PROGRAM_IMAGE,       /**< for shader images, compile-time only */
-   PROGRAM_HW_ATOMIC,   /**< for hw atomic counters, compile-time only */
    PROGRAM_FILE_MAX
 } gl_register_file;
 

diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c
index c02a5e9..cbab749 100644 (file)
--- a/src/mesa/program/prog_print.c
+++ b/src/mesa/program/prog_print.c
@@ -51,8 +51,6 @@ _mesa_register_file_name(gl_register_file f)
    switch (f) {
    case PROGRAM_TEMPORARY:
       return "TEMP";
-   case PROGRAM_ARRAY:
-      return "ARRAY";
    case PROGRAM_INPUT:
       return "INPUT";
    case PROGRAM_OUTPUT:
@@ -65,22 +63,10 @@ _mesa_register_file_name(gl_register_file f)
       return "UNIFORM";
    case PROGRAM_ADDRESS:
       return "ADDR";
-   case PROGRAM_SAMPLER:
-      return "SAMPLER";
    case PROGRAM_SYSTEM_VALUE:
       return "SYSVAL";
    case PROGRAM_UNDEFINED:
       return "UNDEFINED";
-   case PROGRAM_IMMEDIATE:
-      return "IMM";
-   case PROGRAM_BUFFER:
-      return "BUFFER";
-   case PROGRAM_MEMORY:
-      return "MEMORY";
-   case PROGRAM_IMAGE:
-      return "IMAGE";
-   case PROGRAM_HW_ATOMIC:
-      return "HWATOMIC";
    default:
       {
          static char s[20];