Skip to content

W
wine-winehq
Commit f3b11720 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

wined3d: Pass a wined3d_device_context to wined3d_cs_push_constants().

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 51dc6dc6
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
dlls/wined3d/device.c
View file @ f3b11720
......@@ -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)
......
dlls/wined3d/wined3d_private.h
View file @ f3b11720
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment