[PATCH 1/5] wined3d: Get rid of a WARN in wined3d_query_get_data().
We've been handling the flags for a while. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/query.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 66965020b49..ab3bb743809 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -456,9 +456,6 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, TRACE("query %p, data %p, data_size %u, flags %#x.\n", query, data, data_size, flags); - if (flags) - WARN("Ignoring flags %#x.\n", flags); - if (query->state == QUERY_BUILDING) { WARN("Query is building, returning S_FALSE.\n"); -- 2.24.1
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dffa703dcc1..af83bb9460f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1512,6 +1512,9 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_range *range; + TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", + buffer, context, data, data_offset, range_count, ranges); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--) -- 2.24.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index af83bb9460f..cf32ffff6d9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1492,6 +1492,9 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_range *range; + TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", + buffer, context, data, data_offset, range_count, ranges); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--) -- 2.24.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cf32ffff6d9..47aca9218d7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1198,6 +1198,9 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off struct wined3d_context *context; DWORD dst_location; + TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", + dst_buffer, dst_offset, src_buffer, src_offset, size); + buffer_mark_used(dst_buffer); buffer_mark_used(src_buffer); -- 2.24.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/context.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e363fb1d65..41dbca24dbc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5132,9 +5132,17 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s unsigned int i, idx_size = 0; const void *idx_data = NULL; + TRACE("device %p, state %p, parameters %p.\n", device, state, parameters); + if (!parameters->indirect && !parameters->u.direct.index_count) return; + if (!parameters->indirect) + TRACE("base_vertex_idx %d, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", + parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, + parameters->u.direct.index_count, parameters->u.direct.start_instance, + parameters->u.direct.instance_count); + if (!(rtv = fb->render_targets[0])) rtv = fb->depth_stencil; @@ -5367,6 +5375,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s wined3d_fence_issue(context->buffer_fences[i], device); context_release(context); + + TRACE("Draw completed.\n"); } void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) -- 2.24.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
participants (2)
-
Henri Verbeet -
Matteo Bruni