May 2020 - Wine-devel - list.winehq.org

[PATCH 1/5] wined3d: Store the wined3d primitive type in the wined3d state structure.
by Henri Verbeet 20 May '20

20 May '20

As opposed to the OpenGL primitive type. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 59 +++++++++++++++-- dlls/wined3d/cs.c | 18 ++--- dlls/wined3d/device.c | 118 ++++----------------------------- dlls/wined3d/glsl_shader.c | 5 +- dlls/wined3d/shader.c | 6 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 6 +- dlls/wined3d/wined3d_private.h | 16 ++--- 8 files changed, 93 insertions(+), 137 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f08f138e848..c4f14d24bb2 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -38,6 +38,52 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); static DWORD wined3d_context_tls_idx; +/* Note that except for WINED3DPT_POINTLIST and WINED3DPT_LINELIST these + * actually have the same values in GL and D3D. */ +static GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) +{ + switch (primitive_type) + { + case WINED3D_PT_POINTLIST: + return GL_POINTS; + + case WINED3D_PT_LINELIST: + return GL_LINES; + + case WINED3D_PT_LINESTRIP: + return GL_LINE_STRIP; + + case WINED3D_PT_TRIANGLELIST: + return GL_TRIANGLES; + + case WINED3D_PT_TRIANGLESTRIP: + return GL_TRIANGLE_STRIP; + + case WINED3D_PT_TRIANGLEFAN: + return GL_TRIANGLE_FAN; + + case WINED3D_PT_LINELIST_ADJ: + return GL_LINES_ADJACENCY_ARB; + + case WINED3D_PT_LINESTRIP_ADJ: + return GL_LINE_STRIP_ADJACENCY_ARB; + + case WINED3D_PT_TRIANGLELIST_ADJ: + return GL_TRIANGLES_ADJACENCY_ARB; + + case WINED3D_PT_TRIANGLESTRIP_ADJ: + return GL_TRIANGLE_STRIP_ADJACENCY_ARB; + + case WINED3D_PT_PATCH: + return GL_PATCHES; + + default: + FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(primitive_type)); + case WINED3D_PT_UNDEFINED: + return ~0u; + } +} + /* FBO helper functions */ /* Context activation is done by the caller. */ @@ -3931,10 +3977,10 @@ static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl * const struct wined3d_ffp_attrib_ops *ops = &context_gl->c.d3d_info->ffp_attrib_ops; GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; const struct wined3d_stream_info *si = &context_gl->c.stream_info; + GLenum mode = gl_primitive_type_from_d3d(state->primitive_type); const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; unsigned int instanced_element_count = 0; - GLenum mode = state->gl_primitive_type; const void *indices; unsigned int i, j; @@ -4104,7 +4150,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, ops = &d3d_info->ffp_attrib_ops; - gl_info->gl_ops.gl.p_glBegin(state->gl_primitive_type); + gl_info->gl_ops.gl.p_glBegin(gl_primitive_type_from_d3d(state->primitive_type)); if (use_vs(state) || d3d_info->ffp_generic_attributes) { @@ -4289,6 +4335,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { + GLenum gl_primitive_type = gl_primitive_type_from_d3d(state->primitive_type); const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_buffer *buffer = parameters->buffer; const void *offset; @@ -4307,11 +4354,11 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (state->index_offset) FIXME("Ignoring index offset %u.\n", state->index_offset); - GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, offset)); + GL_EXTCALL(glDrawElementsIndirect(gl_primitive_type, idx_type, offset)); } else { - GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, offset)); + GL_EXTCALL(glDrawArraysIndirect(gl_primitive_type, offset)); } GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); @@ -4545,7 +4592,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s else if (!context->transform_feedback_active) { enum wined3d_primitive_type primitive_type = shader->u.gs.output_type - ? shader->u.gs.output_type : d3d_primitive_type_from_gl(state->gl_primitive_type); + ? shader->u.gs.output_type : state->primitive_type; GLenum mode = gl_tfb_primitive_type_from_d3d(primitive_type); GL_EXTCALL(glBeginTransformFeedback(mode)); checkGLcall("glBeginTransformFeedback"); @@ -4553,7 +4600,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } } - if (state->gl_primitive_type == GL_PATCHES) + if (state->primitive_type == WINED3D_PT_PATCH) { GL_EXTCALL(glPatchParameteri(GL_PATCH_VERTICES, state->gl_patch_vertices)); checkGLcall("glPatchParameteri"); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c704daaf57e..9b50948d017 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -121,7 +121,7 @@ struct wined3d_cs_dispatch struct wined3d_cs_draw { enum wined3d_cs_op opcode; - GLenum primitive_type; + enum wined3d_primitive_type primitive_type; GLint patch_vertex_count; struct wined3d_draw_parameters parameters; }; @@ -881,13 +881,13 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); } - if (state->gl_primitive_type != op->primitive_type) + if (state->primitive_type != op->primitive_type) { if ((geometry_shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]) && !geometry_shader->function) device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY)); - if (state->gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) + if (state->primitive_type == WINED3D_PT_POINTLIST || op->primitive_type == WINED3D_PT_POINTLIST) device_invalidate_state(cs->device, STATE_POINT_ENABLE); - state->gl_primitive_type = op->primitive_type; + state->primitive_type = op->primitive_type; } state->gl_patch_vertices = op->patch_vertex_count; @@ -962,9 +962,9 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, - int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, BOOL indexed) +void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, + unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, + unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; @@ -987,8 +987,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } -void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, - struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) +void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, + unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, bool indexed) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 618a9bcbe26..72bd403e2c0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -90,96 +90,6 @@ const struct wined3d_light WINED3D_default_light = 0.0f /* Phi */ }; -/* Note that except for WINED3DPT_POINTLIST and WINED3DPT_LINELIST these - * actually have the same values in GL and D3D. */ -GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) -{ - switch (primitive_type) - { - case WINED3D_PT_POINTLIST: - return GL_POINTS; - - case WINED3D_PT_LINELIST: - return GL_LINES; - - case WINED3D_PT_LINESTRIP: - return GL_LINE_STRIP; - - case WINED3D_PT_TRIANGLELIST: - return GL_TRIANGLES; - - case WINED3D_PT_TRIANGLESTRIP: - return GL_TRIANGLE_STRIP; - - case WINED3D_PT_TRIANGLEFAN: - return GL_TRIANGLE_FAN; - - case WINED3D_PT_LINELIST_ADJ: - return GL_LINES_ADJACENCY_ARB; - - case WINED3D_PT_LINESTRIP_ADJ: - return GL_LINE_STRIP_ADJACENCY_ARB; - - case WINED3D_PT_TRIANGLELIST_ADJ: - return GL_TRIANGLES_ADJACENCY_ARB; - - case WINED3D_PT_TRIANGLESTRIP_ADJ: - return GL_TRIANGLE_STRIP_ADJACENCY_ARB; - - case WINED3D_PT_PATCH: - return GL_PATCHES; - - default: - FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(primitive_type)); - case WINED3D_PT_UNDEFINED: - return ~0u; - } -} - -enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_type) -{ - switch (primitive_type) - { - case GL_POINTS: - return WINED3D_PT_POINTLIST; - - case GL_LINES: - return WINED3D_PT_LINELIST; - - case GL_LINE_STRIP: - return WINED3D_PT_LINESTRIP; - - case GL_TRIANGLES: - return WINED3D_PT_TRIANGLELIST; - - case GL_TRIANGLE_STRIP: - return WINED3D_PT_TRIANGLESTRIP; - - case GL_TRIANGLE_FAN: - return WINED3D_PT_TRIANGLEFAN; - - case GL_LINES_ADJACENCY_ARB: - return WINED3D_PT_LINELIST_ADJ; - - case GL_LINE_STRIP_ADJACENCY_ARB: - return WINED3D_PT_LINESTRIP_ADJ; - - case GL_TRIANGLES_ADJACENCY_ARB: - return WINED3D_PT_TRIANGLELIST_ADJ; - - case GL_TRIANGLE_STRIP_ADJACENCY_ARB: - return WINED3D_PT_TRIANGLESTRIP_ADJ; - - case GL_PATCHES: - return WINED3D_PT_PATCH; - - default: - FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(primitive_type)); - case ~0u: - return WINED3D_PT_UNDEFINED; - } -} - BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_context **new_array; @@ -4066,7 +3976,7 @@ void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, TRACE("device %p, primitive_type %s, patch_vertex_count %u.\n", device, debug_d3dprimitivetype(primitive_type), patch_vertex_count); - device->state.gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); + device->state.primitive_type = primitive_type; device->state.gl_patch_vertices = patch_vertex_count; } @@ -4076,7 +3986,7 @@ void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device TRACE("device %p, primitive_type %p, patch_vertex_count %p.\n", device, primitive_type, patch_vertex_count); - *primitive_type = d3d_primitive_type_from_gl(device->state.gl_primitive_type); + *primitive_type = device->state.primitive_type; if (patch_vertex_count) *patch_vertex_count = device->state.gl_patch_vertices; @@ -4087,8 +3997,8 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT { TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, device->state.gl_patch_vertices, - 0, start_vertex, vertex_count, 0, 0, FALSE); + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, + device->state.gl_patch_vertices, 0, start_vertex, vertex_count, 0, 0, false); return WINED3D_OK; } @@ -4099,8 +4009,8 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, device->state.gl_patch_vertices, - 0, start_vertex, vertex_count, start_instance, instance_count, FALSE); + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.gl_patch_vertices, + 0, start_vertex, vertex_count, start_instance, instance_count, false); } void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, @@ -4108,8 +4018,8 @@ void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_devic { TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_draw_indirect(device->cs, device->state.gl_primitive_type, device->state.gl_patch_vertices, - buffer, offset, FALSE); + wined3d_cs_emit_draw_indirect(device->cs, device->state.primitive_type, + device->state.gl_patch_vertices, buffer, offset, false); } HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) @@ -4126,8 +4036,8 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, device->state.gl_patch_vertices, - device->state.base_vertex_index, start_idx, index_count, 0, 0, TRUE); + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.gl_patch_vertices, + device->state.base_vertex_index, start_idx, index_count, 0, 0, true); return WINED3D_OK; } @@ -4138,8 +4048,8 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, device->state.gl_patch_vertices, - device->state.base_vertex_index, start_idx, index_count, start_instance, instance_count, TRUE); + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.gl_patch_vertices, + device->state.base_vertex_index, start_idx, index_count, start_instance, instance_count, true); } void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, @@ -4147,8 +4057,8 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined { TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_draw_indirect(device->cs, device->state.gl_primitive_type, device->state.gl_patch_vertices, - buffer, offset, TRUE); + wined3d_cs_emit_draw_indirect(device->cs, device->state.primitive_type, + device->state.gl_patch_vertices, buffer, offset, true); } HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ddde6e0c104..7d16f03a219 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10348,7 +10348,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, if (vshader->reg_maps.shader_version.major < 4) { reorder_shader_id = shader_glsl_generate_vs3_rasterizer_input_setup(priv, vshader, pshader, - state->gl_primitive_type == GL_POINTS && vshader->reg_maps.point_size, + state->primitive_type == WINED3D_PT_POINTLIST && vshader->reg_maps.point_size, d3d_info->emulated_flatshading && state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT, gl_info); TRACE("Attaching GLSL shader object %u to program %u.\n", reorder_shader_id, program_id); @@ -11809,7 +11809,8 @@ static void glsl_vertex_pointsprite_core(struct wined3d_context *context, { static unsigned int once; - if (state->gl_primitive_type == GL_POINTS && !state->render_states[WINED3D_RS_POINTSPRITEENABLE] && !once++) + if (state->primitive_type == WINED3D_PT_POINTLIST + && !state->render_states[WINED3D_RS_POINTSPRITEENABLE] && !once++) FIXME("Non-point sprite points not supported in core profile.\n"); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index dbc889411d3..f4c4eb07d88 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3541,7 +3541,7 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 == WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z; args->clip_enabled = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - args->point_size = state->gl_primitive_type == GL_POINTS; + args->point_size = state->primitive_type == WINED3D_PT_POINTLIST; args->per_vertex_point_size = shader->reg_maps.point_size; args->next_shader_type = hull_shader ? WINED3D_SHADER_TYPE_HULL : geometry_shader ? WINED3D_SHADER_TYPE_GEOMETRY : WINED3D_SHADER_TYPE_PIXEL; @@ -3899,7 +3899,7 @@ void find_gs_compile_args(const struct wined3d_state *state, const struct wined3 args->output_count = pixel_shader ? pixel_shader->limits->packed_input : shader->limits->packed_output; if (!(args->primitive_type = shader->u.gs.input_type)) - args->primitive_type = d3d_primitive_type_from_gl(state->gl_primitive_type); + args->primitive_type = state->primitive_type; init_interpolation_compile_args(args->interpolation_mode, pixel_shader, context->d3d_info); } @@ -4155,7 +4155,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] - && state->gl_primitive_type == GL_POINTS; + && state->primitive_type == WINED3D_PT_POINTLIST; if (d3d_info->ffp_alpha_test) args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7e97c84c19e..1ce8e838992 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1818,7 +1818,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d TRACE("state %p, d3d_info %p.\n", state, d3d_info); get_identity_matrix(&identity); - state->gl_primitive_type = ~0u; + state->primitive_type = WINED3D_PT_UNDEFINED; state->gl_patch_vertices = 0; /* Set some of the defaults for lights, transforms etc */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 62262b81b2f..df948264f95 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6334,7 +6334,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] - && state->gl_primitive_type == GL_POINTS; + && state->primitive_type == WINED3D_PT_POINTLIST; if (d3d_info->ffp_alpha_test) settings->alpha_test_func = WINED3D_CMP_ALWAYS - 1; @@ -6498,7 +6498,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, if (si->position_transformed) { settings->transformed = 1; - settings->point_size = state->gl_primitive_type == GL_POINTS; + settings->point_size = state->primitive_type == WINED3D_PT_POINTLIST; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; @@ -6546,7 +6546,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->normalize = settings->normal && state->render_states[WINED3D_RS_NORMALIZENORMALS]; settings->lighting = !!state->render_states[WINED3D_RS_LIGHTING]; settings->localviewer = !!state->render_states[WINED3D_RS_LOCALVIEWER]; - settings->point_size = state->gl_primitive_type == GL_POINTS; + settings->point_size = state->primitive_type == WINED3D_PT_POINTLIST; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); wined3d_get_material_colour_source(&diffuse_source, &emissive_source, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84391470657..42b558a8aed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3488,7 +3488,7 @@ struct wined3d_state unsigned int index_offset; int base_vertex_index; int load_base_vertex_index; /* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */ - GLenum gl_primitive_type; + enum wined3d_primitive_type primitive_type; GLint gl_patch_vertices; struct wined3d_query *predicate; BOOL predicate_value; @@ -4490,11 +4490,12 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; -void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, - int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; -void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, - struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) DECLSPEC_HIDDEN; +void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, + unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, + unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; +void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, + unsigned int patch_vertex_count, struct wined3d_buffer *buffer, + unsigned int offset, bool indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -5066,9 +5067,6 @@ void state_pointsprite(struct wined3d_context *context, void state_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; -enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_type) DECLSPEC_HIDDEN; - /* Math utils */ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *src1, const struct wined3d_matrix *src2) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH v2 2/2] kernel32/tests: Add mutex tests with 8-bit character string.
by Akihiro Sagawa 20 May '20

20 May '20

v2: Simplify the tests and swap the patche order. We should be able to open the mutex with the same name after creation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/sync.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

[PATCH v2] ucrtbase: Extend the printf tests even further
by Martin Storsjo 20 May '20

20 May '20

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Changed syntax for sizeof, using ARRAY_SIZE as suggested. --- dlls/ucrtbase/tests/printf.c | 93 +++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 3b48e08b10..7647ac57e2 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -90,52 +90,55 @@ static int WINAPIV vsprintf_wrapper(unsigned __int64 options, char *str, static void test_snprintf (void) { - const char *tests[] = {"short", "justfit", "justfits", "muchlonger"}; + const char *tests[] = {"short", "justfit", "justfits", "muchlonger", "", "1"}; char buffer[8]; - const int bufsiz = sizeof buffer; - unsigned int i; - - /* Legacy _snprintf style termination */ - for (i = 0; i < ARRAY_SIZE(tests); i++) { - const char *fmt = tests[i]; - const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); - const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); - const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); - - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); - } - - /* C99 snprintf style termination */ - for (i = 0; i < ARRAY_SIZE(tests); i++) { - const char *fmt = tests[i]; - const int expect = strlen(fmt); - const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); - const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; - - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); - ok (buffer[valid] == '\0', - "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); - } - - /* swprintf style termination */ - for (i = 0; i < ARRAY_SIZE(tests); i++) { - const char *fmt = tests[i]; - const int expect = strlen(fmt) >= bufsiz ? -2 : strlen(fmt); - const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); - const int valid = n < 0 ? bufsiz - 1 : n; - - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); - ok (buffer[valid] == '\0', - "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); + int bufsizes[] = { 0, 1, sizeof(buffer) }; + unsigned int i, j; + + for (j = 0; j < ARRAY_SIZE(bufsizes); j++) { + const int bufsiz = bufsizes[j]; + /* Legacy _snprintf style termination */ + for (i = 0; i < ARRAY_SIZE(tests); i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); + } + + /* C99 snprintf style termination */ + for (i = 0; i < ARRAY_SIZE(tests); i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt); + const int n = vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, bufsiz, fmt); + const int valid = n >= bufsiz ? (bufsiz > 0 ? bufsiz - 1 : 0) : n < 0 ? 0 : n; + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\" bufsiz %d\n", fmt, valid, buffer, bufsiz); + ok (bufsiz == 0 || buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d (bufsiz %d)\n", fmt, n, buffer[valid], bufsiz); + } + + /* swprintf style termination */ + for (i = 0; i < ARRAY_SIZE(tests); i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt) >= bufsiz ? bufsiz > 0 ? -2 : -1 : strlen(fmt); + const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz > 0 ? bufsiz - 1 : 0 : n; + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\" bufsiz %d\n", fmt, valid, buffer, bufsiz); + ok (bufsiz == 0 || buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); + } } ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, NULL, 0, "abcd") == 4, -- 2.17.1

4 3

[PATCH 1/3] quartz/tests: Move the test for filter mapper aggregation to filtergraph.c.
by Zebediah Figura 20 May '20

20 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 25 ++++++++++++++ dlls/quartz/tests/filtermapper.c | 58 -------------------------------- 2 files changed, 25 insertions(+), 58 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index cd3c6354b07..afb32a01569 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2496,6 +2496,7 @@ static IUnknown test_outer = {&outer_vtbl}; static void test_aggregation(void) { IFilterGraph2 *graph, *graph2; + IFilterMapper2 *mapper; IUnknown *unk, *unk2; HRESULT hr; ULONG ref; @@ -2550,6 +2551,30 @@ static void test_aggregation(void) ref = IUnknown_Release(unk); ok(!ref, "Got unexpected refcount %d.\n", ref); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + /* Test the aggregated filter mapper. */ + + graph = create_graph(); + + ref = get_refcount(graph); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IFilterMapper2, (void **)&mapper); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = get_refcount(graph); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(mapper); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IFilterMapper2_QueryInterface(mapper, &IID_IFilterGraph2, (void **)&graph2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph2 == graph, "Got unexpected IFilterGraph2 %p.\n", graph2); + IFilterGraph2_Release(graph2); + + IFilterMapper2_Release(mapper); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got unexpected refcount %d.\n", ref); } /* Test how methods from "control" interfaces (IBasicAudio, IBasicVideo, diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 0f03b5ee0a9..5ca59a62e4e 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -370,63 +370,6 @@ static void test_legacy_filter_registration(void) IFilterMapper2_Release(mapper2); } -static ULONG getRefcount(IUnknown *iface) -{ - IUnknown_AddRef(iface); - return IUnknown_Release(iface); -} - -static void test_ifiltermapper_from_filtergraph(void) -{ - IFilterGraph2* pgraph2 = NULL; - IFilterMapper2 *pMapper2 = NULL; - IFilterGraph *filtergraph = NULL; - HRESULT hr; - ULONG refcount; - - hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); - ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); - if (!pgraph2) goto out; - - hr = IFilterGraph2_QueryInterface(pgraph2, &IID_IFilterMapper2, (LPVOID*)&pMapper2); - ok(hr == S_OK, "IFilterGraph2_QueryInterface failed with %08x\n", hr); - if (!pMapper2) goto out; - - refcount = getRefcount((IUnknown*)pgraph2); - ok(refcount == 2, "unexpected reference count: %u\n", refcount); - refcount = getRefcount((IUnknown*)pMapper2); - ok(refcount == 2, "unexpected reference count: %u\n", refcount); - - IFilterMapper2_AddRef(pMapper2); - refcount = getRefcount((IUnknown*)pgraph2); - ok(refcount == 3, "unexpected reference count: %u\n", refcount); - refcount = getRefcount((IUnknown*)pMapper2); - ok(refcount == 3, "unexpected reference count: %u\n", refcount); - IFilterMapper2_Release(pMapper2); - - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterGraph, (LPVOID*)&filtergraph); - ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %08x\n", hr); - if (!filtergraph) goto out; - - IFilterMapper2_Release(pMapper2); - pMapper2 = NULL; - IFilterGraph_Release(filtergraph); - filtergraph = NULL; - - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&pMapper2); - ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); - if (!pMapper2) goto out; - - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterGraph, (LPVOID*)&filtergraph); - ok(hr == E_NOINTERFACE, "IFilterMapper2_QueryInterface unexpected result: %08x\n", hr); - - out: - - if (pMapper2) IFilterMapper2_Release(pMapper2); - if (filtergraph) IFilterGraph_Release(filtergraph); - if (pgraph2) IFilterGraph2_Release(pgraph2); -} - static void test_register_filter_with_null_clsMinorType(void) { static WCHAR wszPinName[] = L"Pin"; @@ -945,7 +888,6 @@ START_TEST(filtermapper) test_interfaces(); test_fm2_enummatchingfilters(); test_legacy_filter_registration(); - test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); test_parse_filter_data(); test_aggregation(); -- 2.26.2

1 2

[PATCH] include: Add asferr.h.
by Zebediah Figura 20 May '20

20 May '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/asferr.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wmsdk.h | 4 +-- 2 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 include/asferr.h diff --git a/include/asferr.h b/include/asferr.h new file mode 100644 index 00000000000..5d60c9947f4 --- /dev/null +++ b/include/asferr.h @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ASFERR_H +#define _ASFERR_H + +#ifdef RC_INVOKED +#define _ASF_HRESULT_TYPEDEF_(x) x +#else +#define _ASF_HRESULT_TYPEDEF_(x) ((HRESULT)x) +#endif + +#define ASF_S_OPAQUEPACKET _ASF_HRESULT_TYPEDEF_(0x000d07f0) + +#define ASF_E_BUFFEROVERRUN _ASF_HRESULT_TYPEDEF_(0xc00d07d0) +#define ASF_E_BUFFERTOOSMALL _ASF_HRESULT_TYPEDEF_(0xc00d07d1) +#define ASF_E_BADLANGUAGEID _ASF_HRESULT_TYPEDEF_(0xc00d07d2) +#define ASF_E_NOPAYLOADLENGTH _ASF_HRESULT_TYPEDEF_(0xc00d07db) +#define ASF_E_TOOMANYPAYLOADS _ASF_HRESULT_TYPEDEF_(0xc00d07dc) +#define ASF_E_PACKETCONTENTTOOLARGE _ASF_HRESULT_TYPEDEF_(0xc00d07de) +#define ASF_E_UNKNOWNPACKETSIZE _ASF_HRESULT_TYPEDEF_(0xc00d07e0) +#define ASF_E_INVALIDHEADER _ASF_HRESULT_TYPEDEF_(0xc00d07e2) +#define ASF_E_NOCLOCKOBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07e6) +#define ASF_E_UNKNOWNCLOCKTYPE _ASF_HRESULT_TYPEDEF_(0xc00d07eb) +#define ASF_E_OPAQUEPACKET _ASF_HRESULT_TYPEDEF_(0xc00d07ed) +#define ASF_E_WRONGVERSION _ASF_HRESULT_TYPEDEF_(0xc00d07ee) +#define ASF_E_OVERFLOW _ASF_HRESULT_TYPEDEF_(0xc00d07ef) +#define ASF_E_NOTFOUND _ASF_HRESULT_TYPEDEF_(0xc00d07f0) +#define ASF_E_OBJECTTOOBIG _ASF_HRESULT_TYPEDEF_(0xc00d07f3) +#define ASF_E_UNEXPECTEDVALUE _ASF_HRESULT_TYPEDEF_(0xc00d07f4) +#define ASF_E_INVALIDSTATE _ASF_HRESULT_TYPEDEF_(0xc00d07f5) +#define ASF_E_NOLIBRARY _ASF_HRESULT_TYPEDEF_(0xc00d07f6) +#define ASF_E_ALREADYINITIALIZED _ASF_HRESULT_TYPEDEF_(0xc00d07f7) +#define ASF_E_INVALIDINIT _ASF_HRESULT_TYPEDEF_(0xc00d07f8) +#define ASF_E_NOHEADEROBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07f9) +#define ASF_E_NODATAOBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07fa) +#define ASF_E_NOINDEXOBJECT _ASF_HRESULT_TYPEDEF_(0xc00d07fb) +#define ASF_E_NOSTREAMPROPS _ASF_HRESULT_TYPEDEF_(0xc00d07fc) +#define ASF_E_NOFILEPROPS _ASF_HRESULT_TYPEDEF_(0xc00d07fd) +#define ASF_E_NOLANGUAGELIST _ASF_HRESULT_TYPEDEF_(0xc00d07fe) +#define ASF_E_NOINDEXPARAMETERS _ASF_HRESULT_TYPEDEF_(0xc00d07ff) +#define ASF_E_UNSUPPORTEDERRORCONCEALMENT _ASF_HRESULT_TYPEDEF_(0xc00d0800) +#define ASF_E_INVALIDFLAGS _ASF_HRESULT_TYPEDEF_(0xc00d0801) +#define ASF_E_BADDATADESCRIPTOR _ASF_HRESULT_TYPEDEF_(0xc00d0802) +#define ASF_E_BADINDEXINTERVAL _ASF_HRESULT_TYPEDEF_(0xc00d0803) +#define ASF_E_INVALIDTIME _ASF_HRESULT_TYPEDEF_(0xc00d0804) +#define ASF_E_INVALIDINDEX _ASF_HRESULT_TYPEDEF_(0xc00d0805) +#define ASF_E_STREAMNUMBERINUSE _ASF_HRESULT_TYPEDEF_(0xc00d0806) +#define ASF_E_BADMEDIATYPE _ASF_HRESULT_TYPEDEF_(0xc00d0807) +#define ASF_E_WRITEFAILED _ASF_HRESULT_TYPEDEF_(0xc00d0808) +#define ASF_E_NOTENOUGHDESCRIPTORS _ASF_HRESULT_TYPEDEF_(0xc00d0809) +#define ASF_E_INDEXBLOCKUNLOADED _ASF_HRESULT_TYPEDEF_(0xc00d080a) +#define ASF_E_NOTENOUGHBANDWIDTH _ASF_HRESULT_TYPEDEF_(0xc00d080b) +#define ASF_E_EXCEEDEDMAXIMUMOBJECTSIZE _ASF_HRESULT_TYPEDEF_(0xc00d080c) +#define ASF_E_BADDATAUNIT _ASF_HRESULT_TYPEDEF_(0xc00d080d) +#define ASF_E_HEADERSIZE _ASF_HRESULT_TYPEDEF_(0xc00d080e) + +#endif diff --git a/include/wmsdk.h b/include/wmsdk.h index b5528a889b3..6d6fd926ccd 100644 --- a/include/wmsdk.h +++ b/include/wmsdk.h @@ -20,7 +20,5 @@ /* #include <winapifamily.h> */ #include "wmsdkidl.h" - -/* Currently unimplemented */ -/* #include "asferr.h" */ +#include "asferr.h" #include "nserror.h" -- 2.26.2

1 0

[PATCH] preloader: Depend on wine_info.plist.
by Chip Davis 20 May '20

20 May '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- loader/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/Makefile.in b/loader/Makefile.in index 75b0b7b9dd7..cb38a7f5457 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -29,7 +29,9 @@ wine64_DEPS = $(WINELOADER_DEPENDS) wine64_LDFLAGS = $(WINELOADER_LDFLAGS) $(LDEXECFLAGS) -lwine $(PTHREAD_LIBS) wine_preloader_OBJS = preloader.o preloader_mac.o +wine_preloader_DEPS = $(WINELOADER_DEPENDS) wine_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) wine64_preloader_OBJS = preloader.o preloader_mac.o +wine64_preloader_DEPS = $(WINELOADER_DEPENDS) wine64_preloader_LDFLAGS = $(WINEPRELOADER_LDFLAGS) -- 2.24.0

1 0

[PATCH] shell32: Correct if condition.
by Alistair Leslie-Hughes 20 May '20

20 May '20

Spotted by Rafał Mikrut. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49203 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d3fab3c833ab..59376fb905fb 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1838,7 +1838,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView3 *iface, MSG FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif - if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) + if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message<=WM_KEYLAST)) { TRACE("-- key=0x04%lx\n",lpmsg->wParam) ; } -- 2.26.2

1 0

[PATCH 6/6] wined3d: Implement rasterisation object support for the Vulkan adapter.
by Henri Verbeet 19 May '20

19 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 90 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4f27e464330..0295880f0af 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -169,6 +169,22 @@ static VkColorComponentFlags vk_colour_write_mask_from_wined3d(uint32_t wined3d_ return vk_mask; } +static VkCullModeFlags vk_cull_mode_from_wined3d(enum wined3d_cull mode) +{ + switch (mode) + { + case WINED3D_CULL_NONE: + return VK_CULL_MODE_NONE; + case WINED3D_CULL_FRONT: + return VK_CULL_MODE_FRONT_BIT; + case WINED3D_CULL_BACK: + return VK_CULL_MODE_BACK_BIT; + default: + FIXME("Unhandled cull mode %#x.\n", mode); + return VK_CULL_MODE_NONE; + } +} + void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, struct wined3d_context_vk *context_vk) { @@ -1487,6 +1503,73 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->pipeline_desc.basePipelineIndex = -1; } +static void wined3d_context_vk_update_rasterisation_state(const struct wined3d_context_vk *context_vk, + const struct wined3d_state *state, struct wined3d_graphics_pipeline_key_vk *key) +{ + const struct wined3d_d3d_info *d3d_info = context_vk->c.d3d_info; + VkPipelineRasterizationStateCreateInfo *desc = &key->rs_desc; + const struct wined3d_rasterizer_state_desc *r; + float scale_bias; + union + { + uint32_t u32; + float f32; + } const_bias; + + if (!state->rasterizer_state) + { + desc->depthClampEnable = VK_FALSE; + desc->cullMode = VK_CULL_MODE_BACK_BIT; + desc->frontFace = VK_FRONT_FACE_CLOCKWISE; + desc->depthBiasEnable = VK_FALSE; + desc->depthBiasConstantFactor = 0.0f; + desc->depthBiasClamp = 0.0f; + desc->depthBiasSlopeFactor = 0.0f; + + return; + } + + r = &state->rasterizer_state->desc; + desc->depthClampEnable = !r->depth_clip; + desc->cullMode = vk_cull_mode_from_wined3d(r->cull_mode); + desc->frontFace = r->front_ccw ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE; + + scale_bias = r->scale_bias; + const_bias.f32 = r->depth_bias; + if (!scale_bias && !const_bias.f32) + { + desc->depthBiasEnable = VK_FALSE; + desc->depthBiasConstantFactor = 0.0f; + desc->depthBiasClamp = 0.0f; + desc->depthBiasSlopeFactor = 0.0f; + + return; + } + + desc->depthBiasEnable = VK_TRUE; + if (d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) + { + const struct wined3d_rendertarget_view *dsv; + + if ((dsv = state->fb.depth_stencil)) + { + desc->depthBiasConstantFactor = -(float)const_bias.u32 / dsv->format->depth_bias_scale; + desc->depthBiasSlopeFactor = -(float)const_bias.u32; + } + else + { + desc->depthBiasConstantFactor = 0.0f; + desc->depthBiasSlopeFactor = 0.0f; + } + } + else + { + desc->depthBiasConstantFactor = const_bias.f32; + desc->depthBiasSlopeFactor = scale_bias; + } + desc->depthBiasClamp = r->depth_bias_clamp; +} + static void wined3d_context_vk_update_blend_state(const struct wined3d_context_vk *context_vk, const struct wined3d_state *state, struct wined3d_graphics_pipeline_key_vk *key) { @@ -1658,6 +1741,13 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) + { + wined3d_context_vk_update_rasterisation_state(context_vk, state, key); + + update = true; + } + if (key->ms_desc.rasterizationSamples != context_vk->sample_count) { key->ms_desc.rasterizationSamples = context_vk->sample_count; -- 2.20.1

1 0

[PATCH 5/6] wined3d: Implement blend object support for the Vulkan adapter.
by Henri Verbeet 19 May '20

19 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 180 +++++++++++++++++++++++++++++++++++--- include/wine/wined3d.h | 2 +- 2 files changed, 170 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c114f8be7b9..4f27e464330 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -80,6 +80,95 @@ VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shad } } +static VkBlendFactor vk_blend_factor_from_wined3d(enum wined3d_blend blend, + const struct wined3d_format *dst_format, bool alpha) +{ + switch (blend) + { + case WINED3D_BLEND_ZERO: + return VK_BLEND_FACTOR_ZERO; + case WINED3D_BLEND_ONE: + return VK_BLEND_FACTOR_ONE; + case WINED3D_BLEND_SRCCOLOR: + return VK_BLEND_FACTOR_SRC_COLOR; + case WINED3D_BLEND_INVSRCCOLOR: + return VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR; + case WINED3D_BLEND_SRCALPHA: + return VK_BLEND_FACTOR_SRC_ALPHA; + case WINED3D_BLEND_INVSRCALPHA: + return VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; + case WINED3D_BLEND_DESTALPHA: + if (dst_format->alpha_size) + return VK_BLEND_FACTOR_DST_ALPHA; + return VK_BLEND_FACTOR_ONE; + case WINED3D_BLEND_INVDESTALPHA: + if (dst_format->alpha_size) + return VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA; + return VK_BLEND_FACTOR_ZERO; + case WINED3D_BLEND_DESTCOLOR: + return VK_BLEND_FACTOR_DST_COLOR; + case WINED3D_BLEND_INVDESTCOLOR: + return VK_BLEND_FACTOR_ONE_MINUS_DST_COLOR; + case WINED3D_BLEND_SRCALPHASAT: + return VK_BLEND_FACTOR_SRC_ALPHA_SATURATE; + case WINED3D_BLEND_BLENDFACTOR: + if (alpha) + return VK_BLEND_FACTOR_CONSTANT_ALPHA; + return VK_BLEND_FACTOR_CONSTANT_COLOR; + case WINED3D_BLEND_INVBLENDFACTOR: + if (alpha) + return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA; + return VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR; + case WINED3D_BLEND_SRC1COLOR: + return VK_BLEND_FACTOR_SRC1_COLOR; + case WINED3D_BLEND_INVSRC1COLOR: + return VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR; + case WINED3D_BLEND_SRC1ALPHA: + return VK_BLEND_FACTOR_SRC1_ALPHA; + case WINED3D_BLEND_INVSRC1ALPHA: + return VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA; + default: + FIXME("Unhandled blend %#x.\n", blend); + return VK_BLEND_FACTOR_ZERO; + } +} + +static VkBlendOp vk_blend_op_from_wined3d(enum wined3d_blend_op op) +{ + switch (op) + { + case WINED3D_BLEND_OP_ADD: + return VK_BLEND_OP_ADD; + case WINED3D_BLEND_OP_SUBTRACT: + return VK_BLEND_OP_SUBTRACT; + case WINED3D_BLEND_OP_REVSUBTRACT: + return VK_BLEND_OP_REVERSE_SUBTRACT; + case WINED3D_BLEND_OP_MIN: + return VK_BLEND_OP_MIN; + case WINED3D_BLEND_OP_MAX: + return VK_BLEND_OP_MAX; + default: + FIXME("Unhandled blend op %#x.\n", op); + return VK_BLEND_OP_ADD; + } +} + +static VkColorComponentFlags vk_colour_write_mask_from_wined3d(uint32_t wined3d_mask) +{ + VkColorComponentFlags vk_mask = 0; + + if (wined3d_mask & WINED3DCOLORWRITEENABLE_RED) + vk_mask |= VK_COLOR_COMPONENT_R_BIT; + if (wined3d_mask & WINED3DCOLORWRITEENABLE_GREEN) + vk_mask |= VK_COLOR_COMPONENT_G_BIT; + if (wined3d_mask & WINED3DCOLORWRITEENABLE_BLUE) + vk_mask |= VK_COLOR_COMPONENT_B_BIT; + if (wined3d_mask & WINED3DCOLORWRITEENABLE_ALPHA) + vk_mask |= VK_COLOR_COMPONENT_A_BIT; + + return vk_mask; +} + void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, struct wined3d_context_vk *context_vk) { @@ -1144,6 +1233,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->c.update_compute_unordered_access_view_bindings = 1; context_invalidate_state(&context_vk->c, STATE_STREAMSRC); context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); + context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); @@ -1336,6 +1426,11 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context VkPipelineShaderStageCreateInfo *stage; unsigned int i; + static const VkDynamicState dynamic_states[] = + { + VK_DYNAMIC_STATE_BLEND_CONSTANTS, + }; + key = &context_vk->graphics.pipeline_key_vk; memset(key, 0, sizeof(*key)); @@ -1376,6 +1471,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->blend_desc.blendConstants[3] = 1.0f; key->dynamic_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; + key->dynamic_desc.dynamicStateCount = ARRAY_SIZE(dynamic_states); + key->dynamic_desc.pDynamicStates = dynamic_states; key->pipeline_desc.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; key->pipeline_desc.pStages = key->stages; @@ -1390,6 +1487,72 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->pipeline_desc.basePipelineIndex = -1; } +static void wined3d_context_vk_update_blend_state(const struct wined3d_context_vk *context_vk, + const struct wined3d_state *state, struct wined3d_graphics_pipeline_key_vk *key) +{ + VkPipelineColorBlendStateCreateInfo *desc = &key->blend_desc; + const struct wined3d_blend_state_desc *b; + unsigned int i; + + desc->attachmentCount = context_vk->rt_count; + + memset(key->blend_attachments, 0, sizeof(key->blend_attachments)); + if (!state->blend_state) + { + for (i = 0; i < context_vk->rt_count; ++i) + { + key->blend_attachments[i].colorWriteMask = VK_COLOR_COMPONENT_R_BIT + | VK_COLOR_COMPONENT_G_BIT + | VK_COLOR_COMPONENT_B_BIT + | VK_COLOR_COMPONENT_A_BIT; + } + + return; + } + + b = &state->blend_state->desc; + for (i = 0; i < context_vk->rt_count; ++i) + { + const struct wined3d_rendertarget_blend_state_desc *rt = &b->rt[b->independent ? i : 0]; + const struct wined3d_rendertarget_view *rtv = state->fb.render_targets[i]; + VkPipelineColorBlendAttachmentState *a = &key->blend_attachments[i]; + enum wined3d_blend src_blend, dst_blend; + const struct wined3d_format *rt_format; + + a->colorWriteMask = vk_colour_write_mask_from_wined3d(rt->writemask); + if (!rt->enable) + continue; + + if (rtv) + rt_format = rtv->format; + else + rt_format = wined3d_get_format(context_vk->c.device->adapter, WINED3DFMT_NULL, 0); + a->blendEnable = VK_TRUE; + + src_blend = rt->src; + dst_blend = rt->dst; + if (src_blend == WINED3D_BLEND_BOTHSRCALPHA) + { + src_blend = WINED3D_BLEND_SRCALPHA; + dst_blend = WINED3D_BLEND_INVSRCALPHA; + } + else if (src_blend == WINED3D_BLEND_BOTHINVSRCALPHA) + { + src_blend = WINED3D_BLEND_INVSRCALPHA; + dst_blend = WINED3D_BLEND_SRCALPHA; + } + a->srcColorBlendFactor = vk_blend_factor_from_wined3d(src_blend, rt_format, FALSE); + a->dstColorBlendFactor = vk_blend_factor_from_wined3d(dst_blend, rt_format, FALSE); + a->colorBlendOp = vk_blend_op_from_wined3d(rt->op); + + src_blend = rt->src_alpha; + dst_blend = rt->dst_alpha; + a->srcAlphaBlendFactor = vk_blend_factor_from_wined3d(src_blend, rt_format, TRUE); + a->dstAlphaBlendFactor = vk_blend_factor_from_wined3d(dst_blend, rt_format, TRUE); + a->alphaBlendOp = vk_blend_op_from_wined3d(rt->op_alpha); + } +} + static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_context_vk *context_vk, const struct wined3d_state *state, VkPipelineLayout vk_pipeline_layout) { @@ -1502,18 +1665,10 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_BLEND) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) { - key->blend_desc.attachmentCount = context_vk->rt_count; - - memset(key->blend_attachments, 0, sizeof(key->blend_attachments)); - for (i = 0; i < context_vk->rt_count; ++i) - { - key->blend_attachments[i].colorWriteMask = VK_COLOR_COMPONENT_R_BIT - | VK_COLOR_COMPONENT_G_BIT - | VK_COLOR_COMPONENT_B_BIT - | VK_COLOR_COMPONENT_A_BIT; - } + wined3d_context_vk_update_blend_state(context_vk, state, key); update = true; } @@ -2403,6 +2558,9 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_vk->c.update_unordered_access_view_bindings = 0; } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_BLEND_FACTOR)) + VK_CALL(vkCmdSetBlendConstants(vk_command_buffer, &state->blend_factor.r)); + memset(context_vk->c.dirty_graphics_states, 0, sizeof(context_vk->c.dirty_graphics_states)); context_vk->c.shader_update_mask &= 1u << WINED3D_SHADER_TYPE_COMPUTE; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f42c1a80502..3b520985275 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2021,7 +2021,7 @@ struct wined3d_blend_state_desc { BOOL alpha_to_coverage; BOOL independent; - struct + struct wined3d_rendertarget_blend_state_desc { BOOL enable; enum wined3d_blend src; -- 2.20.1

1 0

[PATCH 4/6] wined3d: Implement scissor rectangle support for the Vulkan adapter.
by Henri Verbeet 19 May '20

19 May '20

No multi-viewport support yet. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 19351d4b953..c114f8be7b9 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1462,7 +1462,9 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT)) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) { key->viewport.x = state->viewports[0].x; key->viewport.y = state->viewports[0].y; @@ -1471,10 +1473,22 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->viewport.minDepth = state->viewports[0].min_z; key->viewport.maxDepth = state->viewports[0].max_z; - key->scissor.offset.x = key->viewport.x; - key->scissor.offset.y = key->viewport.y; - key->scissor.extent.width = key->viewport.width; - key->scissor.extent.height = key->viewport.height; + if (state->rasterizer_state && state->rasterizer_state->desc.scissor) + { + const RECT *r = &state->scissor_rects[0]; + + key->scissor.offset.x = r->left; + key->scissor.offset.y = r->top; + key->scissor.extent.width = r->right - r->left; + key->scissor.extent.height = r->bottom - r->top; + } + else + { + key->scissor.offset.x = key->viewport.x; + key->scissor.offset.y = key->viewport.y; + key->scissor.extent.width = key->viewport.width; + key->scissor.extent.height = key->viewport.height; + } key->viewport.y += key->viewport.height; key->viewport.height = -key->viewport.height; -- 2.20.1

1 0