diff options
| author | Marek Olšák <[email protected]> | 2014-08-07 02:05:10 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-04-01 00:06:41 +0200 |
| commit | 150736b5c34fc07de296454b973ae72ede215ae2 (patch) | |
| tree | 54d93a00b5b0da2000e9de564d7ce2be57c51842 /src/gallium/include/pipe | |
| parent | c011fe7452f5a0c90e1839e3549efc4c2ac665c1 (diff) | |
gallium: remove support for predicates from TGSI (v2)
Neved used.
v2: gallivm: rename "pred" -> "exec_mask"
etnaviv: remove the cap
gallium: fix tgsi_instruction::Padding
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/include/pipe')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 1 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 21 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index fc2fb7fddbb..ec4c093a849 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -803,7 +803,6 @@ enum pipe_shader_cap PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE, PIPE_SHADER_CAP_MAX_CONST_BUFFERS, PIPE_SHADER_CAP_MAX_TEMPS, - PIPE_SHADER_CAP_MAX_PREDS, /* boolean caps */ PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED, PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR, diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 8c08f27a34e..3d99a5f88bc 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -69,7 +69,6 @@ enum tgsi_file_type { TGSI_FILE_SAMPLER, TGSI_FILE_ADDRESS, TGSI_FILE_IMMEDIATE, - TGSI_FILE_PREDICATE, TGSI_FILE_SYSTEM_VALUE, TGSI_FILE_IMAGE, TGSI_FILE_SAMPLER_VIEW, @@ -616,8 +615,6 @@ struct tgsi_property_data { * respectively. For a given operation code, those numbers are fixed and are * present here only for convenience. * - * If Predicate is TRUE, tgsi_instruction_predicate token immediately follows. - * * Saturate controls how are final results in destination registers modified. */ @@ -629,11 +626,10 @@ struct tgsi_instruction unsigned Saturate : 1; /* BOOL */ unsigned NumDstRegs : 2; /* UINT */ unsigned NumSrcRegs : 4; /* UINT */ - unsigned Predicate : 1; /* BOOL */ unsigned Label : 1; unsigned Texture : 1; unsigned Memory : 1; - unsigned Padding : 1; + unsigned Padding : 2; }; /* @@ -709,21 +705,6 @@ struct tgsi_texture_offset unsigned Padding : 6; }; -/* - * For SM3, the following constraint applies. - * - Swizzle is either set to identity or replicate. - */ -struct tgsi_instruction_predicate -{ - int Index : 16; /* SINT */ - unsigned SwizzleX : 2; /* TGSI_SWIZZLE_x */ - unsigned SwizzleY : 2; /* TGSI_SWIZZLE_x */ - unsigned SwizzleZ : 2; /* TGSI_SWIZZLE_x */ - unsigned SwizzleW : 2; /* TGSI_SWIZZLE_x */ - unsigned Negate : 1; /* BOOL */ - unsigned Padding : 7; -}; - /** * File specifies the register array to access. * |