Module: Mesa Branch: master Commit: a8374c3d22d6ca110c6418373ee1e2e54ff918a1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8374c3d22d6ca110c6418373ee1e2e54ff918a1
Author: Marek Olšák <[email protected]> Date: Tue Dec 13 18:37:08 2016 +0100 gallium/radeon: clean up HAVE_LLVM #ifdefs in r600_get_llvm_processor_name Reviewed-by: Nicolai Hähnle <[email protected]> --- src/gallium/drivers/radeon/r600_pipe_common.c | 28 +++++++++++---------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index f6e49f2..5e3fcb9 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -892,23 +892,17 @@ const char *r600_get_llvm_processor_name(enum radeon_family family) case CHIP_TONGA: return "tonga"; case CHIP_ICELAND: return "iceland"; case CHIP_CARRIZO: return "carrizo"; -#if HAVE_LLVM <= 0x0307 - case CHIP_FIJI: return "tonga"; - case CHIP_STONEY: return "carrizo"; -#else - case CHIP_FIJI: return "fiji"; - case CHIP_STONEY: return "stoney"; -#endif -#if HAVE_LLVM <= 0x0308 - case CHIP_POLARIS10: return "tonga"; - case CHIP_POLARIS11: return "tonga"; - case CHIP_POLARIS12: return "tonga"; -#else - case CHIP_POLARIS10: return "polaris10"; - case CHIP_POLARIS11: return "polaris11"; - case CHIP_POLARIS12: return "polaris11"; -#endif - default: return ""; + case CHIP_FIJI: + return HAVE_LLVM >= 0x0308 ? "fiji" : "carrizo"; + case CHIP_STONEY: + return HAVE_LLVM >= 0x0308 ? "stoney" : "carrizo"; + case CHIP_POLARIS10: + return HAVE_LLVM >= 0x0309 ? "polaris10" : "carrizo"; + case CHIP_POLARIS11: + case CHIP_POLARIS12: /* same as polaris11 */ + return HAVE_LLVM >= 0x0309 ? "polaris11" : "carrizo"; + default: + return ""; } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
