From 03a786c8baa8b78cd8ad1faf0aa46399e83cf6cc Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 13 Feb 2019 21:04:34 +0000 Subject: [PATCH] Fix missing calling convention on ID3DInclude implementations --- renderdoc/driver/d3d11/d3d11_shader_cache.cpp | 6 +++--- renderdoc/driver/d3d12/d3d12_shader_cache.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_shader_cache.cpp b/renderdoc/driver/d3d11/d3d11_shader_cache.cpp index 813f00c33..dcbcfc232 100644 --- a/renderdoc/driver/d3d11/d3d11_shader_cache.cpp +++ b/renderdoc/driver/d3d11/d3d11_shader_cache.cpp @@ -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) diff --git a/renderdoc/driver/d3d12/d3d12_shader_cache.cpp b/renderdoc/driver/d3d12/d3d12_shader_cache.cpp index ca6618c92..fc4a8512d 100644 --- a/renderdoc/driver/d3d12/d3d12_shader_cache.cpp +++ b/renderdoc/driver/d3d12/d3d12_shader_cache.cpp @@ -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()