[Mesa-dev] [PATCH v4 04/11] mesa: add PROGRAM_IMMEDIATE, PROGRAM_BUFFER

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Sun, Jan 24, 2016 at 7:59 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> This makes PROGRAM_IMMEDIATE a first-class gl_register_file type, and
> adds PROGRAM_BUFFER to the list. These are used purely inside
> glsl_to_tgsi conversion.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>  src/mesa/main/mtypes.h                     | 2 ++
>  src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 1 -
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 15dd1ca..23f3e63 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -1861,6 +1861,8 @@ typedef enum
>     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_FILE_MAX
>  } gl_register_file;
>
> diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> index d424e3b..4a9c81a 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -52,7 +52,6 @@
>  #include "st_mesa_to_tgsi.h"
>
>
> -#define PROGRAM_IMMEDIATE PROGRAM_FILE_MAX
>  #define PROGRAM_ANY_CONST ((1 << PROGRAM_STATE_VAR) |    \
>                             (1 << PROGRAM_CONSTANT) |     \
>                             (1 << PROGRAM_UNIFORM))
> --
> 2.4.10
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev