diff options
| author | Marek Olšák <[email protected]> | 2017-02-14 22:23:04 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-04-26 13:08:05 +0200 |
| commit | 96b0cfc82ef08c0a81016278c69f24766f2410b2 (patch) | |
| tree | 1176fdf59b5801a5475f4e13af23bfdeb13f81b8 /src/gallium/drivers/radeonsi/si_shader.h | |
| parent | 3f2a0649abc982fe5de647a96fbe354aa9e41a59 (diff) | |
radeonsi: turn si_shader_key::mono into a non-union
A merged LS-HS shader needs both fix_fetch and inputs_to_copy
for compilation.
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index cfa691b0589..05c0e623b4a 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -451,14 +451,10 @@ struct si_shader_key { unsigned as_ls:1; /* local shader, which precedes TCS */ /* Flags for monolithic compilation only. */ - union { - struct { - /* One byte for every input: SI_FIX_FETCH_* enums. */ - uint8_t fix_fetch[SI_MAX_ATTRIBS]; - } vs; - struct { - uint64_t inputs_to_copy; /* for fixed-func TCS */ - } tcs; + struct { + /* One byte for every input: SI_FIX_FETCH_* enums. */ + uint8_t vs_fix_fetch[SI_MAX_ATTRIBS]; + uint64_t ff_tcs_inputs_to_copy; /* for fixed-func TCS */ } mono; /* Optimization flags for asynchronous compilation only. */ |