Align MESA to alpha-2-resfix

Remove wrong resolution special handling for OPENGL
aerisarn · May 13, 2024 · 847ff94 · 847ff94
1 parent 7a44fb9
commit 847ff94
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 15 deletions.
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/README.md b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/README.md
@@ -1,4 +1,4 @@
 # MESA PreBuilt Libraries
 
 The Binaries in this folder are compiled from a custom version of [MESA](https://github.com/aerisarn/mesa-uwp). 
-These are based on this [tag](https://github.com/aerisarn/mesa-uwp/releases/tag/alpha-2-hack).
+These are based on this [tag](https://github.com/aerisarn/mesa-uwp/releases/tag/alpha-2-resfix).
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libEGL.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libEGL.dll
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libGLESv2.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libGLESv2.dll
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libgallium_wgl.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libgallium_wgl.dll
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libglapi.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libglapi.dll
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/opengl32.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/opengl32.dll
diff --git a/uwp/uwp_main.cpp b/uwp/uwp_main.cpp
@@ -953,16 +953,9 @@ extern "C" {
                {
                if (is_running_on_xbox())
                {
-#ifdef HAVE_OPENGL
-                //For whatever reason, this is not correct when initializing a Mesa GL context. Using the default method instead
-               Windows::UI::Core::CoreWindow^ coreWindow = Windows::UI::Core::CoreWindow::GetForCurrentThread();
-               DisplayInformation^ currentDisplayInformation = DisplayInformation::GetForCurrentView();
-               ret = ConvertDipsToPixels(coreWindow->Bounds.Bottom - coreWindow->Bounds.Top, currentDisplayInformation->LogicalDpi);
-#else
                const Windows::Graphics::Display::Core::HdmiDisplayInformation^ hdi = Windows::Graphics::Display::Core::HdmiDisplayInformation::GetForCurrentView();
                if (hdi)
                ret = Windows::Graphics::Display::Core::HdmiDisplayInformation::GetForCurrentView()->GetCurrentDisplayMode()->ResolutionHeightInRawPixels;
-#endif
                }
 
                if (ret == -1)
@@ -998,16 +991,9 @@ extern "C" {
                {
                if (is_running_on_xbox())
                {
-#ifdef HAVE_OPENGL
-               //For whatever reason, this is not correct when initializing a Mesa GL context. Using the default method instead
-               Windows::UI::Core::CoreWindow^ coreWindow = Windows::UI::Core::CoreWindow::GetForCurrentThread();
-               DisplayInformation^ currentDisplayInformation = DisplayInformation::GetForCurrentView();
-               returnValue = ConvertDipsToPixels(coreWindow->Bounds.Right - coreWindow->Bounds.Left, currentDisplayInformation->LogicalDpi);
-#else
                const Windows::Graphics::Display::Core::HdmiDisplayInformation^ hdi = Windows::Graphics::Display::Core::HdmiDisplayInformation::GetForCurrentView();
                if (hdi)
                returnValue = Windows::Graphics::Display::Core::HdmiDisplayInformation::GetForCurrentView()->GetCurrentDisplayMode()->ResolutionWidthInRawPixels;
-#endif
                }
 
                if(returnValue == -1)