forked from gonetz/GLideN64
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathangle-static-patch.diff
72 lines (64 loc) · 2.27 KB
/
angle-static-patch.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
diff --git a/BUILD.gn b/BUILD.gn
index 6e965691e..21c9d17ad 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1453,6 +1453,20 @@ angle_static_library("libGLESv2_static") {
public_deps = [ ":libANGLE" ]
}
+angle_static_library("libANGLE_static") {
+ sources = libglesv2_sources
+ sources += libegl_sources
+ defines = [
+ "ANGLE_STATIC=1",
+ "ANGLE_EXPORT=",
+ "EGLAPI=",
+ "GL_APICALL=",
+ "GL_API="
+ ]
+ complete_static_lib = true
+ public_deps = [ ":libANGLE", "//build/config:shared_library_deps" ]
+}
+
angle_shared_library("libGLESv1_CM") {
sources = libglesv1_cm_sources
output_name = "libGLESv1_CM${angle_libs_suffix}"
diff --git a/include/platform/PlatformMethods.h b/include/platform/PlatformMethods.h
index 48ef33579..74d220066 100644
--- a/include/platform/PlatformMethods.h
+++ b/include/platform/PlatformMethods.h
@@ -15,6 +15,8 @@
#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x6AFB
+#define ANGLE_PLATFORM_EXPORT
+
#if !defined(ANGLE_PLATFORM_EXPORT)
# if defined(_WIN32)
# if !defined(LIBANGLE_IMPLEMENTATION)
@@ -265,7 +267,7 @@ inline void DefaultPlaceholderCallback(...) {}
#define ANGLE_PLATFORM_METHOD_DEF(Name, CapsName) CapsName##Func Name = Default##CapsName;
-struct ANGLE_PLATFORM_EXPORT PlatformMethods
+struct PlatformMethods
{
inline PlatformMethods();
diff --git a/src/libANGLE/renderer/vulkan/vk_utils.cpp b/src/libANGLE/renderer/vulkan/vk_utils.cpp
index b3c82efca..8b1cf835d 100644
--- a/src/libANGLE/renderer/vulkan/vk_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_utils.cpp
@@ -1219,6 +1219,7 @@ void InitExtendedDynamicState2EXTFunctions(VkDevice device)
void InitFragmentShadingRateKHRInstanceFunction(VkInstance instance)
{
GET_INSTANCE_FUNC(vkGetPhysicalDeviceExternalSemaphorePropertiesKHR);
+ GET_INSTANCE_FUNC(vkGetPhysicalDeviceFragmentShadingRatesKHR);
}
void InitFragmentShadingRateKHRDeviceFunction(VkDevice device)
diff --git a/src/libEGL/libEGL_autogen.cpp b/src/libEGL/libEGL_autogen.cpp
index be4ce7716..3952c4bad 100644
--- a/src/libEGL/libEGL_autogen.cpp
+++ b/src/libEGL/libEGL_autogen.cpp
@@ -51,7 +51,7 @@ void EnsureEGLLoaded()
}
}
#else
-void EnsureEGLLoaded() {}
+static inline void EnsureEGLLoaded() {}
#endif // defined(ANGLE_USE_EGL_LOADER)
} // anonymous namespace