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

d3dx9_36: Add trace to D3DAssembleShader and D3DCompileShader.

This commit is contained in:
Christian Costa 2013-07-22 08:48:17 +02:00 committed by Alexandre Julliard
parent 582945faac
commit a119f2666a
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/d3dx9_36/shader.c
View File

@ -193,11 +193,16 @@ HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const
HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMACRO *defines, HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMACRO *defines,
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
{ {
HRESULT hr;
TRACE("data %p, data_len %u, defines %p, include %p, flags %#x, shader %p, error_messages %p\n",
data, data_len, defines, include, flags, shader, error_messages);
/* Forward to d3dcompiler: the parameter types aren't really different, /* Forward to d3dcompiler: the parameter types aren't really different,
the actual data types are equivalent */ the actual data types are equivalent */
HRESULT hr = D3DAssemble(data, data_len, NULL, (D3D_SHADER_MACRO *)defines, hr = D3DAssemble(data, data_len, NULL, (D3D_SHADER_MACRO *)defines,
(ID3DInclude *)include, flags, (ID3DBlob **)shader, (ID3DInclude *)include, flags, (ID3DBlob **)shader,
(ID3DBlob **)error_messages); (ID3DBlob **)error_messages);
if(hr == E_FAIL) hr = D3DXERR_INVALIDDATA; if(hr == E_FAIL) hr = D3DXERR_INVALIDDATA;
return hr; return hr;
@ -350,18 +355,21 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *reso
shader, error_messages); shader, error_messages);
} }
HRESULT WINAPI D3DXCompileShader(const char *pSrcData, UINT srcDataLen, const D3DXMACRO *pDefines, HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO *defines,
ID3DXInclude *pInclude, const char *pFunctionName, const char *pProfile, DWORD Flags, ID3DXInclude *include, const char *function, const char *profile, DWORD flags,
ID3DXBuffer **ppShader, ID3DXBuffer **ppErrorMsgs, ID3DXConstantTable **ppConstantTable) ID3DXBuffer **shader, ID3DXBuffer **error_msgs, ID3DXConstantTable **constant_table)
{ {
HRESULT hr = D3DCompile(pSrcData, srcDataLen, NULL, HRESULT hr;
(D3D_SHADER_MACRO *)pDefines, (ID3DInclude *)pInclude,
pFunctionName, pProfile, Flags, 0, TRACE("data %p, length %u, defines %p, include %p, function %s, profile %s, flags %#x, shader %p, error_msgs %p, constant_table %p\n",
(ID3DBlob **)ppShader, (ID3DBlob **)ppErrorMsgs); data, length, defines, include, function, profile, flags, shader, error_msgs, constant_table);
hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include,
function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs);
if (SUCCEEDED(hr) && constant_table)
hr = D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*shader), constant_table);
if(SUCCEEDED(hr) && ppConstantTable)
return D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*ppShader),
ppConstantTable);
return hr; return hr;
} }