Commit 3a6050b6 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

d3dx9: Forward D3DXCompileShader to d3dcompiler.

parent 390b4803
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "objbase.h" #include "objbase.h"
#include "d3dcommon.h" #include "d3dcommon.h"
#include "d3dcompiler.h"
#include "d3dx9_36_private.h" #include "d3dx9_36_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx); WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
...@@ -371,16 +372,15 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, ...@@ -371,16 +372,15 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData,
LPD3DXBUFFER* ppErrorMsgs, LPD3DXBUFFER* ppErrorMsgs,
LPD3DXCONSTANTTABLE * ppConstantTable) LPD3DXCONSTANTTABLE * ppConstantTable)
{ {
FIXME("(%p, %d, %p, %p, %s, %s, %x, %p, %p, %p): stub\n", HRESULT hr = D3DCompile(pSrcData, srcDataLen, NULL,
pSrcData, srcDataLen, pDefines, pInclude, debugstr_a(pFunctionName), (D3D_SHADER_MACRO *)pDefines, (ID3DInclude *)pInclude,
debugstr_a(pProfile), Flags, ppShader, ppErrorMsgs, ppConstantTable); pFunctionName, pProfile, Flags, 0,
(ID3DBlob **)ppShader, (ID3DBlob **)ppErrorMsgs);
TRACE("Shader source:\n"); if(SUCCEEDED(hr) && ppConstantTable)
TRACE("%s\n", debugstr_an(pSrcData, srcDataLen)); return D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*ppShader),
ppConstantTable);
if (ppErrorMsgs) return hr;
D3DXCreateBuffer(1, ppErrorMsgs); /* zero fill used as string end */
return D3DERR_INVALIDCALL;
} }
static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment