From 5b9407db48fff03d3b407e9a548037b077e0720c Mon Sep 17 00:00:00 2001 From: Matteo Bruni Date: Tue, 26 Oct 2021 23:25:10 +0200 Subject: [PATCH] d3d10/effect: Create variable buffer before parsing buffer members. Signed-off-by: Nikolay Sivov Signed-off-by: Matteo Bruni Signed-off-by: Alexandre Julliard --- dlls/d3d10/effect.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index dd8efedad45..dcfb09211bb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2346,7 +2346,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return S_OK; } -static HRESULT create_variable_buffer(struct d3d10_effect_variable *v) +static HRESULT create_buffer_object(struct d3d10_effect_variable *v) { D3D10_BUFFER_DESC buffer_desc; D3D10_SUBRESOURCE_DATA subresource_data; @@ -2354,12 +2354,6 @@ static HRESULT create_variable_buffer(struct d3d10_effect_variable *v) ID3D10Device *device = v->effect->device; HRESULT hr; - if (!(v->u.buffer.local_buffer = heap_alloc_zero(v->data_size))) - { - ERR("Failed to allocate local constant buffer memory.\n"); - return E_OUTOFMEMORY; - } - buffer_desc.ByteWidth = v->data_size; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.CPUAccessFlags = 0; @@ -2490,6 +2484,12 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char return E_OUTOFMEMORY; } + if (local && !(l->u.buffer.local_buffer = heap_alloc_zero(l->data_size))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + for (i = 0; i < l->type->member_count; ++i) { struct d3d10_effect_variable *v = &l->members[i]; @@ -2581,8 +2581,11 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (local && l->data_size) { - if (FAILED(hr = create_variable_buffer(l))) + if (FAILED(hr = create_buffer_object(l))) + { + WARN("Failed to create a buffer object, hr %#x.\n", hr); return hr; + } } if (l->explicit_bind_point != ~0u)