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.

wined3d: Don't override texture parameters for COND_NP2 on multisample textures.
07228191 · Matteo Bruni · Alexandre Julliard · 5f0d6afc · 07228191
Commit 07228191 authored Jul 14, 2023 by Matteo Bruni Committed by Alexandre Julliard Apr 26, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

texture.c dlls/wined3d/texture.c +2 -1

No files found.
--- 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