From 62680782015b133e51dfbe8ac56a8c40de6f6af6 Mon Sep 17 00:00:00 2001 From: Lander Gallastegi Date: Tue, 15 Oct 2024 22:31:13 +0200 Subject: [PATCH] Move number_utils to common --- CMakeLists.txt | 4 ++-- src/{video_core/renderer_vulkan => common}/number_utils.cpp | 6 +++--- src/{video_core/renderer_vulkan => common}/number_utils.h | 4 ++-- src/video_core/renderer_vulkan/liverpool_to_vk.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/{video_core/renderer_vulkan => common}/number_utils.cpp (96%) rename src/{video_core/renderer_vulkan => common}/number_utils.h (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 297c412ae..ff7717c76 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,6 +432,8 @@ set(COMMON src/common/logging/backend.cpp src/common/version.h src/common/ntapi.h src/common/ntapi.cpp + src/common/number_utils.h + src/common/number_utils.cpp src/common/memory_patcher.h src/common/memory_patcher.cpp src/common/scm_rev.cpp @@ -616,8 +618,6 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp src/video_core/buffer_cache/word_manager.h src/video_core/renderer_vulkan/liverpool_to_vk.cpp src/video_core/renderer_vulkan/liverpool_to_vk.h - src/video_core/renderer_vulkan/number_utils.cpp - src/video_core/renderer_vulkan/number_utils.h src/video_core/renderer_vulkan/renderer_vulkan.cpp src/video_core/renderer_vulkan/renderer_vulkan.h src/video_core/renderer_vulkan/vk_common.cpp diff --git a/src/video_core/renderer_vulkan/number_utils.cpp b/src/common/number_utils.cpp similarity index 96% rename from src/video_core/renderer_vulkan/number_utils.cpp rename to src/common/number_utils.cpp index 18b595331..af29e5cd3 100644 --- a/src/video_core/renderer_vulkan/number_utils.cpp +++ b/src/common/number_utils.cpp @@ -4,9 +4,9 @@ #include #include +#include "common/number_utils.h" #include "video_core/amdgpu/pixel_format.h" #include "video_core/amdgpu/types.h" -#include "video_core/renderer_vulkan/number_utils.h" #define UF11_EXPONENT_SHIFT 6 #define UF10_EXPONENT_SHIFT 5 @@ -16,7 +16,7 @@ #define F32_INFINITY 0x7f800000 -namespace Vulkan::NumberUtils { +namespace NumberUtils { float Uf11ToF32(u16 val) { union { @@ -158,4 +158,4 @@ float S16ToSnorm(s16 val) { return float(val * c); } -} // namespace Vulkan::NumberUtils \ No newline at end of file +} // namespace NumberUtils \ No newline at end of file diff --git a/src/video_core/renderer_vulkan/number_utils.h b/src/common/number_utils.h similarity index 89% rename from src/video_core/renderer_vulkan/number_utils.h rename to src/common/number_utils.h index 3f9e9d041..05c62a1cb 100644 --- a/src/video_core/renderer_vulkan/number_utils.h +++ b/src/common/number_utils.h @@ -5,7 +5,7 @@ #include "common/types.h" -namespace Vulkan::NumberUtils { +namespace NumberUtils { float Uf11ToF32(u16 val); float Uf10ToF32(u16 val); @@ -25,4 +25,4 @@ float S10ToSnorm(s16 val); float U16ToUnorm(u16 val); float S16ToSnorm(s16 val); -} // namespace Vulkan::NumberUtils +} // namespace NumberUtils diff --git a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp index 477df6e73..3e43c50e5 100644 --- a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp +++ b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" +#include "common/number_utils.h" #include "video_core/amdgpu/pixel_format.h" #include "video_core/renderer_vulkan/liverpool_to_vk.h" -#include "video_core/renderer_vulkan/number_utils.h" #include