From 08a3d68eceb4c57100fc386f7e3a758c797b48a2 Mon Sep 17 00:00:00 2001 From: Igor Novikov Date: Mon, 8 Jan 2018 17:03:51 +0500 Subject: [PATCH] Remove workaround for IID_ID3D11ShaderReflection. --- src/Layers/xrRenderPC_R4/r4.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp index 85e0425cddd..883ac3152d6 100644 --- a/src/Layers/xrRenderPC_R4/r4.cpp +++ b/src/Layers/xrRenderPC_R4/r4.cpp @@ -795,10 +795,6 @@ void CRender::addShaderOption(const char* name, const char* value) m_ShaderOptions.push_back(macro); } -// XXX nitrocaster: workaround to eliminate conflict between different GUIDs from DXSDK/Windows SDK -// 0a233719-3960-4578-9d7c-203b8b1d9cc1 -static const GUID guidShaderReflection = {0x0a233719, 0x3960, 0x4578, {0x9d, 0x7c, 0x20, 0x3b, 0x8b, 0x1d, 0x9c, 0xc1}}; - template static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 const buffer_size, LPCSTR const file_name, T*& result, bool const disasm) @@ -807,7 +803,7 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons ID3DShaderReflection* pReflection = 0; - HRESULT const _hr = D3DReflect(buffer, buffer_size, guidShaderReflection, (void**)&pReflection); + HRESULT const _hr = D3DReflect(buffer, buffer_size, IID_ID3D11ShaderReflection, (void**)&pReflection); if (SUCCEEDED(_hr) && pReflection) { // Parse constant table data @@ -845,7 +841,7 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons ID3DShaderReflection* pReflection = 0; #ifdef USE_DX11 - _result = D3DReflect(buffer, buffer_size, guidShaderReflection, (void**)&pReflection); + _result = D3DReflect(buffer, buffer_size, IID_ID3D11ShaderReflection, (void**)&pReflection); #else _result = D3D10ReflectShader(buffer, buffer_size, &pReflection); #endif @@ -883,7 +879,7 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons ID3DShaderReflection* pReflection = 0; #ifdef USE_DX11 - _result = D3DReflect(buffer, buffer_size, guidShaderReflection, (void**)&pReflection); + _result = D3DReflect(buffer, buffer_size, IID_ID3D11ShaderReflection, (void**)&pReflection); #else _result = D3D10ReflectShader(buffer, buffer_size, &pReflection); #endif @@ -934,7 +930,7 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons ID3DShaderReflection* pReflection = 0; #ifdef USE_DX11 - _result = D3DReflect(buffer, buffer_size, guidShaderReflection, (void**)&pReflection); + _result = D3DReflect(buffer, buffer_size, IID_ID3D11ShaderReflection, (void**)&pReflection); #else _result = D3D10ReflectShader(buffer, buffer_size, &pReflection); #endif