diff options
| author | Dave Airlie <[email protected]> | 2012-11-03 20:44:06 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-11-09 10:26:37 +1000 |
| commit | c4427ceff7915d348a5df68ed3a81eca7c7320ad (patch) | |
| tree | 370d31f5da38141e0791a991a58a89ba4c8c2582 /src/gallium/include/pipe | |
| parent | 5b115864d2d6b9a1235dfe510e89ed1a5f6ed3a3 (diff) | |
gallium: add defines/shader opcode for texture cube map array
This just adds the texture target and capability along
with 3 new opcodes required to support this extension.
As this extension requires some texture opcodes with samp + 5 args,
we need to use another src register, this is only required
for TEX, TXL and TXB opcodes to implement this spec.
TEX2 is required for shadow cube map arrays
TXL2 is required for cube map array sampler + explicit lod
TXB2 is required for cube map array sampler + lod bias
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/include/pipe')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 4 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 184136e4725..fa2fb074a7b 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -150,6 +150,7 @@ enum pipe_texture_target { PIPE_TEXTURE_RECT = 5, PIPE_TEXTURE_1D_ARRAY = 6, PIPE_TEXTURE_2D_ARRAY = 7, + PIPE_TEXTURE_CUBE_ARRAY = 8, PIPE_MAX_TEXTURE_TYPES }; @@ -489,7 +490,8 @@ enum pipe_cap { PIPE_CAP_START_INSTANCE = 72, PIPE_CAP_QUERY_TIMESTAMP = 73, PIPE_CAP_TEXTURE_MULTISAMPLE = 74, - PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT = 75 + PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT = 75, + PIPE_CAP_CUBE_MAP_ARRAY = 76 }; /** diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 7d96f27e018..3fb12fb2c47 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -431,7 +431,12 @@ struct tgsi_property_data { #define TGSI_OPCODE_ATOMIMIN 175 #define TGSI_OPCODE_ATOMIMAX 176 -#define TGSI_OPCODE_LAST 177 +/* to be used for shadow cube map compares */ +#define TGSI_OPCODE_TEX2 177 +#define TGSI_OPCODE_TXB2 178 +#define TGSI_OPCODE_TXL2 179 + +#define TGSI_OPCODE_LAST 180 #define TGSI_SAT_NONE 0 /* do not saturate */ #define TGSI_SAT_ZERO_ONE 1 /* clamp to [0,1] */ @@ -507,8 +512,10 @@ struct tgsi_instruction_label #define TGSI_TEXTURE_SHADOWCUBE 13 #define TGSI_TEXTURE_2D_MSAA 14 #define TGSI_TEXTURE_2D_ARRAY_MSAA 15 -#define TGSI_TEXTURE_UNKNOWN 16 -#define TGSI_TEXTURE_COUNT 17 +#define TGSI_TEXTURE_CUBE_ARRAY 16 +#define TGSI_TEXTURE_SHADOWCUBE_ARRAY 17 +#define TGSI_TEXTURE_UNKNOWN 18 +#define TGSI_TEXTURE_COUNT 19 struct tgsi_instruction_texture { |