diff options
| author | Nicolai Hähnle <[email protected]> | 2017-04-12 10:16:07 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-04-13 17:30:19 +0200 |
| commit | 3b9fbcb3b6caee65f15dd2876d8dabc590eb0d70 (patch) | |
| tree | e698d6975e4e056d721d9a927219460919166dde /src/gallium/drivers/radeonsi/si_shader.h | |
| parent | ff39f0d59ca0627637423f8a409c0ef645879e15 (diff) | |
radeonsi: change the bit-packing of LS out/TCS in data
Avoid conflicts when merging various VS state bits.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 4a0f2704564..6ce2b26c974 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -175,8 +175,9 @@ enum { SI_PARAM_TCS_OUT_LAYOUT, /* Layout of LS outputs / TCS inputs - * [0:12] = stride between patches in dwords = num_inputs * num_vertices * 4, max = 32*32*4 - * [13:20] = stride between vertices in dwords = num_inputs * 4, max = 32*4 + * [8:20] = stride between patches in dwords = num_inputs * num_vertices * 4, max = 32*32*4 + * [24:31] = stride between vertices in dwords = num_inputs * 4, max = 32*4 + * (same layout as SI_PARAM_VS_STATE_BITS) */ SI_PARAM_TCS_IN_LAYOUT, @@ -230,6 +231,10 @@ enum { /* Clamp vertex color output (only used in VS as VS). */ #define S_VS_STATE_CLAMP_VERTEX_COLOR(x) (((unsigned)(x) & 0x1) << 0) #define C_VS_STATE_CLAMP_VERTEX_COLOR 0xFFFFFFFE +#define S_VS_STATE_LS_OUT_PATCH_SIZE(x) (((unsigned)(x) & 0x1FFF) << 8) +#define C_VS_STATE_LS_OUT_PATCH_SIZE 0xFFE000FF +#define S_VS_STATE_LS_OUT_VERTEX_SIZE(x) (((unsigned)(x) & 0xFF) << 24) +#define C_VS_STATE_LS_OUT_VERTEX_SIZE 0x00FFFFFF /* SI-specific system values. */ enum { |