diff options
author | Dave Airlie <[email protected]> | 2015-09-08 08:36:32 +1000 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2015-09-11 19:19:30 +0100 |
commit | 11dc43424d691220e68eecf1d3f4b5387cca5d47 (patch) | |
tree | 24878184f741351c33482cd6e4bfedb8394f2403 /Android.mk | |
parent | ec9bafda7012c269927bb3ec12f4dafafc3ae635 (diff) |
r600: don't use shader key without verifying shader type (v2)
Since 7a32652231f96eac14c4bfce02afe77b4132fb77
r600: Turn 'r600_shader_key' struct into union
we were accessing key fields that might be aliased in the union
with other fields, so we should check what shader type we are
compiling for before using key values from it.
v1.1: make it compile
v2: have caffeine, make it work - we don't set type
until later, so don't reference it until we've set it.
Reviewed-by: Edward O'Callaghan <[email protected]>
Cc: "11.0" <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
(cherry picked from commit 6d2ceb10cd63b89892131a27d238620f00922dfb)
Signed-off-by: Emil Velikov <[email protected]>
Conflicts:
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions