[PATCH v2 1/5] wined3d: Remove now redundant error handling from wined3d_device_set_*_consts_*().
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 58 +++++-------------------------------------- 1 file changed, 6 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 21f9af9566..53d3b7c1d8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2001,7 +2001,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx); } -static HRESULT wined3d_device_set_vs_consts_b(struct wined3d_device *device, +static void wined3d_device_set_vs_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { unsigned int i; @@ -2009,12 +2009,6 @@ static HRESULT wined3d_device_set_vs_consts_b(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) - return WINED3DERR_INVALIDCALL; - - if (count > WINED3D_MAX_CONSTS_B - start_idx) - count = WINED3D_MAX_CONSTS_B - start_idx; - memcpy(&device->state.vs_consts_b[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { @@ -2023,11 +2017,9 @@ static HRESULT wined3d_device_set_vs_consts_b(struct wined3d_device *device, } wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); - - return WINED3D_OK; } -static HRESULT wined3d_device_set_vs_consts_i(struct wined3d_device *device, +static void wined3d_device_set_vs_consts_i(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { unsigned int i; @@ -2035,12 +2027,6 @@ static HRESULT wined3d_device_set_vs_consts_i(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) - return WINED3DERR_INVALIDCALL; - - if (count > WINED3D_MAX_CONSTS_I - start_idx) - count = WINED3D_MAX_CONSTS_I - start_idx; - memcpy(&device->state.vs_consts_i[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { @@ -2049,23 +2035,16 @@ static HRESULT wined3d_device_set_vs_consts_i(struct wined3d_device *device, } wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); - - return WINED3D_OK; } -static HRESULT wined3d_device_set_vs_consts_f(struct wined3d_device *device, +static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; unsigned int i; TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - if (!constants || start_idx >= d3d_info->limits.vs_uniform_count - || count > d3d_info->limits.vs_uniform_count - start_idx) - return WINED3DERR_INVALIDCALL; - memcpy(&device->state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { @@ -2074,8 +2053,6 @@ static HRESULT wined3d_device_set_vs_consts_f(struct wined3d_device *device, } wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); - - return WINED3D_OK; } void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) @@ -2132,7 +2109,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx); } -static HRESULT wined3d_device_set_ps_consts_b(struct wined3d_device *device, +static void wined3d_device_set_ps_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { unsigned int i; @@ -2140,12 +2117,6 @@ static HRESULT wined3d_device_set_ps_consts_b(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) - return WINED3DERR_INVALIDCALL; - - if (count > WINED3D_MAX_CONSTS_B - start_idx) - count = WINED3D_MAX_CONSTS_B - start_idx; - memcpy(&device->state.ps_consts_b[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { @@ -2154,11 +2125,9 @@ static HRESULT wined3d_device_set_ps_consts_b(struct wined3d_device *device, } wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants); - - return WINED3D_OK; } -static HRESULT wined3d_device_set_ps_consts_i(struct wined3d_device *device, +static void wined3d_device_set_ps_consts_i(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { unsigned int i; @@ -2166,12 +2135,6 @@ static HRESULT wined3d_device_set_ps_consts_i(struct wined3d_device *device, TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) - return WINED3DERR_INVALIDCALL; - - if (count > WINED3D_MAX_CONSTS_I - start_idx) - count = WINED3D_MAX_CONSTS_I - start_idx; - memcpy(&device->state.ps_consts_i[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { @@ -2180,23 +2143,16 @@ static HRESULT wined3d_device_set_ps_consts_i(struct wined3d_device *device, } wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants); - - return WINED3D_OK; } -static HRESULT wined3d_device_set_ps_consts_f(struct wined3d_device *device, +static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; unsigned int i; TRACE("device %p, start_idx %u, count %u, constants %p.\n", device, start_idx, count, constants); - if (!constants || start_idx >= d3d_info->limits.ps_uniform_count - || count > d3d_info->limits.ps_uniform_count - start_idx) - return WINED3DERR_INVALIDCALL; - memcpy(&device->state.ps_consts_f[start_idx], constants, count * sizeof(*constants)); if (TRACE_ON(d3d)) { @@ -2205,8 +2161,6 @@ static HRESULT wined3d_device_set_ps_consts_f(struct wined3d_device *device, } wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); - - return WINED3D_OK; } void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader) -- 2.25.1
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 53d3b7c1d8..cdb3202ac1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3415,12 +3415,6 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device TRACE("device %p, stage %u, state %s, value %#x.\n", device, stage, debug_d3dtexturestate(state), value); - if (state > WINED3D_HIGHEST_TEXTURE_STATE) - { - WARN("Invalid state %#x passed.\n", state); - return; - } - if (stage >= d3d_info->limits.ffp_blend_stages) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", -- 2.25.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 2 - dlls/d3d11/state.c | 1 + dlls/wined3d/device.c | 70 ++++++++++++++++++++++++++++++---- dlls/wined3d/state.c | 19 +++++---- dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d.h | 1 + 6 files changed, 77 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 212881a9b7..4c42fa284c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -941,7 +941,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); @@ -955,7 +954,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); scale_bias.f = desc->SlopeScaledDepthBias; const_bias.f = desc->DepthBias; diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 92b75f8e1f..d63a1bc699 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1076,6 +1076,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str return E_FAIL; } + wined3d_desc.fill_mode = desc->FillMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cdb3202ac1..69ff7dd0cd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -521,6 +521,13 @@ static void device_leftover_sampler(struct wine_rb_entry *entry, void *context) ERR("Leftover sampler %p.\n", sampler); } +static void device_free_rasterizer_state(struct wine_rb_entry *entry, void *context) +{ + struct wined3d_rasterizer_state *state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + + wined3d_rasterizer_state_decref(state); +} + void wined3d_device_cleanup(struct wined3d_device *device) { unsigned int i; @@ -529,6 +536,7 @@ void wined3d_device_cleanup(struct wined3d_device *device) wined3d_device_uninit_3d(device); wined3d_blend_state_decref(device->blend_state_atoc_enabled); + wine_rb_destroy(&device->rasterizer_states, device_free_rasterizer_state, NULL); wined3d_cs_destroy(device->cs); @@ -3477,11 +3485,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; const struct wined3d_saved_states *changed = &stateblock->changed; const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; + BOOL set_blend_state, set_rasterizer_state = FALSE; struct wined3d_blend_state *blend_state; unsigned int i, j, start, idx; struct wined3d_color colour; struct wined3d_range range; - BOOL set_blend_state; DWORD map, stage; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3578,17 +3586,53 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { j = wined3d_bit_scan(&map); idx = i * word_bit_count + j; - if (idx != WINED3D_RS_BLENDFACTOR) + + switch (idx) { - wined3d_device_set_render_state(device, idx, state->rs[idx]); - continue; + case WINED3D_RS_BLENDFACTOR: + if (!set_blend_state) + { + blend_state = wined3d_device_get_blend_state(device, &colour); + wined3d_color_from_d3dcolor(&colour, state->rs[idx]); + wined3d_device_set_blend_state(device, blend_state, &colour); + } + break; + + case WINED3D_RS_FILLMODE: + set_rasterizer_state = TRUE; + break; + + default: + wined3d_device_set_render_state(device, idx, state->rs[idx]); + break; } + } + } - if (!set_blend_state) + if (set_rasterizer_state) + { + struct wined3d_rasterizer_state *rasterizer_state; + struct wined3d_rasterizer_state_desc desc; + struct wine_rb_entry *entry; + + desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; + desc.front_ccw = FALSE; + desc.depth_bias_clamp = 0.0f; + desc.depth_clip = TRUE; + + if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) + { + rasterizer_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + wined3d_device_set_rasterizer_state(device, rasterizer_state); + } + else if (SUCCEEDED(wined3d_rasterizer_state_create(device, &desc, NULL, + &wined3d_null_parent_ops, &rasterizer_state))) + { + wined3d_device_set_rasterizer_state(device, rasterizer_state); + if (wine_rb_put(&device->rasterizer_states, &desc, &rasterizer_state->entry) == -1) { - blend_state = wined3d_device_get_blend_state(device, &colour); - wined3d_color_from_d3dcolor(&colour, state->rs[idx]); - wined3d_device_set_blend_state(device, blend_state, &colour); + ERR("Failed to insert rasterizer state.\n"); + wined3d_rasterizer_state_decref(rasterizer_state); } } } @@ -5392,6 +5436,13 @@ static int wined3d_sampler_compare(const void *key, const struct wine_rb_entry * return memcmp(&sampler->desc, key, sizeof(sampler->desc)); } +static int wined3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct wined3d_rasterizer_state *state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + + return memcmp(&state->desc, key, sizeof(state->desc)); +} + static BOOL wined3d_select_feature_level(const struct wined3d_adapter *adapter, const enum wined3d_feature_level *levels, unsigned int level_count, enum wined3d_feature_level *selected_level) @@ -5452,6 +5503,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined fragment_pipeline = adapter->fragment_pipe; wine_rb_init(&device->samplers, wined3d_sampler_compare); + wine_rb_init(&device->rasterizer_states, wined3d_rasterizer_state_compare); if (vertex_pipeline->vp_states && fragment_pipeline->states && FAILED(hr = compile_state_table(device->state_table, device->multistate_funcs, @@ -5460,6 +5512,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined { ERR("Failed to compile state table, hr %#x.\n", hr); wine_rb_destroy(&device->samplers, NULL, NULL); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wined3d_decref(device->wined3d); return hr; } @@ -5496,6 +5549,7 @@ err: heap_free(device->multistate_funcs[i]); } wine_rb_destroy(&device->samplers, NULL, NULL); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wined3d_decref(device->wined3d); return hr; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a4d88e1bfc..388116bc66 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -171,10 +171,9 @@ void state_nop(struct wined3d_context *context, const struct wined3d_state *stat TRACE("%s: nop in current pipe config.\n", debug_d3dstate(state_id)); } -static void state_fillmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void fillmode(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - enum wined3d_fill_mode mode = state->render_states[WINED3D_RS_FILLMODE]; + enum wined3d_fill_mode mode = r ? r->desc.fill_mode : WINED3D_FILL_SOLID; switch (mode) { @@ -4324,9 +4323,10 @@ static void depth_clip(const struct wined3d_rasterizer_state *r, const struct wi static void rasterizer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_rasterizer_state *r = state->rasterizer_state; GLenum mode; - mode = state->rasterizer_state && state->rasterizer_state->desc.front_ccw ? GL_CCW : GL_CW; + mode = r && r->desc.front_ccw ? GL_CCW : GL_CW; if (context->render_offscreen) mode = (mode == GL_CW) ? GL_CCW : GL_CW; @@ -4334,21 +4334,24 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta checkGLcall("glFrontFace"); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); - depth_clip(state->rasterizer_state, gl_info); + fillmode(r, gl_info); + depth_clip(r, gl_info); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_rasterizer_state *r = state->rasterizer_state; GLenum mode; - mode = state->rasterizer_state && state->rasterizer_state->desc.front_ccw ? GL_CCW : GL_CW; + mode = r && r->desc.front_ccw ? GL_CCW : GL_CW; gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); - depth_clip(state->rasterizer_state, gl_info); + fillmode(r, gl_info); + depth_clip(r, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4588,7 +4591,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_ZENABLE), { STATE_RENDER(WINED3D_RS_ZENABLE), state_zenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_FILLMODE), { STATE_RENDER(WINED3D_RS_FILLMODE), state_fillmode }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_MONOENABLE), { STATE_RENDER(WINED3D_RS_MONOENABLE), state_monoenable }, WINED3D_GL_EXT_NONE }, @@ -5426,6 +5428,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { { 1, 1}, { 3, 3}, + { 8, 8}, { 17, 18}, { 21, 21}, { 42, 45}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23540295bb..db4660cf58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3155,6 +3155,7 @@ struct wined3d_rasterizer_state const struct wined3d_parent_ops *parent_ops; struct wined3d_device *device; + struct wine_rb_entry entry; }; struct wined3d_stream_output @@ -3293,7 +3294,7 @@ struct wined3d_device struct list resources; /* a linked list to track resources created by the device */ struct list shaders; /* a linked list to track shaders (pixel and vertex) */ - struct wine_rb_tree samplers; + struct wine_rb_tree samplers, rasterizer_states; /* Render Target Support */ struct wined3d_fb_state fb; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cb8f19981a..2370ca469f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2033,6 +2033,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { + enum wined3d_fill_mode fill_mode; BOOL front_ccw; float depth_bias_clamp; BOOL depth_clip; -- 2.25.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
On Fri, 6 Mar 2020 at 05:04, Zebediah Figura <z.figura12(a)gmail.com> wrote:
+ if (set_rasterizer_state) + { + struct wined3d_rasterizer_state *rasterizer_state; + struct wined3d_rasterizer_state_desc desc; + struct wine_rb_entry *entry; + + desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; + desc.front_ccw = FALSE; + desc.depth_bias_clamp = 0.0f; + desc.depth_clip = TRUE; + + if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) + { + rasterizer_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + wined3d_device_set_rasterizer_state(device, rasterizer_state); + } ... +static int wined3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct wined3d_rasterizer_state *state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + + return memcmp(&state->desc, key, sizeof(state->desc)); +}
This works, but note that it's a little fragile; you're depending on there not being any holes or padding in the wined3d_rasterizer_state_desc structure.
On 3/6/20 10:33 AM, Henri Verbeet wrote:
On Fri, 6 Mar 2020 at 05:04, Zebediah Figura <z.figura12(a)gmail.com> wrote:
+ if (set_rasterizer_state) + { + struct wined3d_rasterizer_state *rasterizer_state; + struct wined3d_rasterizer_state_desc desc; + struct wine_rb_entry *entry; + + desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; + desc.front_ccw = FALSE; + desc.depth_bias_clamp = 0.0f; + desc.depth_clip = TRUE; + + if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) + { + rasterizer_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + wined3d_device_set_rasterizer_state(device, rasterizer_state); + } ... +static int wined3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct wined3d_rasterizer_state *state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); + + return memcmp(&state->desc, key, sizeof(state->desc)); +}
This works, but note that it's a little fragile; you're depending on there not being any holes or padding in the wined3d_rasterizer_state_desc structure.
Sure; I saw similar places using memcmp(), and figured since there shouldn't be holes (at least on x86...) it'd be safe. Is it worth changing? [And if so, is it worth changing e.g. glsl_blitter_args_compare()?]
On Fri, 6 Mar 2020 at 20:10, Zebediah Figura <z.figura12(a)gmail.com> wrote:
Sure; I saw similar places using memcmp(), and figured since there shouldn't be holes (at least on x86...) it'd be safe. Is it worth changing?
[And if so, is it worth changing e.g. glsl_blitter_args_compare()?]
What we typically do for cases like that is to memset() the key with zeroes before initialising any fields. As in e.g. glsl_blitter_get_program(), to stick with the glsl_blitter_args_compare() example.
On 3/6/20 10:46 AM, Henri Verbeet wrote:
On Fri, 6 Mar 2020 at 20:10, Zebediah Figura <z.figura12(a)gmail.com> wrote:
Sure; I saw similar places using memcmp(), and figured since there shouldn't be holes (at least on x86...) it'd be safe. Is it worth changing?
[And if so, is it worth changing e.g. glsl_blitter_args_compare()?]
What we typically do for cases like that is to memset() the key with zeroes before initialising any fields. As in e.g. glsl_blitter_get_program(), to stick with the glsl_blitter_args_compare() example.
Duly noted; I'll send a patch to do that in wined3d_device_apply_stateblock(). Thanks!
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 2 -- dlls/d3d11/state.c | 1 + dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 14 +++++++------- include/wine/wined3d.h | 1 + 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4c42fa284c..63d7f1dc2b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -941,7 +941,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); @@ -954,7 +953,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); scale_bias.f = desc->SlopeScaledDepthBias; const_bias.f = desc->DepthBias; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d63a1bc699..47d42fd6c5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1077,6 +1077,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.fill_mode = desc->FillMode; + wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index af2b00f88e..28e0d262a5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3150,7 +3150,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, gl_info->gl_ops.gl.p_glDisable(GL_BLEND); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CULLMODE)); + context_invalidate_state(context, STATE_RASTERIZER); gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_STENCILENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 69ff7dd0cd..34482d8ea2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3599,6 +3599,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; case WINED3D_RS_FILLMODE: + case WINED3D_RS_CULLMODE: set_rasterizer_state = TRUE; break; @@ -3616,6 +3617,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wine_rb_entry *entry; desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; + desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; desc.front_ccw = FALSE; desc.depth_bias_clamp = 0.0f; desc.depth_clip = TRUE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 388116bc66..5cf425f0a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -255,13 +255,13 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ context_apply_state(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } -static void state_cullmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void cullmode(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + enum wined3d_cull mode = r ? r->desc.cull_mode : WINED3D_CULL_BACK; /* glFrontFace() is set in context.c at context init and on an * offscreen / onscreen rendering switch. */ - switch (state->render_states[WINED3D_RS_CULLMODE]) + switch (mode) { case WINED3D_CULL_NONE: gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); @@ -280,8 +280,7 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d checkGLcall("glCullFace(GL_BACK)"); break; default: - FIXME("Unrecognized cull mode %#x.\n", - state->render_states[WINED3D_RS_CULLMODE]); + FIXME("Unrecognized cull mode %#x.\n", mode); } } @@ -4335,6 +4334,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); fillmode(r, gl_info); + cullmode(r, gl_info); depth_clip(r, gl_info); } @@ -4351,6 +4351,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); fillmode(r, gl_info); + cullmode(r, gl_info); depth_clip(r, gl_info); } @@ -4598,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_PLANEMASK), { STATE_RENDER(WINED3D_RS_PLANEMASK), state_planemask }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), { STATE_RENDER(WINED3D_RS_ZWRITEENABLE), state_zwriteenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_LASTPIXEL), { STATE_RENDER(WINED3D_RS_LASTPIXEL), state_lastpixel }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_CULLMODE), { STATE_RENDER(WINED3D_RS_CULLMODE), state_cullmode }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZFUNC), { STATE_RENDER(WINED3D_RS_ZFUNC), state_zfunc }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SUBPIXEL), { STATE_RENDER(WINED3D_RS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, @@ -5430,7 +5430,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 3, 3}, { 8, 8}, { 17, 18}, - { 21, 21}, + { 21, 22}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2370ca469f..bfdd1b9ca3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2034,6 +2034,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { enum wined3d_fill_mode fill_mode; + enum wined3d_cull cull_mode; BOOL front_ccw; float depth_bias_clamp; BOOL depth_clip; -- 2.25.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 5 +---- dlls/d3d11/state.c | 3 ++- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/state.c | 14 +++++++------- include/wine/wined3d.h | 1 + 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 63d7f1dc2b..0e46816246 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -933,7 +933,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon { DWORD d; float f; - } scale_bias, const_bias; + } const_bias; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -941,7 +941,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); @@ -953,9 +952,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - scale_bias.f = desc->SlopeScaledDepthBias; const_bias.f = desc->DepthBias; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 47d42fd6c5..4d56f7dc75 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1079,8 +1079,9 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.fill_mode = desc->FillMode; wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; - wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; + wined3d_desc.scale_bias = desc->SlopeScaledDepthBias; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34482d8ea2..03c32ec6f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3600,6 +3600,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_FILLMODE: case WINED3D_RS_CULLMODE: + case WINED3D_RS_SLOPESCALEDEPTHBIAS: set_rasterizer_state = TRUE; break; @@ -3615,11 +3616,18 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_rasterizer_state *rasterizer_state; struct wined3d_rasterizer_state_desc desc; struct wine_rb_entry *entry; + union + { + DWORD d; + float f; + } bias; desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; desc.front_ccw = FALSE; desc.depth_bias_clamp = 0.0f; + bias.d = state->rs[WINED3D_RS_SLOPESCALEDEPTHBIAS]; + desc.scale_bias = bias.f; desc.depth_clip = TRUE; if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5cf425f0a5..85bd1e24a3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1755,9 +1755,10 @@ static void state_scissor(struct wined3d_context *context, const struct wined3d_ static void state_depthbias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_rasterizer_state *r = state->rasterizer_state; + float scale_bias = r ? r->desc.scale_bias : 0.0f; - if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS] - || state->render_states[WINED3D_RS_DEPTHBIAS]) + if (scale_bias || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; float factor, units, scale, clamp; @@ -1766,10 +1767,9 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 { DWORD d; float f; - } scale_bias, const_bias; + } const_bias; - clamp = state->rasterizer_state ? state->rasterizer_state->desc.depth_bias_clamp : 0.0f; - scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; + clamp = r ? r->desc.depth_bias_clamp : 0.0f; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) @@ -1792,7 +1792,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 scale = 0.0f; } - factor = scale_bias.f; + factor = scale_bias; units = const_bias.f * scale; } @@ -4663,7 +4663,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), state_scissor }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), state_colorwrite1 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), state_colorwrite2 }, EXT_DRAW_BUFFERS2 }, @@ -5436,6 +5435,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 61, 127}, {149, 150}, {169, 169}, + {175, 175}, {177, 177}, {193, 193}, {196, 197}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bfdd1b9ca3..3b7b837d3e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2037,6 +2037,7 @@ struct wined3d_rasterizer_state_desc enum wined3d_cull cull_mode; BOOL front_ccw; float depth_bias_clamp; + float scale_bias; BOOL depth_clip; }; -- 2.25.1
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=66480 Your paranoid android. === debiant (build log) === error: patch failed: dlls/d3d11/device.c:941 error: patch failed: dlls/d3d11/state.c:1079 error: patch failed: dlls/wined3d/device.c:3600 error: patch failed: include/wine/wined3d.h:2037 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/d3d11/device.c:941 error: patch failed: dlls/d3d11/state.c:1079 error: patch failed: dlls/wined3d/device.c:3600 error: patch failed: include/wine/wined3d.h:2037 Task: Patch failed to apply
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
participants (4)
-
Henri Verbeet -
Henri Verbeet -
Marvin -
Zebediah Figura