=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: libs/vkd3d: Return E_INVALIDARG for invalid pipeline state desc.
Alexandre Julliard
julliard at winehq.org
Wed Jul 18 10:57:19 CDT 2018
Module: vkd3d
Branch: master
Commit: 7892a1e938463cce4a5591c5d79ffe17c540f961
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7892a1e938463cce4a5591c5d79ffe17c540f961
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Jul 18 12:05:45 2018 +0200
libs/vkd3d: Return E_INVALIDARG for invalid pipeline state desc.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/state.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 1c550e2..861f5bb 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1866,7 +1866,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
if (!(format = vkd3d_get_format(desc->DSVFormat, true)))
{
WARN("Invalid DXGI format %#x.\n", desc->DSVFormat);
- hr = E_FAIL;
+ hr = E_INVALIDARG;
goto fail;
}
@@ -1915,7 +1915,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
if (!(format = vkd3d_get_format(desc->RTVFormats[i], false)))
{
WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]);
- hr = E_FAIL;
+ hr = E_INVALIDARG;
goto fail;
}
@@ -2007,14 +2007,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
if (!(format = vkd3d_get_format(e->Format, false)))
{
WARN("Invalid DXGI format %#x.\n", e->Format);
- hr = E_FAIL;
+ hr = E_INVALIDARG;
goto fail;
}
if (e->InputSlot >= ARRAY_SIZE(graphics->input_rates))
{
WARN("Invalid input slot %#x.\n", e->InputSlot);
- hr = E_FAIL;
+ hr = E_INVALIDARG;
goto fail;
}
@@ -2048,7 +2048,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
default:
FIXME("Unhandled input slot class %#x on input element %u.\n", e->InputSlotClass, i);
- hr = E_FAIL;
+ hr = E_INVALIDARG;
goto fail;
}
@@ -2056,7 +2056,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
{
FIXME("Input slot class %#x on input element %u conflicts with earlier input slot class %#x.\n",
e->InputSlotClass, e->InputSlot, graphics->input_rates[e->InputSlot]);
- hr = E_FAIL;
+ hr = E_INVALIDARG;
goto fail;
}
graphics->input_rates[e->InputSlot] = input_rate;
More information about the wine-cvs
mailing list