resource: fix missing return value check

crownengine · Dec 21, 2023 · f512f54 · f512f54
1 parent e44e790
commit f512f54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,6 +4,10 @@ Changelog
 0.50.0 --- DD MMM YYYY
 ----------------------
 
+**Data Compiler**
+
+* Fixed existence/redefinition checks for samplers.
+
 **Tools**
 
 * Added an option to use the debug keystore when deploying APKs for Android.

diff --git a/src/resource/shader_resource.cpp b/src/resource/shader_resource.cpp
@@ -965,6 +965,7 @@ namespace shader_resource_internal
 				JsonObject shader(ta);
 				sjson::parse_object(shader, cur->second);
 
+				s32 err = 0;
 				BgfxShader bgfxshader(default_allocator());
 				if (json_object::has(shader, "includes"))
 					sjson::parse_string(bgfxshader._includes, shader["includes"]);
@@ -981,7 +982,9 @@ namespace shader_resource_internal
 				if (json_object::has(shader, "fs_input_output"))
 					sjson::parse_verbatim(bgfxshader._fs_input_output, shader["fs_input_output"]);
 				if (json_object::has(shader, "samplers"))
-					parse_bgfx_samplers(bgfxshader, shader["samplers"]);
+					err = parse_bgfx_samplers(bgfxshader, shader["samplers"]);
+
+				DATA_COMPILER_ENSURE(err == 0, _opts);
 
 				DynamicString key(ta);
 				key = cur->first;