[PATCH 0/1] MR2720: wined3d: Add a comment about mismatched samplers.

[PATCH 1/1] wined3d: Add a comment about mismatched samplers.

[Paul Gofman]

From: Paul Gofman

---
 dlls/d3d9/tests/visual.c | 1 +
 dlls/wined3d/shader.c    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index b50b1a22772..cb0a2549b2e 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -26554,6 +26554,7 @@ static void test_mismatched_sample_types(void)
     {
         {"2d_2d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_2d, 0x00707070},
         {"3d_3d", (IDirect3DBaseTexture9 **)&volume, &ps_3d, 0x00303030},
+        /* Star Wars: The Old Republic uses mismatched samplers for rendering water. */
         {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, SAMPLE_ZERO},
         {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, SAMPLE_ZERO | RANDOM_W},
     };
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 9924a2d806e..7ee68a3436d 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -2897,6 +2897,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3

if ((texture = state->textures[i]))
             {
+                /* Star Wars: The Old Republic uses mismatched samplers for rendering water. */
                 if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
                         && resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_3D
                         && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP))

[PATCH 0/1] MR2720: wined3d: Add a comment about mismatched samplers. - approved

[Stefan Dösinger (＠stefan)]

This merge request was approved by Stefan Dösinger.

[PATCH 0/1] MR2720: wined3d: Add a comment about mismatched samplers. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.