From 594626def27a959b1a86da08d120b9fc9a155264 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 16 Sep 2023 09:31:44 +1000 Subject: [PATCH] Rebase against cf5e073d14925d3cdd489a869e3c2c5317b1ff38. --- .../0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch | 2 +- staging/upstream-commit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch b/patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch index fe845582..2ad22e8f 100644 --- a/patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch +++ b/patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch @@ -38,7 +38,7 @@ index 1ab50a27596..2024f2aba23 100644 + TRACE("Downloading (glReadPixels) texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); + -+ wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, &src_texture->resource, src_sub_resource_idx, NULL, ++ wined3d_context_gl_apply_fbo_state_explicit(context_gl, GL_READ_FRAMEBUFFER, &src_texture->resource, src_sub_resource_idx, NULL, + 0, sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)); + wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); diff --git a/staging/upstream-commit b/staging/upstream-commit index 634d6b6c..993dbcf3 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -f71315c8494575698634062cfad4f5d84fd230a1 +cf5e073d14925d3cdd489a869e3c2c5317b1ff38