lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing calling convention on ID3DInclude implementations

Browse Source
This commit is contained in:
baldurk
2019-02-13 21:04:34 +00:00
parent 96d43b6875
commit 03a786c8ba
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_shader_cache.cpp
+3 -3
View File
@@ -76,8 +76,8 @@ struct EmbeddedD3D11Includer : public ID3DInclude
std::string texsample = GetEmbeddedResource(hlsl_texsample_h);
std::string cbuffers = GetEmbeddedResource(hlsl_cbuffers_h);
virtual HRESULT Open(D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData,
LPCVOID *ppData, UINT *pBytes) override
virtual HRESULT STDMETHODCALLTYPE Open(D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName,
LPCVOID pParentData, LPCVOID *ppData, UINT *pBytes) override
{
std::string *str;
@@ -95,7 +95,7 @@ struct EmbeddedD3D11Includer : public ID3DInclude
return S_OK;
}
virtual HRESULT Close(LPCVOID pData) override { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE Close(LPCVOID pData) override { return S_OK; }
};
D3D11ShaderCache::D3D11ShaderCache(WrappedID3D11Device *wrapper)
renderdoc/driver/d3d12/d3d12_shader_cache.cpp
+3 -3
View File
@@ -75,8 +75,8 @@ struct EmbeddedD3D12Includer : public ID3DInclude
std::string texsample = GetEmbeddedResource(hlsl_texsample_h);
std::string cbuffers = GetEmbeddedResource(hlsl_cbuffers_h);
virtual HRESULT Open(D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData,
LPCVOID *ppData, UINT *pBytes) override
virtual HRESULT STDMETHODCALLTYPE Open(D3D_INCLUDE_TYPE IncludeType, LPCSTR pFileName,
LPCVOID pParentData, LPCVOID *ppData, UINT *pBytes) override
{
std::string *str;
@@ -94,7 +94,7 @@ struct EmbeddedD3D12Includer : public ID3DInclude
return S_OK;
}
virtual HRESULT Close(LPCVOID pData) override { return S_OK; }
virtual HRESULT STDMETHODCALLTYPE Close(LPCVOID pData) override { return S_OK; }
};
D3D12ShaderCache::D3D12ShaderCache()