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

[Max Figura]

From: Max Figura

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

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 1b61801e68d..f743d6386d7 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_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}},
     {STATE_RENDER(WINED3D_RS_MINTESSELLATIONLEVEL),       {STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION)}},
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 634fa9576dc..ea2900eeae7 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4178,6 +4178,28 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
                                 state->rs[WINED3D_RS_PATCHEDGESTYLE]);
                     break;

+                case WINED3D_RS_PATCHSEGMENTS:
+                {
+                    union
+                    {
+                        DWORD d;
+                        float f;
+                    } tmpvalue;
+                    tmpvalue.f = 1.0f;
+
+                    if (state->rs[WINED3D_RS_PATCHSEGMENTS] != tmpvalue.d)
+                    {
+                        static bool displayed = false;
+
+                        tmpvalue.d = state->rs[WINED3D_RS_PATCHSEGMENTS];
+                        if(!displayed)
+                            FIXME("(WINED3D_RS_PATCHSEGMENTS,%f) not yet implemented.\n", tmpvalue.f);
+
+                        displayed = true;
+                    }
+                    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 6ad3e26ca55..bb34c0f03af 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_PATCHSEGMENTS),              {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_POSITIONDEGREE),             {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_NORMALDEGREE),               {STATE_VDECL}},
     {STATE_RENDER(WINED3D_RS_MINTESSELLATIONLEVEL),       {STATE_VDECL}},
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 8ec7bb45b77..78ad0ed1062 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1970,26 +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_patchsegments(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
-{
-    union {
-        DWORD d;
-        float f;
-    } tmpvalue;
-    tmpvalue.f = 1.0f;
-
-    if (state->render_states[WINED3D_RS_PATCHSEGMENTS] != tmpvalue.d)
-    {
-        static BOOL displayed = FALSE;
-
-        tmpvalue.d = state->render_states[WINED3D_RS_PATCHSEGMENTS];
-        if(!displayed)
-            FIXME("(WINED3D_RS_PATCHSEGMENTS,%f) not yet implemented\n", tmpvalue.f);
-
-        displayed = TRUE;
-    }
-}
-
 static void state_positiondegree(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
 {
     if (state->render_states[WINED3D_RS_POSITIONDEGREE] != WINED3D_DEGREE_CUBIC)
@@ -4628,7 +4608,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_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             },
     { STATE_RENDER(WINED3D_RS_MINTESSELLATIONLEVEL),      { STATE_RENDER(WINED3D_RS_ENABLEADAPTIVETESSELLATION),NULL                }, WINED3D_GL_EXT_NONE             },
@@ -5408,7 +5387,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table)
         {144, 144},
         {149, 150},
         {153, 153},
-        {162, 163},
+        {162, 164},
         {168, 169},
         {171, 171},
         {174, 177},