From 77ad8de8a42f9df0f328825b59d3503eb9753d61 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 9 Apr 2022 11:53:50 +0530 Subject: [PATCH 1/3] tests: Fix typo in declspec keyword This fixes the following errors with mingw toolchain. OpenXR-SDK-Source/src/tests/hello_xr/main.cpp:17:10: error: expected constructor, destructor, or type conversion before '(' token 17 | _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; | ^ OpenXR-SDK-Source/src/tests/hello_xr/main.cpp:19:10: error: expected constructor, destructor, or type conversion before '(' token 19 | _declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 0x00000001; | ^ --- src/tests/hello_xr/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/hello_xr/main.cpp b/src/tests/hello_xr/main.cpp index 9db058a6f..8002e9fd1 100644 --- a/src/tests/hello_xr/main.cpp +++ b/src/tests/hello_xr/main.cpp @@ -14,9 +14,9 @@ // Favor the high performance NVIDIA or AMD GPUs extern "C" { // http://developer.download.nvidia.com/devzone/devcenter/gamegraphics/files/OptimusRenderingPolicies.pdf -_declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; +__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; // https://gpuopen.com/learn/amdpowerxpressrequesthighperformance/ -_declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 0x00000001; +__declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 0x00000001; } #endif // defined(_WIN32) From a114e90a58076d701322f07fd59215ca9b70757d Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 26 May 2022 14:04:00 -0500 Subject: [PATCH 2/3] Add changelog fragment. --- changes/sdk/pr.302.gh.OpenXR-SDK-Source.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/sdk/pr.302.gh.OpenXR-SDK-Source.md diff --git a/changes/sdk/pr.302.gh.OpenXR-SDK-Source.md b/changes/sdk/pr.302.gh.OpenXR-SDK-Source.md new file mode 100644 index 000000000..1e46f0444 --- /dev/null +++ b/changes/sdk/pr.302.gh.OpenXR-SDK-Source.md @@ -0,0 +1,4 @@ +--- +- issue.1691.gl +--- +hello_xr: Fix typo in declspec keyword From f476d13325692815efb70ebfd46ef7a93b7273e9 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 26 May 2022 14:04:12 -0500 Subject: [PATCH 3/3] Add changelog fragment missed earlier. --- changes/sdk/pr.307.gh.OpenXR-SDK-Source.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/sdk/pr.307.gh.OpenXR-SDK-Source.md diff --git a/changes/sdk/pr.307.gh.OpenXR-SDK-Source.md b/changes/sdk/pr.307.gh.OpenXR-SDK-Source.md new file mode 100644 index 000000000..6f2906ea2 --- /dev/null +++ b/changes/sdk/pr.307.gh.OpenXR-SDK-Source.md @@ -0,0 +1,4 @@ +--- +- issue.1712.gl +--- +Loader: Adjust Android loader build to use the static C++ runtime, since we do not expose any C++ interfaces.