Merge pull request #9823 from unknownbrackets/texscaling

D3D11: Fix texture scaling with blank first half
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2017-07-02 11:15:21 +02:00
commit ca12ffb656
3 files changed
+4 -3

No files matched your search

+1 -1
View File
@@ -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() {
+2 -2
View File
@@ -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)
+1
View File
@@ -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;
}