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

[PATCH 6/9] d2d1: Introduce a helper to check for Bézier segments.
by Henri Verbeet 20 May '20

20 May '20

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185333. dlls/d2d1/geometry.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c18b648aef4..fb82dfea7f2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -409,6 +409,11 @@ static void d2d_point_normalise(D2D1_POINT_2F *p) d2d_point_scale(p, 1.0f / l); } +static BOOL d2d_vertex_type_is_bezier(enum d2d_vertex_type t) +{ + return (t == D2D_VERTEX_TYPE_BEZIER || t == D2D_VERTEX_TYPE_SPLIT_BEZIER); +} + /* This implementation is based on the paper "Adaptive Precision * Floating-Point Arithmetic and Fast Robust Geometric Predicates" and * associated (Public Domain) code by Jonathan Richard Shewchuk. */ @@ -1875,7 +1880,7 @@ static BOOL d2d_geometry_apply_intersections(struct d2d_geometry *geometry, figure = &geometry->u.path.figures[inter->figure_idx]; vertex_type = figure->vertex_types[inter->vertex_idx + vertex_offset]; - if (vertex_type != D2D_VERTEX_TYPE_BEZIER && vertex_type != D2D_VERTEX_TYPE_SPLIT_BEZIER) + if (!d2d_vertex_type_is_bezier(vertex_type)) { if (!d2d_figure_insert_vertex(&geometry->u.path.figures[inter->figure_idx], inter->vertex_idx + vertex_offset + 1, inter->p)) @@ -1961,9 +1966,9 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) for (idx_q.vertex_idx = 0; idx_q.vertex_idx < max_q; ++idx_q.vertex_idx) { type_q = figure_q->vertex_types[idx_q.vertex_idx]; - if (type_q == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_q)) { - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) { if (!d2d_geometry_intersect_bezier_bezier(geometry, &intersections, &idx_p, 0.0f, 1.0f, &idx_q, 0.0f, 1.0f)) @@ -1978,7 +1983,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) } else { - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) { if (!d2d_geometry_intersect_bezier_line(geometry, &intersections, &idx_p, &idx_q)) goto done; @@ -1991,7 +1996,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) } } } - if (type_p == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type_p)) ++idx_p.control_idx; } } @@ -2328,7 +2333,7 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, if (!i) { prev_type = figure->vertex_types[figure->vertex_count - 1]; - if (prev_type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(prev_type)) prev = &figure->bezier_controls[figure->bezier_control_count - 1]; else prev = &figure->vertices[figure->vertex_count - 1]; @@ -2336,13 +2341,13 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, else { prev_type = figure->vertex_types[i - 1]; - if (prev_type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(prev_type)) prev = &figure->bezier_controls[bezier_idx - 1]; else prev = &figure->vertices[i - 1]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) next = &figure->bezier_controls[bezier_idx++]; else if (i == figure->vertex_count - 1) next = &figure->vertices[0]; @@ -2372,7 +2377,7 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, ERR("Failed to add line segment.\n"); return FALSE; } - else if (type == D2D_VERTEX_TYPE_BEZIER) + else if (d2d_vertex_type_is_bezier(type)) { const D2D1_POINT_2F *p2; @@ -2674,8 +2679,7 @@ static BOOL d2d_geometry_get_bezier_segment_idx(struct d2d_geometry *geometry, s for (; idx->vertex_idx < figure->vertex_count; ++idx->vertex_idx) { - if (figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_BEZIER - || figure->vertex_types[idx->vertex_idx] == D2D_VERTEX_TYPE_SPLIT_BEZIER) + if (d2d_vertex_type_is_bezier(figure->vertex_types[idx->vertex_idx])) return TRUE; } } @@ -3230,7 +3234,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * type = figure->vertex_types[j]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) { p1 = figure->original_bezier_controls[bezier_idx++]; d2d_point_transform(&p1, transform, p1.x, p1.y); @@ -3436,7 +3440,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i type = figure->vertex_types[j]; } - if (type == D2D_VERTEX_TYPE_BEZIER) + if (d2d_vertex_type_is_bezier(type)) { p1 = figure->original_bezier_controls[bezier_idx++]; if (transform) -- 2.20.1

1 0

[PATCH 4/9] d3d11: Implement d3d11_immediate_context_Flush().
by Henri Verbeet 20 May '20

20 May '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185293. dlls/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index afdd03f4d5b..2092901bd47 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2396,7 +2396,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_flush(device->wined3d_device); + wined3d_mutex_unlock(); } static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_immediate_context_GetType(ID3D11DeviceContext1 *iface) -- 2.20.1

1 0

[PATCH 3/9] wined3d: Introduce wined3d_device_flush().
by Henri Verbeet 20 May '20

20 May '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185292. dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 618a9bcbe26..c4562e60a92 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5196,6 +5196,13 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } +void CDECL wined3d_device_flush(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + wined3d_cs_emit_flush(device->cs); +} + static void update_swapchain_flags(struct wined3d_texture *texture) { unsigned int flags = texture->swapchain->state.desc.flags; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e7d08914cda..f4a648cac8b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -53,6 +53,7 @@ @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) +@ cdecl wined3d_device_flush(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3b520985275..5450b4d2117 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2334,6 +2334,7 @@ void __cdecl wined3d_device_draw_primitive_instanced_indirect(struct wined3d_dev struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); +void __cdecl wined3d_device_flush(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device, struct wined3d_color *blend_factor); -- 2.20.1

1 0

[PATCH] include: Add winapifamily.h file.
by Jacek Caban 20 May '20

20 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winapifamily.h | 62 ++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 2 files changed, 63 insertions(+) create mode 100644 include/winapifamily.h

1 0

[PATCH] winegcc: Pass only raw compiler and linker arguments in forward mode.
by Jacek Caban 20 May '20

20 May '20

Fixes use case like: CC=winegcc -b i686-w64-mingw32 $CC --version Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

1 0

[RFC PATCH] strmbase: Allow NULL pin_get_media_type() callback in source_Connect().
by Akihiro Sagawa 20 May '20

20 May '20

Hi Zebediah, I have a question about strmbase. By commit 38f5f364629650cba3ee90f326c2bb4f1c0f19c1, you made pin_get_media_type() callback optional. However, source_Connect() in strmbase/pin.c still uses base.pin_get_media_type() without NULL pointer checks. Was it done by design or not? If yes, I'll add some workarounds to my source (actually testsource_ops in dlls/quartz/tests/mpegsplit.c). If not, please feel free to apply this patch. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/strmbase/pin.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

3 2

[PATCH 5/5] wined3d: Set the correct patch vertex count for the Vulkan adapter.
by Henri Verbeet 20 May '20

20 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8ab0f6366ca..97d05f1dc88 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1427,6 +1427,9 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if (a->ia_desc.primitiveRestartEnable != b->ia_desc.primitiveRestartEnable) return a->ia_desc.primitiveRestartEnable - b->ia_desc.primitiveRestartEnable; + if (a->ts_desc.patchControlPoints != b->ts_desc.patchControlPoints) + return a->ts_desc.patchControlPoints - b->ts_desc.patchControlPoints; + if ((ret = memcmp(&a->viewport, &b->viewport, sizeof(a->viewport)))) return ret; @@ -1496,6 +1499,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + key->ts_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; + key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; key->vp_desc.viewportCount = 1; key->vp_desc.pViewports = &key->viewport; @@ -1526,6 +1531,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->pipeline_desc.pStages = key->stages; key->pipeline_desc.pVertexInputState = &key->input_desc; key->pipeline_desc.pInputAssemblyState = &key->ia_desc; + key->pipeline_desc.pTessellationState = &key->ts_desc; key->pipeline_desc.pViewportState = &key->vp_desc; key->pipeline_desc.pRasterizationState = &key->rs_desc; key->pipeline_desc.pMultisampleState = &key->ms_desc; @@ -1751,6 +1757,13 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } + if (key->ts_desc.patchControlPoints != state->patch_vertex_count) + { + key->ts_desc.patchControlPoints = state->patch_vertex_count; + + update = true; + } + 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)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3450633b618..ab5df330e76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2331,6 +2331,7 @@ struct wined3d_graphics_pipeline_key_vk VkPipelineVertexInputStateCreateInfo input_desc; VkPipelineInputAssemblyStateCreateInfo ia_desc; + VkPipelineTessellationStateCreateInfo ts_desc; VkPipelineViewportStateCreateInfo vp_desc; VkPipelineRasterizationStateCreateInfo rs_desc; VkPipelineMultisampleStateCreateInfo ms_desc; -- 2.20.1

1 0

[PATCH 4/5] wined3d: Implement primitive restart for the Vulkan adapter.
by Henri Verbeet 20 May '20

20 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 2 ++ dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0600cdfceca..8ab0f6366ca 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1745,6 +1745,8 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte if (key->ia_desc.topology != vk_topology) { key->ia_desc.topology = vk_topology; + key->ia_desc.primitiveRestartEnable = !(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART) + && !wined3d_primitive_type_is_list(state->primitive_type); update = true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f40a331322..3450633b618 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5949,6 +5949,16 @@ static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d return mask; } +static inline bool wined3d_primitive_type_is_list(enum wined3d_primitive_type t) +{ + return t == WINED3D_PT_POINTLIST + || t == WINED3D_PT_LINELIST + || t == WINED3D_PT_TRIANGLELIST + || t == WINED3D_PT_LINELIST_ADJ + || t == WINED3D_PT_TRIANGLELIST_ADJ + || t == WINED3D_PT_PATCH; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.20.1

1 0

[PATCH 3/5] wined3d: Implement different primitive topologies for the Vulkan adapter.
by Henri Verbeet 20 May '20

20 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 43 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0295880f0af..0600cdfceca 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -185,6 +185,39 @@ static VkCullModeFlags vk_cull_mode_from_wined3d(enum wined3d_cull mode) } } +static VkPrimitiveTopology vk_topology_from_wined3d(enum wined3d_primitive_type t) +{ + switch (t) + { + case WINED3D_PT_POINTLIST: + return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + case WINED3D_PT_LINELIST: + return VK_PRIMITIVE_TOPOLOGY_LINE_LIST; + case WINED3D_PT_LINESTRIP: + return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP; + case WINED3D_PT_TRIANGLELIST: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; + case WINED3D_PT_TRIANGLESTRIP: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; + case WINED3D_PT_TRIANGLEFAN: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN; + case WINED3D_PT_LINELIST_ADJ: + return VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY; + case WINED3D_PT_LINESTRIP_ADJ: + return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_WITH_ADJACENCY; + case WINED3D_PT_TRIANGLELIST_ADJ: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY; + case WINED3D_PT_TRIANGLESTRIP_ADJ: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY; + case WINED3D_PT_PATCH: + return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; + default: + FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(t)); + case WINED3D_PT_UNDEFINED: + return ~0u; + } +} + void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, struct wined3d_context_vk *context_vk) { @@ -1462,7 +1495,6 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->input_desc.pVertexAttributeDescriptions = key->attributes; key->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - key->ia_desc.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; key->vp_desc.viewportCount = 1; @@ -1644,6 +1676,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte struct wined3d_graphics_pipeline_key_vk *key; VkPipelineShaderStageCreateInfo *stage; struct wined3d_stream_info stream_info; + VkPrimitiveTopology vk_topology; VkShaderModule module; bool update = false; uint32_t mask; @@ -1708,6 +1741,14 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } + vk_topology = vk_topology_from_wined3d(state->primitive_type); + if (key->ia_desc.topology != vk_topology) + { + key->ia_desc.topology = vk_topology; + + update = true; + } + 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)) -- 2.20.1

1 0

[PATCH 2/5] wined3d: Store the wined3d patch vertex count in the wined3d state structure.
by Henri Verbeet 20 May '20

20 May '20

As opposed to the OpenGL patch vertex count. These are of course the same, so this is only a semantic change. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c4f14d24bb2..08a90e36634 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4602,7 +4602,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (state->primitive_type == WINED3D_PT_PATCH) { - GL_EXTCALL(glPatchParameteri(GL_PATCH_VERTICES, state->gl_patch_vertices)); + GL_EXTCALL(glPatchParameteri(GL_PATCH_VERTICES, state->patch_vertex_count)); checkGLcall("glPatchParameteri"); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9b50948d017..113b8ff84f6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -889,7 +889,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->device, STATE_POINT_ENABLE); state->primitive_type = op->primitive_type; } - state->gl_patch_vertices = op->patch_vertex_count; + state->patch_vertex_count = op->patch_vertex_count; cs->device->adapter->adapter_ops->adapter_draw_primitive(cs->device, state, &op->parameters); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72bd403e2c0..6f7ab23e60e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3977,7 +3977,7 @@ void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, device, debug_d3dprimitivetype(primitive_type), patch_vertex_count); device->state.primitive_type = primitive_type; - device->state.gl_patch_vertices = patch_vertex_count; + device->state.patch_vertex_count = patch_vertex_count; } void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device, @@ -3988,7 +3988,7 @@ void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device *primitive_type = device->state.primitive_type; if (patch_vertex_count) - *patch_vertex_count = device->state.gl_patch_vertices; + *patch_vertex_count = device->state.patch_vertex_count; TRACE("Returning %s.\n", debug_d3dprimitivetype(*primitive_type)); } @@ -3998,7 +3998,7 @@ 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.primitive_type, - device->state.gl_patch_vertices, 0, start_vertex, vertex_count, 0, 0, false); + device->state.patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); return WINED3D_OK; } @@ -4009,7 +4009,7 @@ 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.primitive_type, device->state.gl_patch_vertices, + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, 0, start_vertex, vertex_count, start_instance, instance_count, false); } @@ -4019,7 +4019,7 @@ 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.primitive_type, - device->state.gl_patch_vertices, buffer, offset, false); + device->state.patch_vertex_count, buffer, offset, false); } HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) @@ -4036,7 +4036,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.gl_patch_vertices, + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, device->state.base_vertex_index, start_idx, index_count, 0, 0, true); return WINED3D_OK; @@ -4048,7 +4048,7 @@ 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.primitive_type, device->state.gl_patch_vertices, + wined3d_cs_emit_draw(device->cs, device->state.primitive_type, device->state.patch_vertex_count, device->state.base_vertex_index, start_idx, index_count, start_instance, instance_count, true); } @@ -4058,7 +4058,7 @@ 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.primitive_type, - device->state.gl_patch_vertices, buffer, offset, true); + device->state.patch_vertex_count, buffer, offset, true); } HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1ce8e838992..4272d5aef2f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1819,7 +1819,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d get_identity_matrix(&identity); state->primitive_type = WINED3D_PT_UNDEFINED; - state->gl_patch_vertices = 0; + state->patch_vertex_count = 0; /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 42b558a8aed..9f40a331322 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3489,7 +3489,7 @@ struct wined3d_state int base_vertex_index; int load_base_vertex_index; /* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */ enum wined3d_primitive_type primitive_type; - GLint gl_patch_vertices; + unsigned int patch_vertex_count; struct wined3d_query *predicate; BOOL predicate_value; -- 2.20.1

1 0