[PATCH vkd3d 1/2] vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info().

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 libs/vkd3d-shader/vkd3d_shader_main.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index a5931384..b1c9dadf 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -889,9 +889,6 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
 
 void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info)
 {
-    if (!scan_descriptor_info)
-        return;
-
     vkd3d_free(scan_descriptor_info->descriptors);
 }
 
-- 
2.28.0

[PATCH vkd3d 2/2] vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code().

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 libs/vkd3d-shader/vkd3d_shader_main.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index b1c9dadf..b1541480 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1124,9 +1124,6 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
 
 void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code)
 {
-    if (!shader_code)
-        return;
-
     vkd3d_free((void *)shader_code->code);
 }
 
-- 
2.28.0

[PATCH vkd3d 2/2] vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code().

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

[Henri Verbeet]

On Mon, 24 Aug 2020 at 20:51, Zebediah Figura <zfigura(a)codeweavers.com> wrote:
> @@ -889,9 +889,6 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
>
> void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info)
>  {
> -    if (!scan_descriptor_info)
> -        return;
> -
>      vkd3d_free(scan_descriptor_info->descriptors);
>  }

This is fine, but then we also need to handle "scan_descriptor_info"
being NULL in vkd3d_shader_scan(). (As it is in
test_invalid_shaders().)