From 6bcee199606ca051f099d0de32d3e1554f13d2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Tue, 11 Dec 2018 15:48:03 +0100 Subject: [PATCH] vkd3d: Return E_FAIL for invalid shader bytecode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On Windows invalid shader bytecode leads to a crash, E_FAIL or E_OUTOFMEMORY error. Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- libs/vkd3d/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index b7ebbdd7..fc09bf98 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -423,12 +423,14 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) { case VKD3D_OK: return S_OK; + case VKD3D_ERROR_INVALID_SHADER: + WARN("Invalid shader bytecode.\n"); + /* fall-through */ case VKD3D_ERROR: return E_FAIL; case VKD3D_ERROR_OUT_OF_MEMORY: return E_OUTOFMEMORY; case VKD3D_ERROR_INVALID_ARGUMENT: - case VKD3D_ERROR_INVALID_SHADER: return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL;