Re: [Mesa-dev] [PATCH 05/11] gallium: add UBO type to tgsi_file_type

2017-08-21 Thread Marek Olšák
I'd like the new "file" type to be called CONSTBUF instead of UBO. We
don't generally use GL nomenclature in Gallium.

Marek

On Thu, Aug 17, 2017 at 1:03 PM, Timothy Arceri  wrote:
> This will be use to distinguish between load types when using
> the TGSI_OPCODE_LOAD opcode.
> ---
>  src/gallium/auxiliary/tgsi/tgsi_strings.c  | 1 +
>  src/gallium/include/pipe/p_shader_tokens.h | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c 
> b/src/gallium/auxiliary/tgsi/tgsi_strings.c
> index 7ce12d3655..c753ce2afb 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
> @@ -50,20 +50,21 @@ static const char *tgsi_file_names[] =
> "OUT",
> "TEMP",
> "SAMP",
> "ADDR",
> "IMM",
> "SV",
> "IMAGE",
> "SVIEW",
> "BUFFER",
> "MEMORY",
> +   "UBO",
>  };
>
>  const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] =
>  {
> "POSITION",
> "COLOR",
> "BCOLOR",
> "FOG",
> "PSIZE",
> "GENERIC",
> diff --git a/src/gallium/include/pipe/p_shader_tokens.h 
> b/src/gallium/include/pipe/p_shader_tokens.h
> index aa0fb3e3b3..454ecee150 100644
> --- a/src/gallium/include/pipe/p_shader_tokens.h
> +++ b/src/gallium/include/pipe/p_shader_tokens.h
> @@ -67,20 +67,21 @@ enum tgsi_file_type {
> TGSI_FILE_OUTPUT,
> TGSI_FILE_TEMPORARY,
> TGSI_FILE_SAMPLER,
> TGSI_FILE_ADDRESS,
> TGSI_FILE_IMMEDIATE,
> TGSI_FILE_SYSTEM_VALUE,
> TGSI_FILE_IMAGE,
> TGSI_FILE_SAMPLER_VIEW,
> TGSI_FILE_BUFFER,
> TGSI_FILE_MEMORY,
> +   TGSI_FILE_UBO,
> TGSI_FILE_COUNT,  /**< how many TGSI_FILE_ types */
>  };
>
>
>  #define TGSI_WRITEMASK_NONE 0x00
>  #define TGSI_WRITEMASK_X0x01
>  #define TGSI_WRITEMASK_Y0x02
>  #define TGSI_WRITEMASK_XY   0x03
>  #define TGSI_WRITEMASK_Z0x04
>  #define TGSI_WRITEMASK_XZ   0x05
> --
> 2.13.4
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 05/11] gallium: add UBO type to tgsi_file_type

2017-08-17 Thread Timothy Arceri
This will be use to distinguish between load types when using
the TGSI_OPCODE_LOAD opcode.
---
 src/gallium/auxiliary/tgsi/tgsi_strings.c  | 1 +
 src/gallium/include/pipe/p_shader_tokens.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c 
b/src/gallium/auxiliary/tgsi/tgsi_strings.c
index 7ce12d3655..c753ce2afb 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
@@ -50,20 +50,21 @@ static const char *tgsi_file_names[] =
"OUT",
"TEMP",
"SAMP",
"ADDR",
"IMM",
"SV",
"IMAGE",
"SVIEW",
"BUFFER",
"MEMORY",
+   "UBO",
 };
 
 const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] =
 {
"POSITION",
"COLOR",
"BCOLOR",
"FOG",
"PSIZE",
"GENERIC",
diff --git a/src/gallium/include/pipe/p_shader_tokens.h 
b/src/gallium/include/pipe/p_shader_tokens.h
index aa0fb3e3b3..454ecee150 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -67,20 +67,21 @@ enum tgsi_file_type {
TGSI_FILE_OUTPUT,
TGSI_FILE_TEMPORARY,
TGSI_FILE_SAMPLER,
TGSI_FILE_ADDRESS,
TGSI_FILE_IMMEDIATE,
TGSI_FILE_SYSTEM_VALUE,
TGSI_FILE_IMAGE,
TGSI_FILE_SAMPLER_VIEW,
TGSI_FILE_BUFFER,
TGSI_FILE_MEMORY,
+   TGSI_FILE_UBO,
TGSI_FILE_COUNT,  /**< how many TGSI_FILE_ types */
 };
 
 
 #define TGSI_WRITEMASK_NONE 0x00
 #define TGSI_WRITEMASK_X0x01
 #define TGSI_WRITEMASK_Y0x02
 #define TGSI_WRITEMASK_XY   0x03
 #define TGSI_WRITEMASK_Z0x04
 #define TGSI_WRITEMASK_XZ   0x05
-- 
2.13.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev