From c724df5f52f1393360f5886cdd6f9b437ef6d253 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 1 Jul 2017 16:10:00 -0700 Subject: [PATCH 1/2] D3D11: Fix texture scaling with blank first half. This would cause some textures to become blank. Fixes #9813. --- GPU/D3D11/TextureScalerD3D11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/D3D11/TextureScalerD3D11.cpp b/GPU/D3D11/TextureScalerD3D11.cpp index f8b3a406cd..32c06c45ee 100644 --- a/GPU/D3D11/TextureScalerD3D11.cpp +++ b/GPU/D3D11/TextureScalerD3D11.cpp @@ -25,7 +25,7 @@ #include "GPU/D3D11/GPU_D3D11.h" int TextureScalerD3D11::BytesPerPixel(u32 format) { - return format == GE_FORMAT_8888 ? 4 : 2; + return format == DXGI_FORMAT_B8G8R8A8_UNORM ? 4 : 2; } u32 TextureScalerD3D11::Get8888Format() { From c711b00d4c7527ce384368d2e086cdad5b6b783e Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 1 Jul 2017 16:13:50 -0700 Subject: [PATCH 2/2] GPU: Clean up some GLES3 defaults. It should default both of them the same way. And we already set subimage on desktop. --- GPU/GLES/GPU_GLES.cpp | 4 ++-- ext/native/gfx_es2/gpu_features.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 8247b41118..a22b4f0972 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -281,10 +281,10 @@ void GPU_GLES::CheckGPUFeatures() { if (gl_extensions.OES_texture_npot) features |= GPU_SUPPORTS_OES_TEXTURE_NPOT; - if (gl_extensions.EXT_unpack_subimage || !gl_extensions.IsGLES) + if (gl_extensions.EXT_unpack_subimage) features |= GPU_SUPPORTS_UNPACK_SUBIMAGE; - if (gl_extensions.EXT_blend_minmax || gl_extensions.GLES3) + if (gl_extensions.EXT_blend_minmax) features |= GPU_SUPPORTS_BLEND_MINMAX; if (gl_extensions.OES_copy_image || gl_extensions.NV_copy_image || gl_extensions.EXT_copy_image || gl_extensions.ARB_copy_image) diff --git a/ext/native/gfx_es2/gpu_features.cpp b/ext/native/gfx_es2/gpu_features.cpp index 1f90acbb24..92f8c75c68 100644 --- a/ext/native/gfx_es2/gpu_features.cpp +++ b/ext/native/gfx_es2/gpu_features.cpp @@ -363,6 +363,7 @@ void CheckGLExtensions() { // GLES 3 subsumes many ES2 extensions. if (gl_extensions.GLES3) { + gl_extensions.EXT_blend_minmax = true; gl_extensions.EXT_unpack_subimage = true; }