[PATCH 1/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_feature_level().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/wined3d/cs.c              | 7 ++++---
 dlls/wined3d/device.c          | 2 +-
 dlls/wined3d/wined3d_private.h | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 5d9d19a85af..36bf39cf789 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -2055,15 +2055,16 @@ static void wined3d_cs_exec_set_feature_level(struct wined3d_cs *cs, const void
     cs->state.feature_level = op->level;
 }

-void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level)
+void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context *context,
+        enum wined3d_feature_level level)
 {
     struct wined3d_cs_set_feature_level *op;

-    op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
+    op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
     op->opcode = WINED3D_CS_OP_SET_FEATURE_LEVEL;
     op->level = level;

-    wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT);
+    wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
 }

static const struct
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 38ab2aed900..ff1d03de0f8 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1748,7 +1748,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3
     TRACE("device %p, state %p.\n", device, state);

device->cs->c.state = state;
-    wined3d_cs_emit_set_feature_level(device->cs, state->feature_level);
+    wined3d_device_context_emit_set_feature_level(context, state->feature_level);

for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i)
     {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 6565b2044df..3babb23f75a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4750,7 +4750,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx,
         const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture,
         WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN;
-void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN;
@@ -4805,6 +4804,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c
         struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context,
         struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context *context,
+        enum wined3d_feature_level level) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer,
         enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context,

[PATCH 2/5] wined3d: Pass a wined3d_device_context to wined3d_cs_push_constants().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/wined3d/device.c          | 24 ++++++++++++------------
 dlls/wined3d/wined3d_private.h |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index ff1d03de0f8..fc07c78bb43 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1799,18 +1799,18 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3
         }
     }

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F,
+    wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_F,
             0, WINED3D_MAX_VS_CONSTS_F, state->vs_consts_f);
-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I,
+    wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_I,
             0, WINED3D_MAX_CONSTS_I, state->vs_consts_i);
-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B,
+    wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_B,
             0, WINED3D_MAX_CONSTS_B, state->vs_consts_b);

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F,
+    wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_F,
             0, WINED3D_MAX_PS_CONSTS_F, state->ps_consts_f);
-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I,
+    wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_I,
             0, WINED3D_MAX_CONSTS_I, state->ps_consts_i);
-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B,
+    wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_B,
             0, WINED3D_MAX_CONSTS_B, state->ps_consts_b);

for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i)
@@ -2573,7 +2573,7 @@ static void wined3d_device_set_vs_consts_b(struct wined3d_device *device,
             TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]);
     }

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants);
+    wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants);
 }

static void wined3d_device_set_vs_consts_i(struct wined3d_device *device,
@@ -2591,7 +2591,7 @@ static void wined3d_device_set_vs_consts_i(struct wined3d_device *device,
             TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i]));
     }

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants);
+    wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants);
 }

static void wined3d_device_set_vs_consts_f(struct wined3d_device *device,
@@ -2609,7 +2609,7 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device,
             TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i]));
     }

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants);
+    wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants);
 }

void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader)
@@ -2671,7 +2671,7 @@ static void wined3d_device_set_ps_consts_b(struct wined3d_device *device,
             TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]);
     }

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants);
+    wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants);
 }

static void wined3d_device_set_ps_consts_i(struct wined3d_device *device,
@@ -2689,7 +2689,7 @@ static void wined3d_device_set_ps_consts_i(struct wined3d_device *device,
             TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i]));
     }

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants);
+    wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants);
 }

static void wined3d_device_set_ps_consts_f(struct wined3d_device *device,
@@ -2707,7 +2707,7 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device,
             TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i]));
     }

-    wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants);
+    wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants);
 }

void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3babb23f75a..d68262b8d31 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4773,10 +4773,10 @@ static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queu
     cs->c.ops->finish(&cs->c, queue_id);
 }

-static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p,
-        unsigned int start_idx, unsigned int count, const void *constants)
+static inline void wined3d_device_context_push_constants(struct wined3d_device_context *context,
+        enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)
 {
-    cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants);
+    context->ops->push_constants(context, p, start_idx, count, constants);
 }

void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context *context,

[PATCH 2/5] wined3d: Pass a wined3d_device_context to wined3d_cs_push_constants().

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 3/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/wined3d/cs.c              | 7 ++++---
 dlls/wined3d/device.c          | 4 ++--
 dlls/wined3d/wined3d_private.h | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 36bf39cf789..4dc4d7ae08f 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -1551,16 +1551,17 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data)
         device_invalidate_state(cs->c.device, STATE_COLOR_KEY);
 }

-void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture)
+void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage,
+        struct wined3d_texture *texture)
 {
     struct wined3d_cs_set_texture *op;

-    op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
+    op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
     op->opcode = WINED3D_CS_OP_SET_TEXTURE;
     op->stage = stage;
     op->texture = texture;

-    wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT);
+    wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
 }

static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, const void *data)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index fc07c78bb43..e5e55150093 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1815,7 +1815,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3

for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i)
     {
-        wined3d_cs_emit_set_texture(device->cs, i, state->textures[i]);
+        wined3d_device_context_emit_set_texture(context, i, state->textures[i]);
         for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j)
         {
             wined3d_cs_emit_set_sampler_state(device->cs, i, j, state->sampler_states[i][j]);
@@ -3960,7 +3960,7 @@ static void wined3d_device_set_texture(struct wined3d_device *device,

if (texture)
         wined3d_texture_incref(texture);
-    wined3d_cs_emit_set_texture(device->cs, stage, texture);
+    wined3d_device_context_emit_set_texture(&device->cs->c, stage, texture);
     if (prev)
         wined3d_texture_decref(prev);

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index d68262b8d31..79f9bd9899a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4759,7 +4759,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx,
         enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx,
         UINT frequency, UINT flags) DECLSPEC_HIDDEN;
-void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage,
         enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state,
@@ -4827,6 +4826,8 @@ void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context
         struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx,
         struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage,
+        struct wined3d_texture *texture) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context,
         enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view,
         unsigned int initial_count) DECLSPEC_HIDDEN;

[PATCH 3/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture().

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 3/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture().

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=90316

Your paranoid android.

=== debiant2 (build log) ===

error: patch failed: dlls/wined3d/cs.c:1551
error: patch failed: dlls/wined3d/device.c:1815
error: patch failed: dlls/wined3d/wined3d_private.h:4759
Task: Patch failed to apply

=== debiant2 (build log) ===

error: patch failed: dlls/wined3d/cs.c:1551
error: patch failed: dlls/wined3d/device.c:1815
error: patch failed: dlls/wined3d/wined3d_private.h:4759
Task: Patch failed to apply

[PATCH 4/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture_state().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/wined3d/cs.c              | 8 ++++----
 dlls/wined3d/device.c          | 4 ++--
 dlls/wined3d/wined3d_private.h | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 4dc4d7ae08f..a39ed1dbaf4 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -1787,18 +1787,18 @@ static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void
     device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->stage, op->state));
 }

-void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage,
-        enum wined3d_texture_stage_state state, DWORD value)
+void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage,
+        enum wined3d_texture_stage_state state, unsigned int value)
 {
     struct wined3d_cs_set_texture_state *op;

-    op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
+    op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
     op->opcode = WINED3D_CS_OP_SET_TEXTURE_STATE;
     op->stage = stage;
     op->state = state;
     op->value = value;

-    wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT);
+    wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
 }

static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e5e55150093..128dd330f89 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1826,7 +1826,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3
     {
         for (j = 0; j < WINED3D_HIGHEST_TEXTURE_STATE + 1; ++j)
         {
-            wined3d_cs_emit_set_texture_state(device->cs, i, j, state->texture_states[i][j]);
+            wined3d_device_context_emit_set_texture_state(context, i, j, state->texture_states[i][j]);
         }
     }

@@ -3928,7 +3928,7 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device

device->cs->c.state->texture_states[stage][state] = value;

-    wined3d_cs_emit_set_texture_state(device->cs, stage, state, value);
+    wined3d_device_context_emit_set_texture_state(&device->cs->c, stage, state, value);
 }

static void wined3d_device_set_texture(struct wined3d_device *device,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 79f9bd9899a..4740bb8799d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4759,8 +4759,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx,
         enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx,
         UINT frequency, UINT flags) DECLSPEC_HIDDEN;
-void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage,
-        enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state,
         const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@@ -4828,6 +4826,8 @@ void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context
         struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage,
         struct wined3d_texture *texture) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage,
+        enum wined3d_texture_stage_state state, unsigned int value) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context,
         enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view,
         unsigned int initial_count) DECLSPEC_HIDDEN;

[PATCH 4/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture_state().

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 4/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture_state().

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=90317

Your paranoid android.

=== debiant2 (build log) ===

error: patch failed: dlls/wined3d/cs.c:1551
error: patch failed: dlls/wined3d/device.c:1815
error: patch failed: dlls/wined3d/wined3d_private.h:4759
error: patch failed: dlls/wined3d/cs.c:1787
error: patch failed: dlls/wined3d/device.c:1826
error: patch failed: dlls/wined3d/wined3d_private.h:4759
Task: Patch failed to apply

=== debiant2 (build log) ===

error: patch failed: dlls/wined3d/cs.c:1551
error: patch failed: dlls/wined3d/device.c:1815
error: patch failed: dlls/wined3d/wined3d_private.h:4759
error: patch failed: dlls/wined3d/cs.c:1787
error: patch failed: dlls/wined3d/device.c:1826
error: patch failed: dlls/wined3d/wined3d_private.h:4759
Task: Patch failed to apply

[PATCH 5/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_sampler_state().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/wined3d/cs.c              | 8 ++++----
 dlls/wined3d/device.c          | 4 ++--
 dlls/wined3d/texture.c         | 2 +-
 dlls/wined3d/wined3d_private.h | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index a39ed1dbaf4..e94d1a19dc2 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -1809,18 +1809,18 @@ static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void
     device_invalidate_state(cs->c.device, STATE_SAMPLER(op->sampler_idx));
 }

-void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx,
-        enum wined3d_sampler_state state, DWORD value)
+void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context *context, unsigned int sampler_idx,
+        enum wined3d_sampler_state state, unsigned int value)
 {
     struct wined3d_cs_set_sampler_state *op;

-    op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
+    op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
     op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE;
     op->sampler_idx = sampler_idx;
     op->state = state;
     op->value = value;

-    wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT);
+    wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
 }

static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 128dd330f89..e62da01171c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1707,7 +1707,7 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device,
     }

device->cs->c.state->sampler_states[sampler_idx][state] = value;
-    wined3d_cs_emit_set_sampler_state(device->cs, sampler_idx, state, value);
+    wined3d_device_context_emit_set_sampler_state(&device->cs->c, sampler_idx, state, value);
 }

void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count,
@@ -1818,7 +1818,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3
         wined3d_device_context_emit_set_texture(context, i, state->textures[i]);
         for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j)
         {
-            wined3d_cs_emit_set_sampler_state(device->cs, i, j, state->sampler_states[i][j]);
+            wined3d_device_context_emit_set_sampler_state(context, i, j, state->sampler_states[i][j]);
         }
     }

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index fe2ca802695..9ee15762cfe 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1759,7 +1759,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod)
         wined3d_texture_gl(texture)->texture_rgb.base_level = ~0u;
         wined3d_texture_gl(texture)->texture_srgb.base_level = ~0u;
         if (resource->bind_count)
-            wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL,
+            wined3d_device_context_emit_set_sampler_state(&device->cs->c, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL,
                     device->cs->c.state->sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]);
     }

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4740bb8799d..c752be692fc 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4755,8 +4755,6 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B
 void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs,
         enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN;
-void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx,
-        enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx,
         UINT frequency, UINT flags) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state,
@@ -4813,6 +4811,8 @@ void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_con
         struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_sampler(struct wined3d_device_context *context, enum wined3d_shader_type type,
         unsigned int sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context *context, unsigned int sampler_idx,
+        enum wined3d_sampler_state state, unsigned int value) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context,
         unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type,

[PATCH 5/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_sampler_state().

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH 5/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_sampler_state().

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=90318

Your paranoid android.

=== debiant2 (build log) ===

error: patch failed: dlls/wined3d/cs.c:1551
error: patch failed: dlls/wined3d/device.c:1815
error: patch failed: dlls/wined3d/wined3d_private.h:4759
error: patch failed: dlls/wined3d/cs.c:1787
error: patch failed: dlls/wined3d/device.c:1826
error: patch failed: dlls/wined3d/wined3d_private.h:4759
error: patch failed: dlls/wined3d/cs.c:1809
error: patch failed: dlls/wined3d/device.c:1707
error: patch failed: dlls/wined3d/texture.c:1759
error: patch failed: dlls/wined3d/wined3d_private.h:4755
Task: Patch failed to apply

=== debiant2 (build log) ===

error: patch failed: dlls/wined3d/cs.c:1551
error: patch failed: dlls/wined3d/device.c:1815
error: patch failed: dlls/wined3d/wined3d_private.h:4759
error: patch failed: dlls/wined3d/cs.c:1787
error: patch failed: dlls/wined3d/device.c:1826
error: patch failed: dlls/wined3d/wined3d_private.h:4759
error: patch failed: dlls/wined3d/cs.c:1809
error: patch failed: dlls/wined3d/device.c:1707
error: patch failed: dlls/wined3d/texture.c:1759
error: patch failed: dlls/wined3d/wined3d_private.h:4755
Task: Patch failed to apply

[Henri Verbeet]

Signed-off-by: Henri Verbeet