Henri Verbeet : wined3d: Allow multisample destination textures in the GLSL blitter.

Alexandre Julliard julliard at winehq.org
Tue Jan 15 16:04:39 CST 2019


Module: wine
Branch: master
Commit: 347743fad5312249c5d8769f7eef12c4d9c379ac
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=347743fad5312249c5d8769f7eef12c4d9c379ac

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Jan 15 16:35:11 2019 +0330

wined3d: Allow multisample destination textures in the GLSL blitter.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46459
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/glsl_shader.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index d6fd565..3298a60 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -13127,11 +13127,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi
         return FALSE;
 
     if (src_texture->target == GL_TEXTURE_2D_MULTISAMPLE
-            || dst_texture->target == GL_TEXTURE_2D_MULTISAMPLE
-            || src_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY
-            || dst_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
+            || src_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
     {
-        TRACE("Multi-sample textures not supported.\n");
+        TRACE("Multi-sample source textures not supported.\n");
         return FALSE;
     }
 




More information about the wine-cvs mailing list