Max Figura : wined3d: Move the WINED3D_RS_WRAP2 stub to wined3d_device_apply_stateblock.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 044371508d4a8f36d4ac8082f32d3adc8f92c00f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/044371508d4a8f36d4ac8082f32d3ad...

Author: Max Figura <maxfigura5061(a)gmail.com>
Date:   Mon Dec 12 17:40:18 2022 -0600

wined3d: Move the WINED3D_RS_WRAP2 stub to wined3d_device_apply_stateblock.

---

 dlls/wined3d/adapter_vk.c | 1 -
 dlls/wined3d/device.c     | 1 +
 dlls/wined3d/directx.c    | 1 -
 dlls/wined3d/state.c      | 3 +--
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 1e225978db6..bce4e85dd31 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -100,7 +100,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
     {STATE_RENDER(WINED3D_RS_DITHERENABLE),               {STATE_RENDER(WINED3D_RS_DITHERENABLE),               state_nop}},
     {STATE_RENDER(WINED3D_RS_WRAP0),                      {STATE_RENDER(WINED3D_RS_WRAP0),                      state_nop}},
     {STATE_RENDER(WINED3D_RS_WRAP1),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
-    {STATE_RENDER(WINED3D_RS_WRAP2),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_EXTENTS),                    {STATE_RENDER(WINED3D_RS_EXTENTS),                    state_nop}},
     {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE),        {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE),        state_nop}},
     {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING),   {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING),   state_nop}},
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 515d31f62c7..1b42d93c8c7 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
                         FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n");
                     break;
 
+                case WINED3D_RS_WRAP2:
                 case WINED3D_RS_WRAP3:
                 case WINED3D_RS_WRAP4:
                 case WINED3D_RS_WRAP5:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index a7a854c2730..b8f495f47db 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2813,7 +2813,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
     {STATE_RENDER(WINED3D_RS_DITHERENABLE),               {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP0),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP1),                      {STATE_VDECL}},
-    {STATE_RENDER(WINED3D_RS_WRAP2),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_EXTENTS),                    {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE),        {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING),   {STATE_VDECL}},
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 77eaf29d1d3..bebb35c70ce 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4683,7 +4683,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { STATE_RENDER(WINED3D_RS_DITHERENABLE),              { STATE_RENDER(WINED3D_RS_DITHERENABLE),              state_ditherenable  }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP0),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     state_wrap          }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP1),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
-    { STATE_RENDER(WINED3D_RS_WRAP2),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_EXTENTS),                   { STATE_RENDER(WINED3D_RS_EXTENTS),                   state_extents       }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE),       { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE),       state_ckeyblend     }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING),  { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING),  state_swvp          }, WINED3D_GL_EXT_NONE             },
@@ -5464,7 +5463,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         { 42,  47},
         { 49,  59},
         { 61, 127},
-        {131, 135},
+        {130, 135},
         {149, 150},
         {162, 162},
         {168, 169},