Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/HansKristian-Work/vkd3d-proton.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Kristian Arntzen <post@arntzen-software.no>2022-10-13 14:43:07 +0300
committerHans-Kristian Arntzen <post@arntzen-software.no>2022-10-14 12:07:53 +0300
commit6a62a7617f3cc3acd7423d4658977a7ee93b970a (patch)
tree2857d989285cecc111a4a65df0aa9f492886dfc1
parentabc22a5f0bd2889b78c18467b160f3b6a427edc1 (diff)
vkd3d: Cleanup some mismatching uses of vkd3d_malloc.
It's just a wrapper, but we should be consistent. Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
-rw-r--r--libs/vkd3d/cache.c6
-rw-r--r--libs/vkd3d/state.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/vkd3d/cache.c b/libs/vkd3d/cache.c
index 93062e2b..8add3e1f 100644
--- a/libs/vkd3d/cache.c
+++ b/libs/vkd3d/cache.c
@@ -1570,7 +1570,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_library_StorePipeline(d3d12_pipe
}
/* We need to allocate persistent storage for the name */
- if (!(new_name = malloc(entry.key.name_length)))
+ if (!(new_name = vkd3d_malloc(entry.key.name_length)))
{
rwlock_unlock_read(&pipeline_library->mutex);
return E_OUTOFMEMORY;
@@ -1586,7 +1586,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_library_StorePipeline(d3d12_pipe
return hresult_from_vk_result(vr);
}
- if (!(new_blob = malloc(entry.data.blob_length)))
+ if (!(new_blob = vkd3d_malloc(entry.data.blob_length)))
{
vkd3d_free(new_name);
rwlock_unlock_read(&pipeline_library->mutex);
@@ -2710,7 +2710,7 @@ static HRESULT vkd3d_pipeline_library_disk_cache_save_pipeline_state(struct vkd3
return hresult_from_vk_result(vr);
}
- if (!(new_blob = malloc(entry.data.blob_length)))
+ if (!(new_blob = vkd3d_malloc(entry.data.blob_length)))
{
rwlock_unlock_read(&library->mutex);
return E_OUTOFMEMORY;
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 71843409..a078daf8 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1142,7 +1142,7 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa
if (!desc->NumStaticSamplers)
return S_OK;
- if (!(vk_binding_info = malloc(desc->NumStaticSamplers * sizeof(*vk_binding_info))))
+ if (!(vk_binding_info = vkd3d_malloc(desc->NumStaticSamplers * sizeof(*vk_binding_info))))
return E_OUTOFMEMORY;
for (i = 0; i < desc->NumStaticSamplers; ++i)
@@ -2037,13 +2037,13 @@ static struct vkd3d_shader_transform_feedback_info *vkd3d_shader_transform_feedb
if (!xfb_info)
return NULL;
- new_buffer_strides = malloc(so_desc->NumStrides * sizeof(*new_buffer_strides));
+ new_buffer_strides = vkd3d_malloc(so_desc->NumStrides * sizeof(*new_buffer_strides));
if (!new_buffer_strides)
goto fail;
memcpy(new_buffer_strides, so_desc->pBufferStrides, so_desc->NumStrides * sizeof(*new_buffer_strides));
xfb_info->buffer_strides = new_buffer_strides;
- new_entries = malloc(so_desc->NumEntries * sizeof(*new_entries));
+ new_entries = vkd3d_malloc(so_desc->NumEntries * sizeof(*new_entries));
if (!new_entries)
goto fail;
memcpy(new_entries, so_desc->pSODeclaration, so_desc->NumEntries * sizeof(*new_entries));
@@ -2170,7 +2170,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetCachedBlob(ID3D12Pipeli
if ((vr = vkd3d_serialize_pipeline_state(NULL, state, &cache_size, NULL)))
return hresult_from_vk_result(vr);
- if (!(cache_data = malloc(cache_size)))
+ if (!(cache_data = vkd3d_malloc(cache_size)))
return E_OUTOFMEMORY;
if ((vr = vkd3d_serialize_pipeline_state(NULL, state, &cache_size, cache_data)))