From ee406955024fa569bc789db88d68ce0958087ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 30 Jan 2016 18:53:30 -0800 Subject: [PATCH] shaderc: Fixed Wine build. --- tools/shaderc/shaderc_hlsl.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/shaderc/shaderc_hlsl.cpp b/tools/shaderc/shaderc_hlsl.cpp index cafa446a..19e1db85 100644 --- a/tools/shaderc/shaderc_hlsl.cpp +++ b/tools/shaderc/shaderc_hlsl.cpp @@ -7,7 +7,10 @@ #if SHADERC_CONFIG_HLSL -#define INITGUID +//#define __REQUIRED_RPCNDR_H_VERSION__ 475 +//#define __in +//#define __out + #include #include #include @@ -18,6 +21,8 @@ namespace bgfx { + static const GUID IID_ID3D11ShaderReflection = { 0x6e6ffa6a, 0x9bae, 0x4613, { 0xa5, 0x1e, 0x91, 0x65, 0x2d, 0x50, 0x8c, 0x21 } }; + typedef HRESULT(WINAPI* PFN_D3D_COMPILE)(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData , _In_ SIZE_T SrcDataSize , _In_opt_ LPCSTR pSourceName @@ -482,7 +487,7 @@ namespace bgfx fprintf(stderr, "Error: Shader profile must be specified.\n"); return false; } - + void* d3dcompilerdll = bx::dlopen("D3DCompiler_47.dll"); if (NULL == d3dcompilerdll) { @@ -497,7 +502,7 @@ namespace bgfx if (NULL == D3DCompile || NULL == D3DDisassemble - || NULL == D3DReflect + || NULL == D3DReflect || NULL == D3DStripShader) { bx::dlclose(d3dcompilerdll);