ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Simplify init and cleanup in get_constants_desc(). 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2017-07-06 14:15:07 +03:00 committed by Alexandre Julliard
parent 57de7e9919
commit 9fc4e4a1a9
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/d3dx9_36/preshader.c
View File

@ -618,10 +618,6 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab
D3DXHANDLE hc; D3DXHANDLE hc;
unsigned int i; unsigned int i;
out->inputs = cdesc = NULL;
out->inputs_param = NULL;
out->input_count = 0;
inputs_param = NULL;
hr = D3DXGetShaderConstantTable(byte_code, &ctab); hr = D3DXGetShaderConstantTable(byte_code, &ctab);
if (FAILED(hr) || !ctab) if (FAILED(hr) || !ctab)
{ {
@ -635,8 +631,8 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab
goto err_out; goto err_out;
} }
cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants); out->inputs = cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants);
inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants); out->inputs_param = inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants);
if (!cdesc || !inputs_param) if (!cdesc || !inputs_param)
{ {
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
@ -678,16 +674,9 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab
} }
} }
out->input_count = desc.Constants; out->input_count = desc.Constants;
out->inputs = cdesc;
out->inputs_param = inputs_param;
hr = init_set_constants(out, ctab); hr = init_set_constants(out, ctab);
ID3DXConstantTable_Release(ctab);
return hr;
err_out: err_out:
HeapFree(GetProcessHeap(), 0, cdesc); ID3DXConstantTable_Release(ctab);
HeapFree(GetProcessHeap(), 0, inputs_param);
if (ctab)
ID3DXConstantTable_Release(ctab);
return hr; return hr;
} }