wined3d: Initial implementation of queries for deferred contexts.
Signed-off-by: Jan Sikorski <jsikorski@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jan Sikorski
Alexandre Julliard
parent
a7ecf08040
commit
fbecfaec1b
|
|
@ -33026,6 +33026,80 @@ static void test_deferred_context_rendering(void)
|
|||
release_test_context(&test_context);
|
||||
}
|
||||
|
||||
static void test_deferred_context_queries(void)
|
||||
{
|
||||
ID3D11DeviceContext *immediate, *deferred;
|
||||
struct d3d11_test_context test_context;
|
||||
D3D11_QUERY_DESC query_desc;
|
||||
ID3D11Asynchronous *query;
|
||||
ID3D11CommandList *list;
|
||||
ID3D11Device *device;
|
||||
HRESULT hr;
|
||||
|
||||
union
|
||||
{
|
||||
UINT64 uint;
|
||||
DWORD dword[2];
|
||||
} data;
|
||||
|
||||
static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||
|
||||
if (!init_test_context(&test_context, NULL))
|
||||
return;
|
||||
|
||||
device = test_context.device;
|
||||
immediate = test_context.immediate_context;
|
||||
|
||||
hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred);
|
||||
ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr);
|
||||
|
||||
query_desc.Query = D3D11_QUERY_OCCLUSION;
|
||||
query_desc.MiscFlags = 0;
|
||||
hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query);
|
||||
ok(hr == S_OK, "Failed to create query, hr %#x.\n", hr);
|
||||
|
||||
hr = ID3D11DeviceContext_GetData(deferred, query, NULL, 0, 0);
|
||||
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
|
||||
hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0);
|
||||
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
|
||||
|
||||
ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL);
|
||||
set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
|
||||
|
||||
ID3D11DeviceContext_Begin(deferred, query);
|
||||
|
||||
hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0);
|
||||
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
|
||||
|
||||
test_context.immediate_context = deferred;
|
||||
draw_color_quad(&test_context, &white);
|
||||
test_context.immediate_context = immediate;
|
||||
|
||||
ID3D11DeviceContext_End(deferred, query);
|
||||
|
||||
hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0);
|
||||
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
|
||||
hr = ID3D11DeviceContext_GetData(immediate, query, &data, sizeof(data), 0);
|
||||
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
|
||||
|
||||
hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list);
|
||||
|
||||
hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0);
|
||||
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
|
||||
hr = ID3D11DeviceContext_GetData(immediate, query, &data, sizeof(data), 0);
|
||||
ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);
|
||||
|
||||
ID3D11DeviceContext_ExecuteCommandList(immediate, list, FALSE);
|
||||
|
||||
get_query_data(immediate, query, &data, sizeof(data));
|
||||
ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]);
|
||||
|
||||
ID3D11Asynchronous_Release(query);
|
||||
ID3D11CommandList_Release(list);
|
||||
ID3D11DeviceContext_Release(deferred);
|
||||
release_test_context(&test_context);
|
||||
}
|
||||
|
||||
static void test_deferred_context_map(void)
|
||||
{
|
||||
ID3D11DeviceContext *immediate, *deferred;
|
||||
|
|
@ -33984,6 +34058,7 @@ START_TEST(d3d11)
|
|||
queue_test(test_deferred_context_swap_state);
|
||||
queue_test(test_deferred_context_rendering);
|
||||
queue_test(test_deferred_context_map);
|
||||
queue_test(test_deferred_context_queries);
|
||||
queue_test(test_unbound_streams);
|
||||
queue_test(test_texture_compressed_3d);
|
||||
queue_test(test_constant_buffer_offset);
|
||||
|
|
|
|||
|
|
@ -34,6 +34,12 @@ struct wined3d_deferred_upload
|
|||
struct wined3d_box box;
|
||||
};
|
||||
|
||||
struct wined3d_deferred_query_issue
|
||||
{
|
||||
struct wined3d_query *query;
|
||||
unsigned int flags;
|
||||
};
|
||||
|
||||
struct wined3d_command_list
|
||||
{
|
||||
LONG refcount;
|
||||
|
|
@ -54,6 +60,9 @@ struct wined3d_command_list
|
|||
* to hold a reference here (and in wined3d_deferred_context) as well. */
|
||||
SIZE_T command_list_count;
|
||||
struct wined3d_command_list **command_lists;
|
||||
|
||||
SIZE_T query_count;
|
||||
struct wined3d_deferred_query_issue *queries;
|
||||
};
|
||||
|
||||
static void wined3d_command_list_destroy_object(void *object)
|
||||
|
|
@ -70,6 +79,7 @@ static void wined3d_command_list_destroy_object(void *object)
|
|||
heap_free(list->uploads);
|
||||
heap_free(list->resources);
|
||||
heap_free(list->data);
|
||||
heap_free(list->queries);
|
||||
heap_free(list);
|
||||
}
|
||||
|
||||
|
|
@ -99,6 +109,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list)
|
|||
wined3d_resource_decref(list->resources[i]);
|
||||
for (i = 0; i < list->upload_count; ++i)
|
||||
wined3d_resource_decref(list->uploads[i].resource);
|
||||
for (i = 0; i < list->query_count; ++i)
|
||||
wined3d_query_decref(list->queries[i].query);
|
||||
|
||||
wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list);
|
||||
}
|
||||
|
|
@ -2368,8 +2380,27 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context,
|
|||
|
||||
static void wined3d_cs_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list)
|
||||
{
|
||||
struct wined3d_cs *cs = wined3d_cs_from_context(context);
|
||||
SIZE_T i;
|
||||
|
||||
if (list->query_count)
|
||||
{
|
||||
cs->queries_flushed = FALSE;
|
||||
|
||||
for (i = 0; i < list->query_count; ++i)
|
||||
{
|
||||
if (list->queries[i].flags & WINED3DISSUE_END)
|
||||
{
|
||||
list->queries[i].query->counter_main++;
|
||||
list->queries[i].query->state = QUERY_SIGNALLED;
|
||||
}
|
||||
else
|
||||
{
|
||||
list->queries[i].query->state = QUERY_BUILDING;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < list->resource_count; ++i)
|
||||
wined3d_resource_acquire(list->resources[i]);
|
||||
|
||||
|
|
@ -3423,6 +3454,9 @@ struct wined3d_deferred_context
|
|||
* we need to hold a reference here and in wined3d_command_list as well. */
|
||||
SIZE_T command_list_count, command_lists_capacity;
|
||||
struct wined3d_command_list **command_lists;
|
||||
|
||||
SIZE_T query_count, queries_capacity;
|
||||
struct wined3d_deferred_query_issue *queries;
|
||||
};
|
||||
|
||||
static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context)
|
||||
|
|
@ -3570,7 +3604,25 @@ static bool wined3d_deferred_context_get_upload_bo(struct wined3d_device_context
|
|||
static void wined3d_deferred_context_issue_query(struct wined3d_device_context *context,
|
||||
struct wined3d_query *query, unsigned int flags)
|
||||
{
|
||||
FIXME("context %p, query %p, flags %#x, stub!\n", context, query, flags);
|
||||
struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context);
|
||||
struct wined3d_cs_query_issue *op;
|
||||
|
||||
op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
|
||||
op->opcode = WINED3D_CS_OP_QUERY_ISSUE;
|
||||
op->query = query;
|
||||
op->flags = flags;
|
||||
|
||||
wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
|
||||
|
||||
if (!wined3d_array_reserve((void **)&deferred->queries, &deferred->queries_capacity,
|
||||
deferred->query_count + 1, sizeof(*deferred->queries)))
|
||||
{
|
||||
ERR("Failed to reserve memory.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
deferred->queries[deferred->query_count].flags = flags;
|
||||
wined3d_query_incref(deferred->queries[deferred->query_count++].query = query);
|
||||
}
|
||||
|
||||
static void wined3d_deferred_context_flush(struct wined3d_device_context *context)
|
||||
|
|
@ -3670,6 +3722,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte
|
|||
wined3d_command_list_decref(deferred->command_lists[i]);
|
||||
heap_free(deferred->command_lists);
|
||||
|
||||
for (i = 0; i < deferred->query_count; ++i)
|
||||
wined3d_query_decref(deferred->queries[i].query);
|
||||
heap_free(deferred->queries);
|
||||
|
||||
wined3d_state_destroy(deferred->c.state);
|
||||
heap_free(deferred->data);
|
||||
heap_free(deferred);
|
||||
|
|
@ -3713,10 +3769,17 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device
|
|||
deferred->command_list_count * sizeof(*object->command_lists));
|
||||
/* Transfer our references to the command lists to the command list. */
|
||||
|
||||
if (!(object->queries = heap_alloc(deferred->query_count * sizeof(*object->queries))))
|
||||
goto out_free_command_lists;
|
||||
object->query_count = deferred->query_count;
|
||||
memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries));
|
||||
/* Transfer our references to the queries to the command list. */
|
||||
|
||||
deferred->data_size = 0;
|
||||
deferred->resource_count = 0;
|
||||
deferred->upload_count = 0;
|
||||
deferred->command_list_count = 0;
|
||||
deferred->query_count = 0;
|
||||
|
||||
/* This is in fact recorded into a subsequent command list. */
|
||||
if (restore)
|
||||
|
|
@ -3729,6 +3792,8 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device
|
|||
|
||||
return S_OK;
|
||||
|
||||
out_free_command_lists:
|
||||
heap_free(object->command_lists);
|
||||
out_free_uploads:
|
||||
heap_free(object->uploads);
|
||||
out_free_resources:
|
||||
|
|
|
|||
Loading…
Reference in New Issue