Rebase against cf5e073d14925d3cdd489a869e3c2c5317b1ff38.

This commit is contained in:
Alistair Leslie-Hughes 2023-09-16 09:31:44 +10:00
parent 920fd825cf
commit 594626def2
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -1 +1 @@
f71315c8494575698634062cfad4f5d84fd230a1
cf5e073d14925d3cdd489a869e3c2c5317b1ff38