summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2020-06-04 11:44:33 +0300
committerTapani Pälli <tapani.palli@intel.com>2020-06-04 11:44:33 +0300
commit58e7466f80d0c32421a505e90cadbe1229c44b53 (patch)
tree0b35925e24348761ce195f321ad8645cce06492f
parent3944b9696d33f6f0983f96473a1d80e84fc140c0 (diff)
ext_external_objects: add error reporting to load_shader
This helps catching possible bugs with the paths generated. Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
-rw-r--r--tests/spec/ext_external_objects/vk_image_display.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/spec/ext_external_objects/vk_image_display.c b/tests/spec/ext_external_objects/vk_image_display.c
index f07f1403e..2f5482cd8 100644
--- a/tests/spec/ext_external_objects/vk_image_display.c
+++ b/tests/spec/ext_external_objects/vk_image_display.c
@@ -213,8 +213,13 @@ load_shader(const char *shader_file, unsigned int *size)
"spec",
"ext_external_objects",
shader_file);
+ char *result =
+ piglit_load_text_file(filepath, size);
- return piglit_load_text_file(filepath, size);
+ if (!result)
+ fprintf(stderr, "failed to load shader source [%s]\n", filepath);
+
+ return result;
}
static bool
@@ -293,15 +298,11 @@ vk_init(uint32_t w,
}
/* load shaders */
- if (!(vs_src = load_shader(VK_BANDS_VERT, &vs_sz))) {
- fprintf(stderr, "Failed to load VS source.\n");
+ if (!(vs_src = load_shader(VK_BANDS_VERT, &vs_sz)))
goto fail;
- }
- if (!(fs_src = load_shader(VK_BANDS_FRAG, &fs_sz))) {
- fprintf(stderr, "Failed to load FS source.\n");
+ if (!(fs_src = load_shader(VK_BANDS_FRAG, &fs_sz)))
goto fail;
- }
/* create Vulkan renderer */
if (!vk_create_renderer(&vk_core, vs_src, vs_sz, fs_src, fs_sz,