rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-18 02:52:10 +01:00
Code Issues Projects Releases Wiki 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)))
return E_INVALIDARG;
if (ppVertexShader != nullptr) {
*ppVertexShader = ref(new D3D11VertexShader(
this, std::move(module)));
}
if (ppVertexShader == nullptr)
return S_FALSE;
*ppVertexShader = ref(new D3D11VertexShader(
this, std::move(module)));
return S_OK;
}
@ -894,11 +894,11 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG;
if (ppGeometryShader != nullptr) {
*ppGeometryShader = ref(new D3D11GeometryShader(
this, std::move(module)));
}
if (ppGeometryShader == nullptr)
return S_FALSE;
*ppGeometryShader = ref(new D3D11GeometryShader(
this, std::move(module)));
return S_OK;
}
@ -929,11 +929,11 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG;
if (ppPixelShader != nullptr) {
*ppPixelShader = ref(new D3D11PixelShader(
this, std::move(module)));
}
if (ppPixelShader == nullptr)
return S_FALSE;
*ppPixelShader = ref(new D3D11PixelShader(
this, std::move(module)));
return S_OK;
}
@ -944,17 +944,16 @@ namespace dxvk {
ID3D11ClassLinkage* pClassLinkage,
ID3D11HullShader** ppHullShader) {
D3D11ShaderModule module;
*ppHullShader = nullptr;
if (FAILED(this->CreateShaderModule(&module,
pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG;
if (ppHullShader != nullptr) {
*ppHullShader = ref(new D3D11HullShader(
this, std::move(module)));
}
if (ppHullShader == nullptr)
return S_FALSE;
*ppHullShader = ref(new D3D11HullShader(
this, std::move(module)));
return S_OK;
}
@ -965,16 +964,16 @@ namespace dxvk {
ID3D11ClassLinkage* pClassLinkage,
ID3D11DomainShader** ppDomainShader) {
D3D11ShaderModule module;
*ppDomainShader = nullptr;
if (FAILED(this->CreateShaderModule(&module,
pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG;
if (ppDomainShader != nullptr) {
*ppDomainShader = ref(new D3D11DomainShader(
this, std::move(module)));
}
if (ppDomainShader == nullptr)
return S_FALSE;
*ppDomainShader = ref(new D3D11DomainShader(
this, std::move(module)));
return S_OK;
}
@ -990,11 +989,11 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, pClassLinkage)))
return E_INVALIDARG;
if (ppComputeShader != nullptr) {
*ppComputeShader = ref(new D3D11ComputeShader(
this, std::move(module)));
}
if (ppComputeShader == nullptr)
return S_FALSE;
*ppComputeShader = ref(new D3D11ComputeShader(
this, std::move(module)));
return S_OK;
}