[PATCH 1/6] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_viewports().
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 886a76284ff..d7a413057c9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1147,18 +1147,18 @@ static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *dat device_invalidate_state(cs->c.device, STATE_VIEWPORT); } -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, +void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) { struct wined3d_cs_set_viewports *op; - op = wined3d_device_context_require_space(&cs->c, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), - WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, + FIELD_OFFSET(struct wined3d_cs_set_viewports,viewports[viewport_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); op->viewport_count = viewport_count; - 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_scissor_rects(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ca179c753ab..62a3e990cf1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1698,7 +1698,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned memset(state->viewports, 0, sizeof(state->viewports)); state->viewport_count = viewport_count; - wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports); } void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, @@ -1983,7 +1983,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_material(device->cs, &state->material); - wined3d_cs_emit_set_viewports(device->cs, state->viewport_count, state->viewports); + wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -5191,7 +5191,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewports[0].min_z = 0.0f; state->viewports[0].max_z = 1.0f; state->viewport_count = 1; - wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, 1, state->viewports); SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8947f444cd..524b6ae7ce3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4793,7 +4793,6 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, const struct wined3d_viewport *viewports) 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, @@ -4827,6 +4826,8 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) 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; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { -- 2.20.1
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 32 ++++++++++++++++++++++++-------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 62a3e990cf1..6e9afb8468d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1681,7 +1681,6 @@ void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, I void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, const struct wined3d_viewport *viewports) { - struct wined3d_state *state = device->cs->c.state; unsigned int i; TRACE("device %p, viewport_count %u, viewports %p.\n", device, viewport_count, viewports); @@ -1692,13 +1691,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); } - if (viewport_count) - memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); - else - memset(state->viewports, 0, sizeof(state->viewports)); - state->viewport_count = viewport_count; - - wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports); + wined3d_device_context_set_viewports(&device->cs->c, viewport_count, viewports); } void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, @@ -2157,6 +2150,29 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con wined3d_rasterizer_state_decref(prev); } +void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports) +{ + struct wined3d_state *state = context->state; + unsigned int i; + + TRACE("context %p, viewport_count %u, viewports %p.\n", context, viewport_count, viewports); + + for (i = 0; i < viewport_count; ++i) + { + TRACE("%u: x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", i, viewports[i].x, viewports[i].y, + viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); + } + + if (viewport_count) + memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); + else + memset(state->viewports, 0, sizeof(state->viewports)); + state->viewport_count = viewport_count; + + wined3d_device_context_emit_set_viewports(context, viewport_count, viewports); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3fe3e0cfd89..8fc190b73ba 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) +@ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3c091263742..f3de0098ef3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2558,6 +2558,8 @@ void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_c struct wined3d_rasterizer_state *rasterizer_state); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader); +void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports); HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode); -- 2.20.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 16a1027beb9..190e60be4b4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1162,7 +1162,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext1 *iface, UINT viewport_count, const D3D11_VIEWPORT *viewports) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; unsigned int i; @@ -1182,7 +1182,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic } wined3d_mutex_lock(); - wined3d_device_set_viewports(device->wined3d_device, viewport_count, wined3d_vp); + wined3d_device_context_set_viewports(context->wined3d_context, viewport_count, wined3d_vp); wined3d_mutex_unlock(); } -- 2.20.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d7a413057c9..d8635bba8d7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1173,17 +1173,18 @@ static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_SCISSORRECT); } -void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) +void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context, + unsigned int rect_count, const RECT *rects) { struct wined3d_cs_set_scissor_rects *op; - op = wined3d_device_context_require_space(&cs->c, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + op = wined3d_device_context_require_space(context, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; memcpy(op->rects, rects, rect_count * sizeof(*rects)); op->rect_count = rect_count; - 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_rendertarget_view(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e9afb8468d..0ba5215c076 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1858,7 +1858,7 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); state->scissor_rect_count = rect_count; - wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); + wined3d_device_context_emit_set_scissor_rects(&device->cs->c, rect_count, rects); } void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) @@ -1977,7 +1977,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_material(device->cs, &state->material); wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); - wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); + wined3d_device_context_emit_set_scissor_rects(context, state->scissor_rect_count, state->scissor_rects); for (i = 0; i < LIGHTMAP_SIZE; ++i) { @@ -5211,7 +5211,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; - wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); + wined3d_device_context_emit_set_scissor_rects(&device->cs->c, 1, state->scissor_rects); } prev = state->fb.render_targets[view_idx]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 524b6ae7ce3..4ad0c05d34a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4776,7 +4776,6 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type UINT sampler_idx, struct wined3d_sampler *sampler) 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_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, @@ -4824,6 +4823,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_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state) 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, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, -- 2.20.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 45 ++++++++++++++++++++++++++------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ba5215c076..3feabbe79f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1835,7 +1835,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rects) { - struct wined3d_state *state = device->cs->c.state; unsigned int i; TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); @@ -1845,20 +1844,7 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); } - if (state->scissor_rect_count == rect_count - && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) - { - TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); - return; - } - - if (rect_count) - memcpy(state->scissor_rects, rects, rect_count * sizeof(*rects)); - else - memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); - state->scissor_rect_count = rect_count; - - wined3d_device_context_emit_set_scissor_rects(&device->cs->c, rect_count, rects); + wined3d_device_context_set_scissor_rects(&device->cs->c, rect_count, rects); } void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) @@ -2173,6 +2159,35 @@ void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *c wined3d_device_context_emit_set_viewports(context, viewport_count, viewports); } +void CDECL wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, + const RECT *rects) +{ + struct wined3d_state *state = context->state; + unsigned int i; + + TRACE("context %p, rect_count %u, rects %p.\n", context, rect_count, rects); + + for (i = 0; i < rect_count; ++i) + { + TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); + } + + if (state->scissor_rect_count == rect_count + && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) + { + TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); + return; + } + + if (rect_count) + memcpy(state->scissor_rects, rects, rect_count * sizeof(*rects)); + else + memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); + state->scissor_rect_count = rect_count; + + wined3d_device_context_emit_set_scissor_rects(context, rect_count, rects); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8fc190b73ba..60d85a46290 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,6 +170,7 @@ @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) +@ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f3de0098ef3..7b585b92cef 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2556,6 +2556,8 @@ void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_devic struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); +void __cdecl wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, + const RECT *rects); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, -- 2.20.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 190e60be4b4..005698b2b6c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1189,7 +1189,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext1 *iface, UINT rect_count, const D3D11_RECT *rects) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); @@ -1197,7 +1197,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); + wined3d_device_context_set_scissor_rects(context->wined3d_context, rect_count, rects); wined3d_mutex_unlock(); } -- 2.20.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
participants (2)
-
Henri Verbeet -
Zebediah Figura