backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d11] Fix Create*Shader return values

Browse Source 
When not writing back any shader object, we should be returning
S_FALSE instead of S_OK.
This commit is contained in:
Philip Rebohle 2018-02-26 17:04:45 +01:00
parent c7acfb667f
commit e45d502fe4
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/d3d11/d3d11_device.cpp
View File

@ -874,11 +874,11 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, pClassLinkage))) pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG; return E_INVALIDARG;
if (ppVertexShader != nullptr) { if (ppVertexShader == nullptr)
*ppVertexShader = ref(new D3D11VertexShader( return S_FALSE;
this, std::move(module)));
}
*ppVertexShader = ref(new D3D11VertexShader(
this, std::move(module)));
return S_OK; return S_OK;
} }
@ -894,11 +894,11 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, pClassLinkage))) pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG; return E_INVALIDARG;
if (ppGeometryShader != nullptr) { if (ppGeometryShader == nullptr)
*ppGeometryShader = ref(new D3D11GeometryShader( return S_FALSE;
this, std::move(module)));
}
*ppGeometryShader = ref(new D3D11GeometryShader(
this, std::move(module)));
return S_OK; return S_OK;
} }
@ -929,11 +929,11 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, pClassLinkage))) pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG; return E_INVALIDARG;
if (ppPixelShader != nullptr) { if (ppPixelShader == nullptr)
*ppPixelShader = ref(new D3D11PixelShader( return S_FALSE;
this, std::move(module)));
}
*ppPixelShader = ref(new D3D11PixelShader(
this, std::move(module)));
return S_OK; return S_OK;
} }
@ -944,17 +944,16 @@ namespace dxvk {
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11HullShader** ppHullShader) { ID3D11HullShader** ppHullShader) {
D3D11ShaderModule module; D3D11ShaderModule module;
*ppHullShader = nullptr;
if (FAILED(this->CreateShaderModule(&module, if (FAILED(this->CreateShaderModule(&module,
pShaderBytecode, BytecodeLength, pClassLinkage))) pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG; return E_INVALIDARG;
if (ppHullShader != nullptr) { if (ppHullShader == nullptr)
*ppHullShader = ref(new D3D11HullShader( return S_FALSE;
this, std::move(module)));
}
*ppHullShader = ref(new D3D11HullShader(
this, std::move(module)));
return S_OK; return S_OK;
} }
@ -965,16 +964,16 @@ namespace dxvk {
ID3D11ClassLinkage* pClassLinkage, ID3D11ClassLinkage* pClassLinkage,
ID3D11DomainShader** ppDomainShader) { ID3D11DomainShader** ppDomainShader) {
D3D11ShaderModule module; D3D11ShaderModule module;
*ppDomainShader = nullptr;
if (FAILED(this->CreateShaderModule(&module, if (FAILED(this->CreateShaderModule(&module,
pShaderBytecode, BytecodeLength, pClassLinkage))) pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG; return E_INVALIDARG;
if (ppDomainShader != nullptr) { if (ppDomainShader == nullptr)
*ppDomainShader = ref(new D3D11DomainShader( return S_FALSE;
this, std::move(module)));
}
*ppDomainShader = ref(new D3D11DomainShader(
this, std::move(module)));
return S_OK; return S_OK;
} }
@ -990,11 +989,11 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, pClassLinkage))) pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG; return E_INVALIDARG;
if (ppComputeShader != nullptr) { if (ppComputeShader == nullptr)
*ppComputeShader = ref(new D3D11ComputeShader( return S_FALSE;
this, std::move(module)));
}
*ppComputeShader = ref(new D3D11ComputeShader(
this, std::move(module)));
return S_OK; return S_OK;
} }