Matteo Bruni : wined3d: Don't override texture parameters for COND_NP2 on multisample textures.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 07228191d0550e9d18a2148c2bc5363a58f352d7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/07228191d0550e9d18a2148c2bc5363...

Author: Matteo Bruni 
Date:   Fri Jul 14 23:10:09 2023 +0200

wined3d: Don't override texture parameters for COND_NP2 on multisample textures.

Those parameters are not supported on multisample textures in the
first place (basically, GL mandates ARB_sampler_objects for those).

The combination COND_NP2 + ARB_texture_multisample is not expected to
happen without wined3d configuration overrides.

---

dlls/wined3d/texture.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index a531998ddd2..2fc6d5c06df 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1377,7 +1377,8 @@ GLuint wined3d_texture_gl_prepare_gl_texture(struct wined3d_texture_gl *texture_
         gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
     }

-    if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2)
+    if (texture_gl->t.flags & WINED3D_TEXTURE_COND_NP2 && target != GL_TEXTURE_2D_MULTISAMPLE
+            && target != GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
     {
         /* Conditional non power of two textures use a different clamping
          * default. If we're using the GL_WINE_normalized_texrect partial