[PATCH 0/5] MR2341: wined3d: move stubs out of state tables

[Max Figura (＠maxfigura)]

Removing WINED3D_RS entries from state tables and moving stubs to wined3d_device_apply_stateblock.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2341

[PATCH 1/5] wined3d: Move the WINED3D_RS_WRAP7 stub to wined3d_device_apply_stateblock.

[Max Figura]

From: Max Figura <maxfigura5061(a)gmail.com>

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

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index caddae5c918..a8aae40b7f2 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -105,7 +105,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
     {STATE_RENDER(WINED3D_RS_WRAP4),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP5),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP6),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
-    {STATE_RENDER(WINED3D_RS_WRAP7),                      {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 a1e0d880004..27f9c1d14e6 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_WRAP7:
                 case WINED3D_RS_WRAP8:
                 case WINED3D_RS_WRAP9:
                 case WINED3D_RS_WRAP10:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index f8f9316d914..337753e7e70 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2818,7 +2818,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
     {STATE_RENDER(WINED3D_RS_WRAP4),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP5),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP6),                      {STATE_VDECL}},
-    {STATE_RENDER(WINED3D_RS_WRAP7),                      {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 c0606ae30e8..7dfdcb7c456 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4688,7 +4688,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { STATE_RENDER(WINED3D_RS_WRAP4),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP5),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP6),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
-    { STATE_RENDER(WINED3D_RS_WRAP7),                     { 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             },
@@ -5469,6 +5468,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         { 42,  47},
         { 49,  59},
         { 61, 127},
+        {135, 135},
         {149, 150},
         {162, 162},
         {168, 169},
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2341

[PATCH 2/5] wined3d: Move the WINED3D_RS_WRAP6 stub to wined3d_device_apply_stateblock.

[Max Figura]

From: Max Figura <maxfigura5061(a)gmail.com>

---
 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 a8aae40b7f2..a0ef4213b11 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -104,7 +104,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
     {STATE_RENDER(WINED3D_RS_WRAP3),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP4),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP5),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
-    {STATE_RENDER(WINED3D_RS_WRAP6),                      {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 27f9c1d14e6..065367c605c 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_WRAP6:
                 case WINED3D_RS_WRAP7:
                 case WINED3D_RS_WRAP8:
                 case WINED3D_RS_WRAP9:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 337753e7e70..f8a38eb13d9 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2817,7 +2817,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
     {STATE_RENDER(WINED3D_RS_WRAP3),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP4),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP5),                      {STATE_VDECL}},
-    {STATE_RENDER(WINED3D_RS_WRAP6),                      {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 7dfdcb7c456..ded450992f6 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4687,7 +4687,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { STATE_RENDER(WINED3D_RS_WRAP3),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP4),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP5),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
-    { STATE_RENDER(WINED3D_RS_WRAP6),                     { 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             },
@@ -5468,7 +5467,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         { 42,  47},
         { 49,  59},
         { 61, 127},
-        {135, 135},
+        {134, 135},
         {149, 150},
         {162, 162},
         {168, 169},
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2341

[PATCH 3/5] wined3d: Move the WINED3D_RS_WRAP5 stub to wined3d_device_apply_stateblock.

[Max Figura]

From: Max Figura <maxfigura5061(a)gmail.com>

---
 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 a0ef4213b11..4c5604fc54e 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -103,7 +103,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
     {STATE_RENDER(WINED3D_RS_WRAP2),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP3),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP4),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
-    {STATE_RENDER(WINED3D_RS_WRAP5),                      {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 065367c605c..be10d1f0b32 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_WRAP5:
                 case WINED3D_RS_WRAP6:
                 case WINED3D_RS_WRAP7:
                 case WINED3D_RS_WRAP8:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index f8a38eb13d9..cf03c1f8f77 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2816,7 +2816,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
     {STATE_RENDER(WINED3D_RS_WRAP2),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP3),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP4),                      {STATE_VDECL}},
-    {STATE_RENDER(WINED3D_RS_WRAP5),                      {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 ded450992f6..f4d767825db 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4686,7 +4686,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { STATE_RENDER(WINED3D_RS_WRAP2),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP3),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_WRAP4),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
-    { STATE_RENDER(WINED3D_RS_WRAP5),                     { 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             },
@@ -5467,7 +5466,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         { 42,  47},
         { 49,  59},
         { 61, 127},
-        {134, 135},
+        {133, 135},
         {149, 150},
         {162, 162},
         {168, 169},
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2341

[PATCH 4/5] wined3d: Move the WINED3D_RS_WRAP4 stub to wined3d_device_apply_stateblock.

[Max Figura]

From: Max Figura <maxfigura5061(a)gmail.com>

---
 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 4c5604fc54e..8a63c860637 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -102,7 +102,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
     {STATE_RENDER(WINED3D_RS_WRAP1),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP2),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
     {STATE_RENDER(WINED3D_RS_WRAP3),                      {STATE_RENDER(WINED3D_RS_WRAP0)}},
-    {STATE_RENDER(WINED3D_RS_WRAP4),                      {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 be10d1f0b32..f8076bd74f1 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_WRAP4:
                 case WINED3D_RS_WRAP5:
                 case WINED3D_RS_WRAP6:
                 case WINED3D_RS_WRAP7:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index cf03c1f8f77..9a4dba5b2b6 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2815,7 +2815,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
     {STATE_RENDER(WINED3D_RS_WRAP1),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP2),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_WRAP3),                      {STATE_VDECL}},
-    {STATE_RENDER(WINED3D_RS_WRAP4),                      {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 f4d767825db..f041f4e2495 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4685,7 +4685,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { 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_WRAP3),                     { STATE_RENDER(WINED3D_RS_WRAP0),                     NULL                }, WINED3D_GL_EXT_NONE             },
-    { STATE_RENDER(WINED3D_RS_WRAP4),                     { 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             },
@@ -5466,7 +5465,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         { 42,  47},
         { 49,  59},
         { 61, 127},
-        {133, 135},
+        {132, 135},
         {149, 150},
         {162, 162},
         {168, 169},
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2341

[PATCH 5/5] wined3d: Move the WINED3D_RS_WRAP3 stub to wined3d_device_apply_stateblock.

[Max Figura]

From: Max Figura <maxfigura5061(a)gmail.com>

---
 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 8a63c860637..1e225978db6 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -101,7 +101,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
     {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_WRAP3),                      {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 f8076bd74f1..515d31f62c7 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_WRAP3:
                 case WINED3D_RS_WRAP4:
                 case WINED3D_RS_WRAP5:
                 case WINED3D_RS_WRAP6:
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 9a4dba5b2b6..a7a854c2730 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2814,7 +2814,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
     {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_WRAP3),                      {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 f041f4e2495..77eaf29d1d3 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4684,7 +4684,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { 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_WRAP3),                     { 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             },
@@ -5465,7 +5464,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         { 42,  47},
         { 49,  59},
         { 61, 127},
-        {132, 135},
+        {131, 135},
         {149, 150},
         {162, 162},
         {168, 169},
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2341

[PATCH 0/5] MR2341: wined3d: move stubs out of state tables - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2341

[PATCH 0/5] MR2341: wined3d: move stubs out of state tables - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2341