mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 11:50:17 +00:00
d3dx9: Avoid LPD3DXINCLUDE.
This commit is contained in:
parent
80d3010099
commit
69eeb35e51
|
@ -5871,13 +5871,8 @@ err_out:
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
|
HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, const D3DXMACRO *defines,
|
||||||
UINT srcdatalen,
|
ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **compiler, ID3DXBuffer **parse_errors)
|
||||||
CONST D3DXMACRO *defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXEFFECTCOMPILER *compiler,
|
|
||||||
LPD3DXBUFFER *parse_errors)
|
|
||||||
{
|
{
|
||||||
struct ID3DXEffectCompilerImpl *object;
|
struct ID3DXEffectCompilerImpl *object;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
@ -6137,8 +6132,8 @@ HRESULT WINAPI D3DXCreateEffectFromResourceA(struct IDirect3DDevice9 *device, HM
|
||||||
return D3DXCreateEffectFromResourceExA(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors);
|
return D3DXCreateEffectFromResourceExA(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors);
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACRO *defines, LPD3DXINCLUDE include,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(const WCHAR *srcfile, const D3DXMACRO *defines,
|
||||||
DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
|
ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
|
||||||
{
|
{
|
||||||
LPVOID buffer;
|
LPVOID buffer;
|
||||||
HRESULT ret;
|
HRESULT ret;
|
||||||
|
@ -6160,8 +6155,8 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACR
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO *defines, LPD3DXINCLUDE include,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(const char *srcfile, const D3DXMACRO *defines,
|
||||||
DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
|
ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
|
||||||
{
|
{
|
||||||
LPWSTR srcfileW;
|
LPWSTR srcfileW;
|
||||||
HRESULT ret;
|
HRESULT ret;
|
||||||
|
@ -6182,8 +6177,9 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, LPCSTR srcresource, const D3DXMACRO *defines,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, const char *srcresource,
|
||||||
LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
|
const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
|
||||||
|
ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
|
||||||
{
|
{
|
||||||
HRSRC resinfo;
|
HRSRC resinfo;
|
||||||
|
|
||||||
|
@ -6208,8 +6204,9 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, LPCSTR s
|
||||||
return D3DXERR_INVALIDDATA;
|
return D3DXERR_INVALIDDATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, LPCWSTR srcresource, const D3DXMACRO *defines,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WCHAR *srcresource,
|
||||||
LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors)
|
const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
|
||||||
|
ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
|
||||||
{
|
{
|
||||||
HRSRC resinfo;
|
HRSRC resinfo;
|
||||||
|
|
||||||
|
|
|
@ -185,13 +185,8 @@ HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVO
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
|
HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMACRO *defines,
|
||||||
UINT data_len,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* 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 */
|
||||||
|
@ -276,12 +271,8 @@ struct D3DXIncludeImpl {
|
||||||
ID3DXInclude ID3DXInclude_iface;
|
ID3DXInclude ID3DXInclude_iface;
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
|
HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines,
|
||||||
CONST D3DXMACRO* defines,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
LPWSTR filename_w = NULL;
|
LPWSTR filename_w = NULL;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
@ -300,12 +291,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
|
HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
|
||||||
CONST D3DXMACRO* defines,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
void *buffer;
|
void *buffer;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
@ -328,13 +315,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module,
|
HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
|
||||||
LPCSTR resource,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
HRSRC res;
|
HRSRC res;
|
||||||
LPCSTR buffer;
|
LPCSTR buffer;
|
||||||
|
@ -348,13 +330,8 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module,
|
||||||
shader, error_messages);
|
shader, error_messages);
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module,
|
HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
|
||||||
LPCWSTR resource,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
HRSRC res;
|
HRSRC res;
|
||||||
LPCSTR buffer;
|
LPCSTR buffer;
|
||||||
|
@ -479,12 +456,8 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou
|
||||||
flags, shader, error_messages, constant_table);
|
flags, shader, error_messages, constant_table);
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShader(LPCSTR data,
|
HRESULT WINAPI D3DXPreprocessShader(const char *data, UINT data_len, const D3DXMACRO *defines,
|
||||||
UINT data_len,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
TRACE("Forward to D3DPreprocess\n");
|
TRACE("Forward to D3DPreprocess\n");
|
||||||
return D3DPreprocess(data, data_len, NULL,
|
return D3DPreprocess(data, data_len, NULL,
|
||||||
|
@ -492,11 +465,8 @@ HRESULT WINAPI D3DXPreprocessShader(LPCSTR data,
|
||||||
(ID3DBlob **)shader, (ID3DBlob **)error_messages);
|
(ID3DBlob **)shader, (ID3DBlob **)error_messages);
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromFileA(LPCSTR filename,
|
HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMACRO *defines,
|
||||||
CONST D3DXMACRO* defines,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
WCHAR *filename_w = NULL;
|
WCHAR *filename_w = NULL;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
@ -515,11 +485,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(LPCSTR filename,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
|
HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
|
||||||
CONST D3DXMACRO* defines,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
void *buffer;
|
void *buffer;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
@ -544,12 +511,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module,
|
HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
|
||||||
LPCSTR resource,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
HRSRC res;
|
HRSRC res;
|
||||||
const char *buffer;
|
const char *buffer;
|
||||||
|
@ -563,12 +526,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module,
|
||||||
shader, error_messages);
|
shader, error_messages);
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module,
|
HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
|
||||||
LPCWSTR resource,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages)
|
|
||||||
{
|
{
|
||||||
HRSRC res;
|
HRSRC res;
|
||||||
const char *buffer;
|
const char *buffer;
|
||||||
|
|
|
@ -370,13 +370,8 @@ HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *src
|
||||||
HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
|
HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
|
||||||
const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
|
const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
|
||||||
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
|
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
|
||||||
HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
|
HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, const D3DXMACRO *defines,
|
||||||
UINT srcdatalen,
|
ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **compiler, ID3DXBuffer **parse_errors);
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXEFFECTCOMPILER* compiler,
|
|
||||||
LPD3DXBUFFER* parse_errors);
|
|
||||||
HRESULT WINAPI D3DXCreateEffectFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
|
HRESULT WINAPI D3DXCreateEffectFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
|
||||||
const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
|
const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
|
||||||
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
|
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
|
||||||
|
@ -411,34 +406,18 @@ HRESULT WINAPI D3DXCreateEffectFromResourceW(struct IDirect3DDevice9 *device, HM
|
||||||
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
|
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
|
||||||
#define D3DXCreateEffectFromResource WINELIB_NAME_AW(D3DXCreateEffectFromResource)
|
#define D3DXCreateEffectFromResource WINELIB_NAME_AW(D3DXCreateEffectFromResource)
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(const char *srcfile, const D3DXMACRO *defines,
|
||||||
const D3DXMACRO *defines,
|
ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
|
||||||
LPD3DXINCLUDE include,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(const WCHAR *srcfile, const D3DXMACRO *defines,
|
||||||
DWORD flags,
|
ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
|
||||||
LPD3DXEFFECTCOMPILER *effectcompiler,
|
|
||||||
LPD3DXBUFFER *parseerrors);
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile,
|
|
||||||
const D3DXMACRO *defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXEFFECTCOMPILER *effectcompiler,
|
|
||||||
LPD3DXBUFFER *parseerrors);
|
|
||||||
#define D3DXCreateEffectCompilerFromFile WINELIB_NAME_AW(D3DXCreateEffectCompilerFromFile)
|
#define D3DXCreateEffectCompilerFromFile WINELIB_NAME_AW(D3DXCreateEffectCompilerFromFile)
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, const char *srcresource,
|
||||||
LPCSTR srcresource,
|
const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
|
||||||
const D3DXMACRO *defines,
|
ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
|
||||||
LPD3DXINCLUDE include,
|
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WCHAR *srcresource,
|
||||||
DWORD flags,
|
const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags,
|
||||||
LPD3DXEFFECTCOMPILER *effectcompiler,
|
ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
|
||||||
LPD3DXBUFFER *parseerrors);
|
|
||||||
HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule,
|
|
||||||
LPCWSTR srcresource,
|
|
||||||
const D3DXMACRO *defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXEFFECTCOMPILER *effectcompiler,
|
|
||||||
LPD3DXBUFFER *parseerrors);
|
|
||||||
#define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource)
|
#define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource)
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -270,43 +270,20 @@ const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device);
|
||||||
HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size);
|
HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size);
|
||||||
HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count);
|
HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count);
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename,
|
HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines,
|
||||||
CONST D3DXMACRO* defines,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
LPD3DXINCLUDE include,
|
HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
|
||||||
DWORD flags,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename,
|
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
#define D3DXAssembleShaderFromFile WINELIB_NAME_AW(D3DXAssembleShaderFromFile)
|
#define D3DXAssembleShaderFromFile WINELIB_NAME_AW(D3DXAssembleShaderFromFile)
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module,
|
HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
|
||||||
LPCSTR resource,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
CONST D3DXMACRO* defines,
|
HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
|
||||||
LPD3DXINCLUDE include,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module,
|
|
||||||
LPCWSTR resource,
|
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
#define D3DXAssembleShaderFromResource WINELIB_NAME_AW(D3DXAssembleShaderFromResource)
|
#define D3DXAssembleShaderFromResource WINELIB_NAME_AW(D3DXAssembleShaderFromResource)
|
||||||
|
|
||||||
HRESULT WINAPI D3DXAssembleShader(LPCSTR data,
|
HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMACRO *defines,
|
||||||
UINT data_len,
|
ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
DWORD flags,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
|
|
||||||
HRESULT WINAPI D3DXCompileShader(const char *src_data, UINT data_len, const D3DXMACRO *defines,
|
HRESULT WINAPI D3DXCompileShader(const char *src_data, UINT data_len, const D3DXMACRO *defines,
|
||||||
ID3DXInclude *include, const char *function_name, const char *profile, DWORD flags,
|
ID3DXInclude *include, const char *function_name, const char *profile, DWORD flags,
|
||||||
|
@ -328,37 +305,19 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou
|
||||||
ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table);
|
ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table);
|
||||||
#define D3DXCompileShaderFromResource WINELIB_NAME_AW(D3DXCompileShaderFromResource)
|
#define D3DXCompileShaderFromResource WINELIB_NAME_AW(D3DXCompileShaderFromResource)
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShader(LPCSTR data,
|
HRESULT WINAPI D3DXPreprocessShader(const char *data, UINT data_len, const D3DXMACRO *defines,
|
||||||
UINT data_len,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromFileA(LPCSTR filename,
|
HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMACRO *defines,
|
||||||
CONST D3DXMACRO* defines,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
LPD3DXINCLUDE include,
|
HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines,
|
||||||
LPD3DXBUFFER* shader,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
|
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
#define D3DXPreprocessShaderFromFile WINELIB_NAME_AW(D3DXPreprocessShaderFromFile)
|
#define D3DXPreprocessShaderFromFile WINELIB_NAME_AW(D3DXPreprocessShaderFromFile)
|
||||||
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module,
|
HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
|
||||||
LPCSTR resource,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
CONST D3DXMACRO* defines,
|
HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
|
||||||
LPD3DXINCLUDE include,
|
ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages);
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module,
|
|
||||||
LPCWSTR resource,
|
|
||||||
CONST D3DXMACRO* defines,
|
|
||||||
LPD3DXINCLUDE include,
|
|
||||||
LPD3DXBUFFER* shader,
|
|
||||||
LPD3DXBUFFER* error_messages);
|
|
||||||
#define D3DXPreprocessShaderFromResource WINELIB_NAME_AW(D3DXPreprocessShaderFromResource)
|
#define D3DXPreprocessShaderFromResource WINELIB_NAME_AW(D3DXPreprocessShaderFromResource)
|
||||||
|
|
||||||
HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, ID3DXConstantTable **constant_table);
|
HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, ID3DXConstantTable **constant_table);
|
||||||
|
|
Loading…
Reference in a new issue