Skip to content

Commit 19c3e65

Browse files
committed
vcpkg: add overlay ports for angle, openssl, and pthread-stubs
These ports are required by the Linux build: - angle: GLES/EGL implementation (used by ImGui and the render system) - openssl: required by lcurl for HTTPS support - pthread-stubs: satisfies EGL's pthread dependency on Linux
1 parent acd3efa commit 19c3e65

23 files changed

Lines changed: 1301 additions & 1 deletion

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"kind": "filesystem",
99
"path": "vcpkg-ports",
1010
"baseline": "2025-10-07",
11-
"packages": ["glfw3", "gli", "luajit"]
11+
"packages": ["angle", "glfw3", "gli", "luajit", "openssl", "pthread-stubs"]
1212
}
1313
]
1414
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
2+
index 7d3f078d6..fac057dd6 100644
3+
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
4+
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
5+
@@ -213,16 +213,20 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
6+
7+
static float GetLogicalDpi()
8+
{
9+
- ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> displayProperties;
10+
+ ComPtr<ABI::Windows::Graphics::Display::IDisplayInformationStatics> displayInformationStatics;
11+
+ ComPtr<ABI::Windows::Graphics::Display::IDisplayInformation> displayInformation;
12+
13+
if (SUCCEEDED(GetActivationFactory(
14+
- HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
15+
- displayProperties.GetAddressOf())))
16+
+ HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
17+
+ displayInformationStatics.GetAddressOf())))
18+
{
19+
float dpi = 96.0f;
20+
- if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi)))
21+
+ if (SUCCEEDED(displayInformationStatics->GetForCurrentView(&displayInformation)))
22+
{
23+
- return dpi;
24+
+ if (SUCCEEDED(displayInformation->get_LogicalDpi(&dpi)))
25+
+ {
26+
+ return dpi;
27+
+ }
28+
}
29+
}
30+
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
diff --git a/src/gpu_info_util/SystemInfo_win.cpp b/src/gpu_info_util/SystemInfo_win.cpp
2+
index f4bb137f2..86495013b 100644
3+
--- a/src/gpu_info_util/SystemInfo_win.cpp
4+
+++ b/src/gpu_info_util/SystemInfo_win.cpp
5+
@@ -6,11 +6,6 @@
6+
7+
// SystemInfo_win.cpp: implementation of the Windows-specific parts of SystemInfo.h
8+
9+
-#include "gpu_info_util/SystemInfo_internal.h"
10+
-
11+
-#include "common/debug.h"
12+
-#include "common/string_utils.h"
13+
-
14+
// Windows.h needs to be included first
15+
#include <windows.h>
16+
17+
@@ -19,6 +14,11 @@
18+
#include <array>
19+
#include <sstream>
20+
21+
+#include "gpu_info_util/SystemInfo_internal.h"
22+
+
23+
+#include "common/debug.h"
24+
+#include "common/string_utils.h"
25+
+
26+
namespace angle
27+
{
28+
29+
diff --git a/include/GLSLANG/ShaderVars.h b/include/GLSLANG/ShaderVars.h
30+
index 94cb93e..5593f66 100644
31+
--- a/include/GLSLANG/ShaderVars.h
32+
+++ b/include/GLSLANG/ShaderVars.h
33+
@@ -14,6 +14,7 @@
34+
#include <array>
35+
#include <string>
36+
#include <vector>
37+
+#include <stdint.h>
38+
39+
namespace sh
40+
{
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/src/common/mathutil.h b/src/common/mathutil.h
2+
index 1d73bbf..c5b9cc8 100644
3+
--- a/src/common/mathutil.h
4+
+++ b/src/common/mathutil.h
5+
@@ -1073,7 +1073,7 @@ inline int BitCount(uint64_t bits)
6+
# endif // defined(_M_IX86) || defined(_M_X64)
7+
#endif // defined(_MSC_VER) && !defined(__clang__)
8+
9+
-#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__)
10+
+#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__)
11+
inline int BitCount(uint32_t bits)
12+
{
13+
return __builtin_popcount(bits);
14+
@@ -1083,7 +1083,7 @@ inline int BitCount(uint64_t bits)
15+
{
16+
return __builtin_popcountll(bits);
17+
}
18+
-#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__)
19+
+#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__)
20+
21+
inline int BitCount(uint8_t bits)
22+
{
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/src/image_util/AstcDecompressor.h
2+
+++ b/src/image_util/AstcDecompressor.h
3+
@@ -13,6 +13,7 @@
4+
5+
#include <memory>
6+
#include <string>
7+
+#include <cstdint>
8+
9+
namespace angle
10+
{
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#cmakedefine ANGLE_COMMIT_HASH "@ANGLE_COMMIT_HASH@"
2+
#cmakedefine ANGLE_COMMIT_HASH_SIZE @ANGLE_COMMIT_HASH_SIZE@
3+
#cmakedefine ANGLE_COMMIT_DATE "@ANGLE_COMMIT_DATE@"
4+
#cmakedefine ANGLE_REVISION @ANGLE_REVISION@

0 commit comments

Comments
 (0)