=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d: Factor out d3d12_resource_init() .
Alexandre Julliard
julliard at winehq.org
Wed Sep 12 16:37:56 CDT 2018
Module: vkd3d
Branch: master
Commit: 8ce0d2e72ec45528fc813a4eab851d2eba3bdf60
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8ce0d2e72ec45528fc813a4eab851d2eba3bdf60
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Sep 12 15:19:53 2018 +0200
vkd3d: Factor out d3d12_resource_init().
In preparation for placed resources.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/resource.c | 53 ++++++++++++++++++++++++++++++++++++---------------
1 file changed, 38 insertions(+), 15 deletions(-)
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 37c8dff..88ab645 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -893,7 +893,7 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc)
return S_OK;
}
-static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, struct d3d12_device *device,
+static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device,
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE *optimized_clear_value)
@@ -941,6 +941,7 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st
WARN("Ignoring optimized clear value.\n");
resource->gpu_address = 0;
+ resource->vk_memory = VK_NULL_HANDLE;
resource->flags = 0;
if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc)))
@@ -959,12 +960,6 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st
d3d12_resource_destroy(resource, device);
return E_OUTOFMEMORY;
}
- if (FAILED(hr = vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer,
- heap_properties, heap_flags, &resource->vk_memory)))
- {
- d3d12_resource_destroy(resource, device);
- return hr;
- }
break;
case D3D12_RESOURCE_DIMENSION_TEXTURE1D:
@@ -975,12 +970,6 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st
resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION;
if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags)))
return hr;
- if (FAILED(hr = vkd3d_allocate_image_memory(device, resource->u.vk_image,
- heap_properties, heap_flags, &resource->vk_memory)))
- {
- d3d12_resource_destroy(resource, device);
- return hr;
- }
break;
default:
@@ -1001,7 +990,7 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st
return S_OK;
}
-HRESULT d3d12_committed_resource_create(struct d3d12_device *device,
+static HRESULT d3d12_resource_create(struct d3d12_device *device,
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource)
@@ -1012,13 +1001,47 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device,
if (!(object = vkd3d_malloc(sizeof(*object))))
return E_OUTOFMEMORY;
- if (FAILED(hr = d3d12_committed_resource_init(object, device, heap_properties, heap_flags,
+ if (FAILED(hr = d3d12_resource_init(object, device, heap_properties, heap_flags,
desc, initial_state, optimized_clear_value)))
{
vkd3d_free(object);
return hr;
}
+ *resource = object;
+
+ return hr;
+}
+
+HRESULT d3d12_committed_resource_create(struct d3d12_device *device,
+ const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
+ const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,
+ const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource)
+{
+ struct d3d12_resource *object;
+ HRESULT hr;
+
+ if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags,
+ desc, initial_state, optimized_clear_value, &object)))
+ return hr;
+
+ if (d3d12_resource_is_buffer(object))
+ {
+ hr = vkd3d_allocate_buffer_memory(device, object->u.vk_buffer,
+ heap_properties, heap_flags, &object->vk_memory);
+ }
+ else
+ {
+ hr = vkd3d_allocate_image_memory(device, object->u.vk_image,
+ heap_properties, heap_flags, &object->vk_memory);
+ }
+
+ if (FAILED(hr))
+ {
+ d3d12_resource_Release(&object->ID3D12Resource_iface);
+ return hr;
+ }
+
TRACE("Created committed resource %p.\n", object);
*resource = object;
More information about the wine-cvs
mailing list