KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: use enums in p_shader_tokens.h (v2) 

Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> (v1)
Reviewed-by: Roland Scheidegger <sroland@vmware.com> (v1)
Acked-by: Jose Fonseca <jfonseca@vmware.com> (v1)

v2: name enums
This commit is contained in:
Marek Olšák 2016-04-16 13:35:08 +02:00
parent 0135bd44c2
commit ed23335a31
1 changed files with 164 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

303
src/gallium/include/pipe/p_shader_tokens.h
View File

@ -40,12 +40,14 @@ struct tgsi_header
unsigned BodySize : 24; unsigned BodySize : 24;
}; };
#define TGSI_PROCESSOR_FRAGMENT 0 enum {
#define TGSI_PROCESSOR_VERTEX 1 TGSI_PROCESSOR_FRAGMENT,
#define TGSI_PROCESSOR_GEOMETRY 2 TGSI_PROCESSOR_VERTEX,
#define TGSI_PROCESSOR_TESS_CTRL 3 TGSI_PROCESSOR_GEOMETRY,
#define TGSI_PROCESSOR_TESS_EVAL 4 TGSI_PROCESSOR_TESS_CTRL,
#define TGSI_PROCESSOR_COMPUTE 5 TGSI_PROCESSOR_TESS_EVAL,
TGSI_PROCESSOR_COMPUTE,
};
struct tgsi_processor struct tgsi_processor
{ {
@ -53,10 +55,12 @@ struct tgsi_processor
unsigned Padding : 28; unsigned Padding : 28;
}; };
#define TGSI_TOKEN_TYPE_DECLARATION 0 enum tgsi_token_type {
#define TGSI_TOKEN_TYPE_IMMEDIATE 1 TGSI_TOKEN_TYPE_DECLARATION,
#define TGSI_TOKEN_TYPE_INSTRUCTION 2 TGSI_TOKEN_TYPE_IMMEDIATE,
#define TGSI_TOKEN_TYPE_PROPERTY 3 TGSI_TOKEN_TYPE_INSTRUCTION,
TGSI_TOKEN_TYPE_PROPERTY,
};
struct tgsi_token struct tgsi_token
{ {
@ -66,21 +70,21 @@ struct tgsi_token
}; };
enum tgsi_file_type { enum tgsi_file_type {
TGSI_FILE_NULL =0, TGSI_FILE_NULL,
TGSI_FILE_CONSTANT =1, TGSI_FILE_CONSTANT,
TGSI_FILE_INPUT =2, TGSI_FILE_INPUT,
TGSI_FILE_OUTPUT =3, TGSI_FILE_OUTPUT,
TGSI_FILE_TEMPORARY =4, TGSI_FILE_TEMPORARY,
TGSI_FILE_SAMPLER =5, TGSI_FILE_SAMPLER,
TGSI_FILE_ADDRESS =6, TGSI_FILE_ADDRESS,
TGSI_FILE_IMMEDIATE =7, TGSI_FILE_IMMEDIATE,
TGSI_FILE_PREDICATE =8, TGSI_FILE_PREDICATE,
TGSI_FILE_SYSTEM_VALUE =9, TGSI_FILE_SYSTEM_VALUE,
TGSI_FILE_IMAGE =10, TGSI_FILE_IMAGE,
TGSI_FILE_SAMPLER_VIEW =11, TGSI_FILE_SAMPLER_VIEW,
TGSI_FILE_BUFFER =12, TGSI_FILE_BUFFER,
TGSI_FILE_MEMORY =13, TGSI_FILE_MEMORY,
TGSI_FILE_COUNT /**< how many TGSI_FILE_ types */ TGSI_FILE_COUNT, /**< how many TGSI_FILE_ types */
}; };
@ -101,27 +105,33 @@ enum tgsi_file_type {
#define TGSI_WRITEMASK_YZW 0x0E #define TGSI_WRITEMASK_YZW 0x0E
#define TGSI_WRITEMASK_XYZW 0x0F #define TGSI_WRITEMASK_XYZW 0x0F
#define TGSI_INTERPOLATE_CONSTANT 0 enum tgsi_interpolate_mode {
#define TGSI_INTERPOLATE_LINEAR 1 TGSI_INTERPOLATE_CONSTANT,
#define TGSI_INTERPOLATE_PERSPECTIVE 2 TGSI_INTERPOLATE_LINEAR,
#define TGSI_INTERPOLATE_COLOR 3 /* special color case for smooth/flat */ TGSI_INTERPOLATE_PERSPECTIVE,
#define TGSI_INTERPOLATE_COUNT 4 TGSI_INTERPOLATE_COLOR, /* special color case for smooth/flat */
TGSI_INTERPOLATE_COUNT,
};
#define TGSI_INTERPOLATE_LOC_CENTER 0 enum tgsi_interpolate_loc {
#define TGSI_INTERPOLATE_LOC_CENTROID 1 TGSI_INTERPOLATE_LOC_CENTER,
#define TGSI_INTERPOLATE_LOC_SAMPLE 2 TGSI_INTERPOLATE_LOC_CENTROID,
#define TGSI_INTERPOLATE_LOC_COUNT 3 TGSI_INTERPOLATE_LOC_SAMPLE,
TGSI_INTERPOLATE_LOC_COUNT,
};
#define TGSI_CYLINDRICAL_WRAP_X (1 << 0) #define TGSI_CYLINDRICAL_WRAP_X (1 << 0)
#define TGSI_CYLINDRICAL_WRAP_Y (1 << 1) #define TGSI_CYLINDRICAL_WRAP_Y (1 << 1)
#define TGSI_CYLINDRICAL_WRAP_Z (1 << 2) #define TGSI_CYLINDRICAL_WRAP_Z (1 << 2)
#define TGSI_CYLINDRICAL_WRAP_W (1 << 3) #define TGSI_CYLINDRICAL_WRAP_W (1 << 3)
#define TGSI_MEMORY_TYPE_GLOBAL 0 /* OpenCL global */ enum tgsi_memory_type {
#define TGSI_MEMORY_TYPE_SHARED 1 /* OpenCL local / GLSL shared */ TGSI_MEMORY_TYPE_GLOBAL, /* OpenCL global */
#define TGSI_MEMORY_TYPE_PRIVATE 2 /* OpenCL private */ TGSI_MEMORY_TYPE_SHARED, /* OpenCL local / GLSL shared */
#define TGSI_MEMORY_TYPE_INPUT 3 /* OpenCL kernel input params */ TGSI_MEMORY_TYPE_PRIVATE, /* OpenCL private */
#define TGSI_MEMORY_TYPE_COUNT 4 TGSI_MEMORY_TYPE_INPUT, /* OpenCL kernel input params */
TGSI_MEMORY_TYPE_COUNT,
};
struct tgsi_declaration struct tgsi_declaration
{ {
@ -160,45 +170,47 @@ struct tgsi_declaration_interp
unsigned Padding : 22; unsigned Padding : 22;
}; };
#define TGSI_SEMANTIC_POSITION 0 enum tgsi_semantic {
#define TGSI_SEMANTIC_COLOR 1 TGSI_SEMANTIC_POSITION,
#define TGSI_SEMANTIC_BCOLOR 2 /**< back-face color */ TGSI_SEMANTIC_COLOR,
#define TGSI_SEMANTIC_FOG 3 TGSI_SEMANTIC_BCOLOR, /**< back-face color */
#define TGSI_SEMANTIC_PSIZE 4 TGSI_SEMANTIC_FOG,
#define TGSI_SEMANTIC_GENERIC 5 TGSI_SEMANTIC_PSIZE,
#define TGSI_SEMANTIC_NORMAL 6 TGSI_SEMANTIC_GENERIC,
#define TGSI_SEMANTIC_FACE 7 TGSI_SEMANTIC_NORMAL,
#define TGSI_SEMANTIC_EDGEFLAG 8 TGSI_SEMANTIC_FACE,
#define TGSI_SEMANTIC_PRIMID 9 TGSI_SEMANTIC_EDGEFLAG,
#define TGSI_SEMANTIC_INSTANCEID 10 /**< doesn't include start_instance */ TGSI_SEMANTIC_PRIMID,
#define TGSI_SEMANTIC_VERTEXID 11 TGSI_SEMANTIC_INSTANCEID, /**< doesn't include start_instance */
#define TGSI_SEMANTIC_STENCIL 12 TGSI_SEMANTIC_VERTEXID,
#define TGSI_SEMANTIC_CLIPDIST 13 TGSI_SEMANTIC_STENCIL,
#define TGSI_SEMANTIC_CLIPVERTEX 14 TGSI_SEMANTIC_CLIPDIST,
#define TGSI_SEMANTIC_GRID_SIZE 15 /**< grid size in blocks */ TGSI_SEMANTIC_CLIPVERTEX,
#define TGSI_SEMANTIC_BLOCK_ID 16 /**< id of the current block */ TGSI_SEMANTIC_GRID_SIZE, /**< grid size in blocks */
#define TGSI_SEMANTIC_BLOCK_SIZE 17 /**< block size in threads */ TGSI_SEMANTIC_BLOCK_ID, /**< id of the current block */
#define TGSI_SEMANTIC_THREAD_ID 18 /**< block-relative id of the current thread */ TGSI_SEMANTIC_BLOCK_SIZE, /**< block size in threads */
#define TGSI_SEMANTIC_TEXCOORD 19 /**< texture or sprite coordinates */ TGSI_SEMANTIC_THREAD_ID, /**< block-relative id of the current thread */
#define TGSI_SEMANTIC_PCOORD 20 /**< point sprite coordinate */ TGSI_SEMANTIC_TEXCOORD, /**< texture or sprite coordinates */
#define TGSI_SEMANTIC_VIEWPORT_INDEX 21 /**< viewport index */ TGSI_SEMANTIC_PCOORD, /**< point sprite coordinate */
#define TGSI_SEMANTIC_LAYER 22 /**< layer (rendertarget index) */ TGSI_SEMANTIC_VIEWPORT_INDEX, /**< viewport index */
#define TGSI_SEMANTIC_CULLDIST 23 TGSI_SEMANTIC_LAYER, /**< layer (rendertarget index) */
#define TGSI_SEMANTIC_SAMPLEID 24 TGSI_SEMANTIC_CULLDIST,
#define TGSI_SEMANTIC_SAMPLEPOS 25 TGSI_SEMANTIC_SAMPLEID,
#define TGSI_SEMANTIC_SAMPLEMASK 26 TGSI_SEMANTIC_SAMPLEPOS,
#define TGSI_SEMANTIC_INVOCATIONID 27 TGSI_SEMANTIC_SAMPLEMASK,
#define TGSI_SEMANTIC_VERTEXID_NOBASE 28 TGSI_SEMANTIC_INVOCATIONID,
#define TGSI_SEMANTIC_BASEVERTEX 29 TGSI_SEMANTIC_VERTEXID_NOBASE,
#define TGSI_SEMANTIC_PATCH 30 /**< generic per-patch semantic */ TGSI_SEMANTIC_BASEVERTEX,
#define TGSI_SEMANTIC_TESSCOORD 31 /**< coordinate being processed by tess */ TGSI_SEMANTIC_PATCH, /**< generic per-patch semantic */
#define TGSI_SEMANTIC_TESSOUTER 32 /**< outer tessellation levels */ TGSI_SEMANTIC_TESSCOORD, /**< coordinate being processed by tess */
#define TGSI_SEMANTIC_TESSINNER 33 /**< inner tessellation levels */ TGSI_SEMANTIC_TESSOUTER, /**< outer tessellation levels */
#define TGSI_SEMANTIC_VERTICESIN 34 /**< number of input vertices */ TGSI_SEMANTIC_TESSINNER, /**< inner tessellation levels */
#define TGSI_SEMANTIC_HELPER_INVOCATION 35 /**< current invocation is helper */ TGSI_SEMANTIC_VERTICESIN, /**< number of input vertices */
#define TGSI_SEMANTIC_BASEINSTANCE 36 TGSI_SEMANTIC_HELPER_INVOCATION, /**< current invocation is helper */
#define TGSI_SEMANTIC_DRAWID 37 TGSI_SEMANTIC_BASEINSTANCE,
#define TGSI_SEMANTIC_COUNT 38 /**< number of semantic values */ TGSI_SEMANTIC_DRAWID,
TGSI_SEMANTIC_COUNT, /**< number of semantic values */
};
struct tgsi_declaration_semantic struct tgsi_declaration_semantic
{ {
@ -237,10 +249,12 @@ struct tgsi_declaration_array {
unsigned Padding : 22; unsigned Padding : 22;
}; };
#define TGSI_IMM_FLOAT32 0 enum tgsi_imm_type {
#define TGSI_IMM_UINT32 1 TGSI_IMM_FLOAT32,
#define TGSI_IMM_INT32 2 TGSI_IMM_UINT32,
#define TGSI_IMM_FLOAT64 3 TGSI_IMM_INT32,
TGSI_IMM_FLOAT64,
};
struct tgsi_immediate struct tgsi_immediate
{ {
@ -257,29 +271,31 @@ union tgsi_immediate_data
int Int; int Int;
}; };
#define TGSI_PROPERTY_GS_INPUT_PRIM 0 enum tgsi_property_name {
#define TGSI_PROPERTY_GS_OUTPUT_PRIM 1 TGSI_PROPERTY_GS_INPUT_PRIM,
#define TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES 2 TGSI_PROPERTY_GS_OUTPUT_PRIM,
#define TGSI_PROPERTY_FS_COORD_ORIGIN 3 TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES,
#define TGSI_PROPERTY_FS_COORD_PIXEL_CENTER 4 TGSI_PROPERTY_FS_COORD_ORIGIN,
#define TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS 5 TGSI_PROPERTY_FS_COORD_PIXEL_CENTER,
#define TGSI_PROPERTY_FS_DEPTH_LAYOUT 6 TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS,
#define TGSI_PROPERTY_VS_PROHIBIT_UCPS 7 TGSI_PROPERTY_FS_DEPTH_LAYOUT,
#define TGSI_PROPERTY_GS_INVOCATIONS 8 TGSI_PROPERTY_VS_PROHIBIT_UCPS,
#define TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION 9 TGSI_PROPERTY_GS_INVOCATIONS,
#define TGSI_PROPERTY_TCS_VERTICES_OUT 10 TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION,
#define TGSI_PROPERTY_TES_PRIM_MODE 11 TGSI_PROPERTY_TCS_VERTICES_OUT,
#define TGSI_PROPERTY_TES_SPACING 12 TGSI_PROPERTY_TES_PRIM_MODE,
#define TGSI_PROPERTY_TES_VERTEX_ORDER_CW 13 TGSI_PROPERTY_TES_SPACING,
#define TGSI_PROPERTY_TES_POINT_MODE 14 TGSI_PROPERTY_TES_VERTEX_ORDER_CW,
#define TGSI_PROPERTY_NUM_CLIPDIST_ENABLED 15 TGSI_PROPERTY_TES_POINT_MODE,
#define TGSI_PROPERTY_NUM_CULLDIST_ENABLED 16 TGSI_PROPERTY_NUM_CLIPDIST_ENABLED,
#define TGSI_PROPERTY_FS_EARLY_DEPTH_STENCIL 17 TGSI_PROPERTY_NUM_CULLDIST_ENABLED,
#define TGSI_PROPERTY_NEXT_SHADER 18 TGSI_PROPERTY_FS_EARLY_DEPTH_STENCIL,
#define TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH 19 TGSI_PROPERTY_NEXT_SHADER,
#define TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT 20 TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH,
#define TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH 21 TGSI_PROPERTY_CS_FIXED_BLOCK_HEIGHT,
#define TGSI_PROPERTY_COUNT 22 TGSI_PROPERTY_CS_FIXED_BLOCK_DEPTH,
TGSI_PROPERTY_COUNT,
};
struct tgsi_property { struct tgsi_property {
unsigned Type : 4; /**< TGSI_TOKEN_TYPE_PROPERTY */ unsigned Type : 4; /**< TGSI_TOKEN_TYPE_PROPERTY */
@ -288,18 +304,23 @@ struct tgsi_property {
unsigned Padding : 12; unsigned Padding : 12;
}; };
#define TGSI_FS_COORD_ORIGIN_UPPER_LEFT 0 enum tgsi_fs_coord_origin {
#define TGSI_FS_COORD_ORIGIN_LOWER_LEFT 1 TGSI_FS_COORD_ORIGIN_UPPER_LEFT,
TGSI_FS_COORD_ORIGIN_LOWER_LEFT,
};
#define TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER 0 enum tgsi_fs_coord_pixcenter {
#define TGSI_FS_COORD_PIXEL_CENTER_INTEGER 1 TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER,
TGSI_FS_COORD_PIXEL_CENTER_INTEGER,
#define TGSI_FS_DEPTH_LAYOUT_NONE 0 };
#define TGSI_FS_DEPTH_LAYOUT_ANY 1
#define TGSI_FS_DEPTH_LAYOUT_GREATER 2
#define TGSI_FS_DEPTH_LAYOUT_LESS 3
#define TGSI_FS_DEPTH_LAYOUT_UNCHANGED 4
enum tgsi_fs_depth_layout {
TGSI_FS_DEPTH_LAYOUT_NONE,
TGSI_FS_DEPTH_LAYOUT_ANY,
TGSI_FS_DEPTH_LAYOUT_GREATER,
TGSI_FS_DEPTH_LAYOUT_LESS,
TGSI_FS_DEPTH_LAYOUT_UNCHANGED,
};
struct tgsi_property_data { struct tgsi_property_data {
unsigned Data; unsigned Data;
@ -596,10 +617,12 @@ struct tgsi_instruction
* instruction, including the instruction word. * instruction, including the instruction word.
*/ */
#define TGSI_SWIZZLE_X 0 enum tgsi_swizzle {
#define TGSI_SWIZZLE_Y 1 TGSI_SWIZZLE_X,
#define TGSI_SWIZZLE_Z 2 TGSI_SWIZZLE_Y,
#define TGSI_SWIZZLE_W 3 TGSI_SWIZZLE_Z,
TGSI_SWIZZLE_W,
};
struct tgsi_instruction_label struct tgsi_instruction_label
{ {
@ -607,26 +630,28 @@ struct tgsi_instruction_label
unsigned Padding : 8; unsigned Padding : 8;
}; };
#define TGSI_TEXTURE_BUFFER 0 enum tgsi_texture_type {
#define TGSI_TEXTURE_1D 1 TGSI_TEXTURE_BUFFER,
#define TGSI_TEXTURE_2D 2 TGSI_TEXTURE_1D,
#define TGSI_TEXTURE_3D 3 TGSI_TEXTURE_2D,
#define TGSI_TEXTURE_CUBE 4 TGSI_TEXTURE_3D,
#define TGSI_TEXTURE_RECT 5 TGSI_TEXTURE_CUBE,
#define TGSI_TEXTURE_SHADOW1D 6 TGSI_TEXTURE_RECT,
#define TGSI_TEXTURE_SHADOW2D 7 TGSI_TEXTURE_SHADOW1D,
#define TGSI_TEXTURE_SHADOWRECT 8 TGSI_TEXTURE_SHADOW2D,
#define TGSI_TEXTURE_1D_ARRAY 9 TGSI_TEXTURE_SHADOWRECT,
#define TGSI_TEXTURE_2D_ARRAY 10 TGSI_TEXTURE_1D_ARRAY,
#define TGSI_TEXTURE_SHADOW1D_ARRAY 11 TGSI_TEXTURE_2D_ARRAY,
#define TGSI_TEXTURE_SHADOW2D_ARRAY 12 TGSI_TEXTURE_SHADOW1D_ARRAY,
#define TGSI_TEXTURE_SHADOWCUBE 13 TGSI_TEXTURE_SHADOW2D_ARRAY,
#define TGSI_TEXTURE_2D_MSAA 14 TGSI_TEXTURE_SHADOWCUBE,
#define TGSI_TEXTURE_2D_ARRAY_MSAA 15 TGSI_TEXTURE_2D_MSAA,
#define TGSI_TEXTURE_CUBE_ARRAY 16 TGSI_TEXTURE_2D_ARRAY_MSAA,
#define TGSI_TEXTURE_SHADOWCUBE_ARRAY 17 TGSI_TEXTURE_CUBE_ARRAY,
#define TGSI_TEXTURE_UNKNOWN 18 TGSI_TEXTURE_SHADOWCUBE_ARRAY,
#define TGSI_TEXTURE_COUNT 19 TGSI_TEXTURE_UNKNOWN,
TGSI_TEXTURE_COUNT,
};
struct tgsi_instruction_texture struct tgsi_instruction_texture
{ {