libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 02:10:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #12023, accidental disabling of the GL backend on non-Windows ARM platform caused by #12013.

Browse Source
This commit is contained in:
Henrik Rydgård 2019-05-08 23:41:46 +02:00
parent c3fab33354
commit 22d9ab4dbe
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GPU/GPU.cpp
View File

@ -27,7 +27,7 @@
#if PPSSPP_PLATFORM(UWP)
#include "GPU/D3D11/GPU_D3D11.h"
#else
#if !defined(_M_ARM64) && !defined(_M_ARM)
#if !PPSSPP_PLATFORM(WINDOWS) || (!defined(_M_ARM64) && !defined(_M_ARM))
#include "GPU/GLES/GPU_GLES.h"
#endif
#include "GPU/Vulkan/GPU_Vulkan.h"
@ -72,7 +72,8 @@ bool GPU_Init(GraphicsContext *ctx, Draw::DrawContext *draw) {
SetGPU(new NullGPU());
break;
case GPUCORE_GLES:
#if !defined(_M_ARM64) && !defined(_M_ARM)
// Disable GLES on ARM Windows (but leave it enabled on other ARM platforms).
#if !PPSSPP_PLATFORM(WINDOWS) || (!defined(_M_ARM64) && !defined(_M_ARM))
SetGPU(new GPU_GLES(ctx, draw));
break;
#else

2
ext/native/gfx_es2/gpu_features.cpp
View File

@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/stringutil.h"
#if !defined(_M_ARM64) && !defined(_M_ARM)
#if !PPSSPP_PLATFORM(WINDOWS) || (!defined(_M_ARM64) && !defined(_M_ARM))
#if !PPSSPP_PLATFORM(UWP)
#include "gfx/gl_common.h"