ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_vertex_declaration(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-03-24 18:19:25 -05:00 committed by Alexandre Julliard
parent 78ab395594
commit a130d55cde
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/cs.c
View File

@ -1273,15 +1273,16 @@ static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const
device_invalidate_state(cs->c.device, STATE_VDECL);
}
void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration)
void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_context *context,
struct wined3d_vertex_declaration *declaration)
{
struct wined3d_cs_set_vertex_declaration *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_VERTEX_DECLARATION;
op->declaration = declaration;
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_stream_source(struct wined3d_cs *cs, const void *data)

4
dlls/wined3d/device.c
View File

@ -1762,7 +1762,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3
}
wined3d_device_context_emit_set_depth_stencil_view(context, state->fb.depth_stencil);
wined3d_cs_emit_set_vertex_declaration(device->cs, state->vertex_declaration);
wined3d_device_context_emit_set_vertex_declaration(context, state->vertex_declaration);
for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i)
{
@ -1899,7 +1899,7 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device,
if (declaration)
wined3d_vertex_declaration_incref(declaration);
state->vertex_declaration = declaration;
wined3d_cs_emit_set_vertex_declaration(device->cs, declaration);
wined3d_device_context_emit_set_vertex_declaration(&device->cs->c, declaration);
if (prev)
wined3d_vertex_declaration_decref(prev);
}

4
dlls/wined3d/wined3d_private.h
View File

@ -4770,8 +4770,6 @@ 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_set_vertex_declaration(struct wined3d_cs *cs,
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource,
unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch,
@ -4825,6 +4823,8 @@ void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context
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;
void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_context *context,
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,
const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN;