wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

demos: Use 3 swapchain images.

Browse Source 
Mesa drivers increased minImageCount to 3.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-07-17 18:05:15 +02:00 committed by Alexandre Julliard
parent 548437ce22
commit 8bb34406e2
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
demos/gears.c
View File

@ -124,12 +124,12 @@ struct cx_gears
struct demo_swapchain *swapchain; struct demo_swapchain *swapchain;
ID3D12DescriptorHeap *rtv_heap, *dsv_heap; ID3D12DescriptorHeap *rtv_heap, *dsv_heap;
unsigned int rtv_descriptor_size; unsigned int rtv_descriptor_size;
ID3D12Resource *render_targets[2]; ID3D12Resource *render_targets[3];
ID3D12CommandAllocator *command_allocator[2]; ID3D12CommandAllocator *command_allocator[3];
ID3D12RootSignature *root_signature; ID3D12RootSignature *root_signature;
ID3D12PipelineState *pipeline_state_smooth, *pipeline_state_flat; ID3D12PipelineState *pipeline_state_smooth, *pipeline_state_flat;
ID3D12GraphicsCommandList *command_list[2]; ID3D12GraphicsCommandList *command_list[3];
ID3D12Resource *ds, *cb, *vb[2], *ib; ID3D12Resource *ds, *cb, *vb[2], *ib;
D3D12_VERTEX_BUFFER_VIEW vbv[2]; D3D12_VERTEX_BUFFER_VIEW vbv[2];
D3D12_INDEX_BUFFER_VIEW ibv; D3D12_INDEX_BUFFER_VIEW ibv;
@ -306,8 +306,10 @@ static void cxg_destroy_pipeline(struct cx_gears *cxg)
{ {
unsigned int i; unsigned int i;
ID3D12CommandAllocator_Release(cxg->command_allocator[1]); for (i = 0; i < ARRAY_SIZE(cxg->command_allocator); ++i)
ID3D12CommandAllocator_Release(cxg->command_allocator[0]); {
ID3D12CommandAllocator_Release(cxg->command_allocator[i]);
}
for (i = 0; i < ARRAY_SIZE(cxg->render_targets); ++i) for (i = 0; i < ARRAY_SIZE(cxg->render_targets); ++i)
{ {
ID3D12Resource_Release(cxg->render_targets[i]); ID3D12Resource_Release(cxg->render_targets[i]);
@ -371,12 +373,12 @@ static void cxg_load_pipeline(struct cx_gears *cxg)
&IID_ID3D12DescriptorHeap, (void **)&cxg->dsv_heap); &IID_ID3D12DescriptorHeap, (void **)&cxg->dsv_heap);
assert(SUCCEEDED(hr)); assert(SUCCEEDED(hr));
hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT, for (i = 0; i < ARRAY_SIZE(cxg->command_allocator); ++i)
&IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[0]); {
assert(SUCCEEDED(hr)); hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT,
hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[i]);
&IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[1]); assert(SUCCEEDED(hr));
assert(SUCCEEDED(hr)); }
} }
static void cxg_fence_destroy(struct cxg_fence *cxg_fence) static void cxg_fence_destroy(struct cxg_fence *cxg_fence)
@ -387,6 +389,8 @@ static void cxg_fence_destroy(struct cxg_fence *cxg_fence)
static void cxg_destroy_assets(struct cx_gears *cxg) static void cxg_destroy_assets(struct cx_gears *cxg)
{ {
unsigned int i;
cxg_fence_destroy(&cxg->fence); cxg_fence_destroy(&cxg->fence);
ID3D12Resource_Release(cxg->ib); ID3D12Resource_Release(cxg->ib);
ID3D12Resource_Unmap(cxg->vb[1], 0, NULL); ID3D12Resource_Unmap(cxg->vb[1], 0, NULL);
@ -395,8 +399,8 @@ static void cxg_destroy_assets(struct cx_gears *cxg)
ID3D12Resource_Unmap(cxg->cb, 0, NULL); ID3D12Resource_Unmap(cxg->cb, 0, NULL);
ID3D12Resource_Release(cxg->cb); ID3D12Resource_Release(cxg->cb);
ID3D12Resource_Release(cxg->ds); ID3D12Resource_Release(cxg->ds);
ID3D12GraphicsCommandList_Release(cxg->command_list[1]); for (i = 0; i < ARRAY_SIZE(cxg->command_list); ++i)
ID3D12GraphicsCommandList_Release(cxg->command_list[0]); ID3D12GraphicsCommandList_Release(cxg->command_list[i]);
ID3D12PipelineState_Release(cxg->pipeline_state_smooth); ID3D12PipelineState_Release(cxg->pipeline_state_smooth);
ID3D12PipelineState_Release(cxg->pipeline_state_flat); ID3D12PipelineState_Release(cxg->pipeline_state_flat);
ID3D12RootSignature_Release(cxg->root_signature); ID3D12RootSignature_Release(cxg->root_signature);
@ -659,6 +663,7 @@ static void cxg_load_assets(struct cx_gears *cxg)
D3D12_HEAP_PROPERTIES heap_desc; D3D12_HEAP_PROPERTIES heap_desc;
D3D12_RANGE read_range = {0, 0}; D3D12_RANGE read_range = {0, 0};
D3D12_CLEAR_VALUE clear_value; D3D12_CLEAR_VALUE clear_value;
unsigned int i;
HRESULT hr; HRESULT hr;
root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
@ -709,16 +714,15 @@ static void cxg_load_assets(struct cx_gears *cxg)
&IID_ID3D12PipelineState, (void **)&cxg->pipeline_state_smooth); &IID_ID3D12PipelineState, (void **)&cxg->pipeline_state_smooth);
assert(SUCCEEDED(hr)); assert(SUCCEEDED(hr));
hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxg->command_allocator[0], for (i = 0; i < ARRAY_SIZE(cxg->command_list); ++i)
cxg->pipeline_state_flat, &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[0]); {
assert(SUCCEEDED(hr)); hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
hr = ID3D12GraphicsCommandList_Close(cxg->command_list[0]); cxg->command_allocator[i], cxg->pipeline_state_flat,
assert(SUCCEEDED(hr)); &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[i]);
hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxg->command_allocator[1], assert(SUCCEEDED(hr));
cxg->pipeline_state_flat, &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[1]); hr = ID3D12GraphicsCommandList_Close(cxg->command_list[i]);
assert(SUCCEEDED(hr)); assert(SUCCEEDED(hr));
hr = ID3D12GraphicsCommandList_Close(cxg->command_list[1]); }
assert(SUCCEEDED(hr));
heap_desc.Type = D3D12_HEAP_TYPE_DEFAULT; heap_desc.Type = D3D12_HEAP_TYPE_DEFAULT;
heap_desc.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN; heap_desc.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
@ -861,6 +865,7 @@ static int cxg_main(void)
cxg_load_assets(&cxg); cxg_load_assets(&cxg);
cxg_populate_command_list(&cxg, 0); cxg_populate_command_list(&cxg, 0);
cxg_populate_command_list(&cxg, 1); cxg_populate_command_list(&cxg, 1);
cxg_populate_command_list(&cxg, 2);
demo_process_events(&cxg.demo); demo_process_events(&cxg.demo);

2
demos/triangle.c
View File

@ -73,7 +73,7 @@ struct cx_triangle
struct demo_swapchain *swapchain; struct demo_swapchain *swapchain;
ID3D12DescriptorHeap *rtv_heap; ID3D12DescriptorHeap *rtv_heap;
unsigned int rtv_descriptor_size; unsigned int rtv_descriptor_size;
ID3D12Resource *render_targets[2]; ID3D12Resource *render_targets[3];
ID3D12CommandAllocator *command_allocator; ID3D12CommandAllocator *command_allocator;
ID3D12RootSignature *root_signature; ID3D12RootSignature *root_signature;