amd: resolve remaining definition conflicts with gfx9d.h
authorMarek Olšák <marek.olsak@amd.com>
Tue, 30 Aug 2016 21:42:29 +0000 (23:42 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Thu, 30 Mar 2017 12:44:33 +0000 (14:44 +0200)
commite6c520362d56dc51efc6700dc18828bd150bc5b5
tree7eb430491c4ab8fe61f1480377f992428943e0bd
parent7e7043c31ca555638e5854a93d3323db0e25758c
amd: resolve remaining definition conflicts with gfx9d.h

Add _GFX6 and _GFX9 suffixes to conflicting definitions.

sid.h and gfx9d.h can now be included in the same file.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/amd/common/gfx9d.h
src/amd/common/sid.h
src/amd/vulkan/radv_image.c
src/gallium/drivers/radeonsi/si_descriptors.c
src/gallium/drivers/radeonsi/si_state.c