From 0076908b4aa743b1607548ecdd66155ce8c043eb Mon Sep 17 00:00:00 2001
From: Max Figura <maxfigura5061@gmail.com>
Date: Tue, 13 Dec 2022 08:54:34 -0600
Subject: [PATCH] wined3d: Move the WINED3D_RS_PATCHEDGESTYLE stub to
 wined3d_device_apply_stateblock.

---
 dlls/wined3d/adapter_vk.c |  1 -
 dlls/wined3d/device.c     |  6 ++++++
 dlls/wined3d/directx.c    |  1 -
 dlls/wined3d/state.c      | 10 +---------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 2db44cc8000..1b61801e68d 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] =
     {STATE_INDEXBUFFER,                                   {STATE_INDEXBUFFER,                                   state_nop}},
     {STATE_RENDER(WINED3D_RS_LINEPATTERN),                {STATE_RENDER(WINED3D_RS_LINEPATTERN),                state_nop}},
     {STATE_RENDER(WINED3D_RS_DITHERENABLE),               {STATE_RENDER(WINED3D_RS_DITHERENABLE),               state_nop}},
-    {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE),             {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE),             state_nop}},
     {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS),              {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS),              state_nop}},
     {STATE_RENDER(WINED3D_RS_POSITIONDEGREE),             {STATE_RENDER(WINED3D_RS_POSITIONDEGREE),             state_nop}},
     {STATE_RENDER(WINED3D_RS_NORMALDEGREE),               {STATE_RENDER(WINED3D_RS_NORMALDEGREE),               state_nop}},
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 4b17afd87d1..634fa9576dc 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4172,6 +4172,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
                     break;
                 }
 
+                case WINED3D_RS_PATCHEDGESTYLE:
+                    if (state->rs[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE)
+                        FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n",
+                                state->rs[WINED3D_RS_PATCHEDGESTYLE]);
+                    break;
+
                 default:
                     wined3d_device_set_render_state(device, idx, state->rs[idx]);
                     break;
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 3426e222d33..6ad3e26ca55 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] =
     {STATE_RENDER(WINED3D_RS_LINEPATTERN),                {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_ZFUNC),                      {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_DITHERENABLE),               {STATE_VDECL}},
-    {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE),             {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS),              {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_POSITIONDEGREE),             {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_NORMALDEGREE),               {STATE_VDECL}},
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index a7f8aa91574..8ec7bb45b77 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1970,13 +1970,6 @@ static void state_sample_mask_w(struct wined3d_context *context, const struct wi
     WARN("Unsupported in local OpenGL implementation: glSampleMaski.\n");
 }
 
-static void state_patchedgestyle(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
-{
-    if (state->render_states[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE)
-        FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n",
-                state->render_states[WINED3D_RS_PATCHEDGESTYLE]);
-}
-
 static void state_patchsegments(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
 {
     union {
@@ -4635,7 +4628,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { STATE_RENDER(WINED3D_RS_LINEPATTERN),               { STATE_RENDER(WINED3D_RS_LINEPATTERN),               state_linepattern   }, WINED3D_GL_LEGACY_CONTEXT       },
     { STATE_RENDER(WINED3D_RS_LINEPATTERN),               { STATE_RENDER(WINED3D_RS_LINEPATTERN),               state_linepattern_w }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_DITHERENABLE),              { STATE_RENDER(WINED3D_RS_DITHERENABLE),              state_ditherenable  }, WINED3D_GL_EXT_NONE             },
-    { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE),            { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE),            state_patchedgestyle}, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS),             { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS),             state_patchsegments }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_POSITIONDEGREE),            { STATE_RENDER(WINED3D_RS_POSITIONDEGREE),            state_positiondegree}, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_NORMALDEGREE),              { STATE_RENDER(WINED3D_RS_NORMALDEGREE),              state_normaldegree  }, WINED3D_GL_EXT_NONE             },
@@ -5416,7 +5408,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         {144, 144},
         {149, 150},
         {153, 153},
-        {162, 162},
+        {162, 163},
         {168, 169},
         {171, 171},
         {174, 177},
-- 
2.11.4.GIT