[PATCH vkd3d 3/5] vkd3d-shader: Use vkd3d_shader_validate_compile_info() in vkd3d_shader_scan().
Henri Verbeet
hverbeet at codeweavers.com
Thu Aug 6 03:53:47 CDT 2020
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
libs/vkd3d-shader/vkd3d_shader_main.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 140bdd4..ab08620 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -839,17 +839,8 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
if (messages)
*messages = NULL;
- if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO)
- {
- WARN("Invalid structure type %#x.\n", compile_info->type);
- return VKD3D_ERROR_INVALID_ARGUMENT;
- }
-
- if (compile_info->source_type != VKD3D_SHADER_SOURCE_DXBC_TPF)
- {
- WARN("Unsupported source type %#x.\n", compile_info->source_type);
- return VKD3D_ERROR_INVALID_ARGUMENT;
- }
+ if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0)
+ return ret;
if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO)))
{
--
2.11.0
More information about the wine-devel
mailing list