mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-08-16 05:21:22 +00:00
Revert "A funny try"
This commit is contained in:
@@ -1,15 +0,0 @@
|
||||
diff --git a/include/util/util_small_vector.h b/include/util/util_small_vector.h
|
||||
--- a/include/util/util_small_vector.h
|
||||
+++ b/include/util/util_small_vector.h
|
||||
@@ -193,7 +193,10 @@
|
||||
|
||||
size_t pick_capacity(size_t n) {
|
||||
// Pick next largest power of two for the new capacity
|
||||
- return size_t(1u) << ((sizeof(n) * 8u) - bit::lzcnt(n - 1));
|
||||
+ if constexpr (sizeof(size_t) == sizeof(uint32_t))
|
||||
+ return size_t(1u) << ((sizeof(n) * 8u) - bit::lzcnt(uint32_t(n - 1)));
|
||||
+ else
|
||||
+ return size_t(1u) << ((sizeof(n) * 8u) - bit::lzcnt(uint64_t(n - 1)));
|
||||
}
|
||||
|
||||
T* ptr(size_t idx) {
|
||||
@@ -1,71 +0,0 @@
|
||||
--- a/include/dxbc/dxbc_util.h
|
||||
+++ b/include/dxbc/dxbc_util.h
|
||||
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
+#include <array>
|
||||
+
|
||||
#include "dxbc_common.h"
|
||||
#include "dxbc_enums.h"
|
||||
|
||||
--- a/include/util/util_bit.h
|
||||
+++ b/include/util/util_bit.h
|
||||
@@ -1,5 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
+#include <algorithm>
|
||||
+#include <limits>
|
||||
+
|
||||
#if (defined(__x86_64__) && !defined(__arm64ec__)) || (defined(_M_X64) && !defined(_M_ARM64EC)) \
|
||||
|| defined(__i386__) || defined(_M_IX86) || defined(__e2k__)
|
||||
#define DXVK_ARCH_X86
|
||||
--- a/include/util/util_string.h
|
||||
+++ b/include/util/util_string.h
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
+#include <string_view>
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
|
||||
--- a/src/dxbc/dxbc_defs.cpp
|
||||
+++ b/src/dxbc/dxbc_defs.cpp
|
||||
@@ -1,3 +1,5 @@
|
||||
+#include <array>
|
||||
+
|
||||
#include "dxbc_defs.h"
|
||||
|
||||
namespace dxvk {
|
||||
--- a/src/dxbc/dxbc_chunk_isgn.cpp
|
||||
+++ b/src/dxbc/dxbc_chunk_isgn.cpp
|
||||
@@ -1,3 +1,5 @@
|
||||
+#include <algorithm>
|
||||
+
|
||||
#include "dxbc_chunk_isgn.h"
|
||||
|
||||
namespace dxvk {
|
||||
--- a/src/dxbc/dxbc_compiler.cpp
|
||||
+++ b/src/dxbc/dxbc_compiler.cpp
|
||||
@@ -1,3 +1,5 @@
|
||||
+#include <algorithm>
|
||||
+
|
||||
#include "dxbc_compiler.h"
|
||||
|
||||
namespace dxvk {
|
||||
--- a/src/spirv/spirv_module.cpp
|
||||
+++ b/src/spirv/spirv_module.cpp
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <array>
|
||||
#include <cstring>
|
||||
|
||||
#include "spirv_module.h"
|
||||
--- a/src/spirv/spirv_code_buffer.cpp
|
||||
+++ b/src/spirv/spirv_code_buffer.cpp
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <array>
|
||||
#include <cstring>
|
||||
+#include <limits>
|
||||
|
||||
#include "spirv_code_buffer.h"
|
||||
|
||||
@@ -68,10 +68,6 @@
|
||||
"dxbc": {
|
||||
"bundled": true,
|
||||
"hash": "196d26c07747d7aa2ced6fb1a5ae6f665e9b917de223a540038690b037c70a1eeca51c21d42aa5bec9fff7df0a6656a75ee8b4e2cb4008469f18a6812280f831",
|
||||
"patches": [
|
||||
"0001-disambiguate-lzcnt-for-size_t.patch",
|
||||
"0002-add-missing-standard-includes.patch"
|
||||
],
|
||||
"repo": "PancakeTAS/dxbc",
|
||||
"version": "78ab59a8aaeb43cd1b0a5e91ba86722433a10b78"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user