From 560f095dd57b67191ccbd8a5c524d4c6d0fe28e4 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Tue, 2 Jun 2020 00:45:14 +0200 Subject: [PATCH] radv: Include gfx10_format_table.h only from a single source file. The radeonsi variant has everything in the header, so lets not include it everywhere. Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_image.c | 11 +++++++++++ src/amd/vulkan/radv_private.h | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 76099252290..d52924d300f 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -34,6 +34,17 @@ #include "util/debug.h" #include "util/u_atomic.h" +struct gfx10_format { + unsigned img_format:9; + + /* Various formats are only supported with workarounds for vertex fetch, + * and some 32_32_32 formats are supported natively, but only for buffers + * (possibly with some image support, actually, but no filtering). */ + bool buffers_only:1; +}; + +#include "gfx10_format_table.h" + static unsigned radv_choose_tiling(struct radv_device *device, const VkImageCreateInfo *pCreateInfo, diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 1ac8c324604..5b29cb3e9c9 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -95,18 +95,6 @@ typedef uint32_t xcb_window_t; #define RADV_SUPPORT_ANDROID_HARDWARE_BUFFER 0 #endif - -struct gfx10_format { - unsigned img_format:9; - - /* Various formats are only supported with workarounds for vertex fetch, - * and some 32_32_32 formats are supported natively, but only for buffers - * (possibly with some image support, actually, but no filtering). */ - bool buffers_only:1; -}; - -#include "gfx10_format_table.h" - enum radv_secure_compile_type { RADV_SC_TYPE_INIT_SUCCESS, RADV_SC_TYPE_INIT_FAILURE, -- 2.30.2