Zebediah Figura : wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 17b9c453117ca8e4b180934262f0aed221a0c7da
URL:    https://gitlab.winehq.org/wine/wine/-/commit/17b9c453117ca8e4b180934262f0aed...

Author: Zebediah Figura 
Date:   Thu Jan  5 13:14:30 2023 -0600

wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods.

---

dlls/wined3d/arb_program_shader.c    | 2 +-
 dlls/wined3d/ati_fragment_shader.c   | 2 +-
 dlls/wined3d/ffp_gl.c                | 4 ++--
 dlls/wined3d/glsl_shader.c           | 5 ++---
 dlls/wined3d/nvidia_texture_shader.c | 4 ++--
 dlls/wined3d/shader_spirv.c          | 4 ++--
 dlls/wined3d/wined3d_private.h       | 4 ++--
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 8a31d67662d..9ca6dd8ff46 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5740,7 +5740,7 @@ struct arbfp_ffp_desc
 };

/* Context activation is done by the caller. */
-static void arbfp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state)
+static void arbfp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state)
 {
     const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info;

diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index 45e6c081ba0..925b712f372 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -1251,7 +1251,7 @@ static const struct wined3d_state_entry_template atifs_fragmentstate_template[]
 };

/* Context activation is done by the caller. */
-static void atifs_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state)
+static void atifs_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state)
 {
     const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info;

diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c
index 0b5f1fab653..dbc82a1ba4d 100644
--- a/dlls/wined3d/ffp_gl.c
+++ b/dlls/wined3d/ffp_gl.c
@@ -4840,7 +4840,7 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] =
 };

/* Context activation is done by the caller. */
-static void ffp_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {}
+static void ffp_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {}

static void ffp_pipe_disable(const struct wined3d_context *context) {}

@@ -4967,7 +4967,7 @@ const struct wined3d_fragment_pipe_ops ffp_fragment_pipeline =
     .states = ffp_fragmentstate_template,
 };

-static void none_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {}
+static void none_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {}

static void none_pipe_disable(const struct wined3d_context *context) {}

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 4cff60b1775..5a2133bf5a0 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -11563,7 +11563,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend =
     shader_glsl_shader_compile,
 };

-static void glsl_vertex_pipe_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {}
+static void glsl_vertex_pipe_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {}

static void glsl_vertex_pipe_vp_disable(const struct wined3d_context *context) {}

@@ -12060,8 +12060,7 @@ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe =
     .vp_states = glsl_vertex_pipe_vp_states,
 };

-static void glsl_fragment_pipe_apply_draw_state(
-        const struct wined3d_context *context, const struct wined3d_state *state)
+static void glsl_fragment_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state)
 {
     /* Nothing to do. */
 }
diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c
index c68dc42b690..0575e72ef43 100644
--- a/dlls/wined3d/nvidia_texture_shader.c
+++ b/dlls/wined3d/nvidia_texture_shader.c
@@ -660,7 +660,7 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d
 }

/* Context activation is done by the caller. */
-static void nvrc_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state)
+static void nvrc_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state)
 {
     const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info;

@@ -685,7 +685,7 @@ static void nvrc_disable(const struct wined3d_context *context)
 }

/* Context activation is done by the caller. */
-static void nvts_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state)
+static void nvts_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state)
 {
     const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info;

diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c
index 70affa1558e..5be17815d3a 100644
--- a/dlls/wined3d/shader_spirv.c
+++ b/dlls/wined3d/shader_spirv.c
@@ -1136,7 +1136,7 @@ const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(vo
     return &spirv_shader_backend_vk;
 }

-static void spirv_vertex_pipe_vk_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state)
+static void spirv_vertex_pipe_vk_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state)
 {
     /* Nothing to do. */
 }
@@ -1219,7 +1219,7 @@ const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void)
 }

static void spirv_fragment_pipe_vk_fp_apply_draw_state(
-        const struct wined3d_context *context, const struct wined3d_state *state)
+        struct wined3d_context *context, const struct wined3d_state *state)
 {
     /* Nothing to do. */
 }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 74c0ea52f3a..ae9e049a054 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2001,7 +2001,7 @@ struct wined3d_state_entry_template

struct wined3d_fragment_pipe_ops
 {
-    void (*fp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state);
+    void (*fp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state);
     void (*fp_disable)(const struct wined3d_context *context);
     void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps);
     unsigned int (*get_emul_mask)(const struct wined3d_adapter *adapter);
@@ -2029,7 +2029,7 @@ struct wined3d_vertex_caps

struct wined3d_vertex_pipe_ops
 {
-    void (*vp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state);
+    void (*vp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state);
     void (*vp_disable)(const struct wined3d_context *context);
     void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps);
     unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter);