Merge pull request #56 from Interrupt/features/shader-error-handling

Better shader error handling: Shader creation returns an error union now instead of null

src/examples/collision.zig

@@ -18,6 +18,8 @@ const Vec2 = math.Vec2;
 const Rect = delve.spatial.Rect;
 const TextureRegion = delve.graphics.sprites.TextureRegion;
 
+const def_shader = delve.shaders.default;
+
 var shader_default: graphics.Shader = undefined;
 var sprite_batch: batcher.SpriteBatcher = undefined;
 
@@ -58,14 +60,13 @@ pub fn registerModule() !void {
 
 fn on_init() !void {
     debug.log("Collision example module initializing", .{});
+    shader_default = try graphics.Shader.initDefault(.{});
 
     sprite_batch = batcher.SpriteBatcher.init(.{}) catch {
         debug.showErrorScreen("Fatal error during batch init!");
         return;
     };
 
-    shader_default = graphics.Shader.initDefault(.{});
-
     graphics.setClearColor(colors.examples_bg_light);
 }
 

src/examples/fonts.zig

@@ -67,7 +67,7 @@ fn on_init() !void {
     _ = try delve.fonts.loadFont("IBMPlexSerif", "assets/fonts/IBMPlexSerif-Regular.ttf", 1024, 200);
 
     // make a shader with alpha blending
-    shader_blend = graphics.Shader.initDefault(.{ .blend_mode = graphics.BlendMode.BLEND });
+    shader_blend = try graphics.Shader.initDefault(.{ .blend_mode = graphics.BlendMode.BLEND });
 }
 
 fn on_tick(delta: f32) void {

src/examples/forest.zig

@@ -192,7 +192,7 @@ fn on_init() !void {
     tex_treesheet = graphics.Texture.init(&treesheet_img);
 
     // make our default shader
-    shader_blend = graphics.Shader.initDefault(.{ .blend_mode = .NONE, .cull_mode = .NONE });
+    shader_blend = try graphics.Shader.initDefault(.{ .blend_mode = .NONE, .cull_mode = .NONE });
 
     // set the sky color
     graphics.setClearColor(sky_color);

src/examples/frustums.zig

@@ -45,7 +45,7 @@ pub fn main() !void {
 }
 
 pub fn on_init() !void {
-    shader = delve.platform.graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, delve.shaders.default_mesh).?;
+    shader = try delve.platform.graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, delve.shaders.default_mesh);
 
     // Create some materials
     material_frustum = try delve.platform.graphics.Material.init(.{

src/examples/lighting.zig

@@ -85,8 +85,8 @@ fn on_init() !void {
     camera.direction = Vec3.new(0.0, 0.0, 1.0);
 
     // make shaders for skinned and unskinned meshes
-    skinned_shader = graphics.Shader.initFromBuiltin(.{ .vertex_attributes = skinned_mesh.getSkinnedShaderAttributes() }, skinned_lit_shader).?;
-    static_shader = graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, lit_shader).?;
+    skinned_shader = try graphics.Shader.initFromBuiltin(.{ .vertex_attributes = skinned_mesh.getSkinnedShaderAttributes() }, skinned_lit_shader);
+    static_shader = try graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, lit_shader);
 
     var base_img: images.Image = try images.loadFile(mesh_texture_file);
     defer base_img.deinit();

src/examples/meshbuilder.zig

@@ -51,11 +51,11 @@ pub fn on_init() !void {
     defer img.deinit();
     const tex = graphics.Texture.init(&img);
 
-    const shader = graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, delve.shaders.default_mesh);
+    const shader = try graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, delve.shaders.default_mesh);
 
     // Create a material out of the texture
     material = try graphics.Material.init(.{
-        .shader = shader.?,
+        .shader = shader,
         .own_shader = true,
         .texture_0 = tex,
         .samplers = &[_]graphics.FilterMode{.NEAREST},

src/examples/meshes.zig

@@ -90,13 +90,7 @@ fn on_init() !void {
     const tex_emissive = graphics.Texture.init(&emissive_img);
 
     // Make our emissive shader from one that is pre-compiled
-    const loaded_shader = graphics.Shader.initFromBuiltin(.{ .vertex_attributes = mesh.getShaderAttributes() }, emissive_shader_builtin);
-
-    if (loaded_shader == null) {
-        debug.log("Could not get emissive shader", .{});
-        return;
-    }
-    shader = loaded_shader.?;
+    shader = try graphics.Shader.initFromBuiltin(.{ .vertex_attributes = mesh.getShaderAttributes() }, emissive_shader_builtin);
 
     // Create a material out of our shader and textures
     material = try graphics.Material.init(.{

src/examples/quakemap.zig

@@ -149,7 +149,7 @@ pub fn on_init() !void {
     var err: delve.utils.quakemap.ErrorInfo = undefined;
     quake_map = try delve.utils.quakemap.QuakeMap.read(allocator, test_map_file, map_transform, &err);
 
-    shader = graphics.Shader.initDefault(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() });
+    shader = try graphics.Shader.initDefault(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() });
 
     // Create a material out of the texture
     fallback_material = try graphics.Material.init(.{

src/examples/rays.zig

@@ -45,7 +45,7 @@ pub fn main() !void {
 }
 
 pub fn on_init() !void {
-    const shader = delve.platform.graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, delve.shaders.default_mesh);
+    const shader = try delve.platform.graphics.Shader.initFromBuiltin(.{ .vertex_attributes = delve.graphics.mesh.getShaderAttributes() }, delve.shaders.default_mesh);
 
     // Create some materials
     material_frustum = try delve.platform.graphics.Material.init(.{

src/examples/skinned-meshes.zig

@@ -78,23 +78,19 @@ fn on_init() !void {
     camera.direction = Vec3.new(0.0, 0.0, 1.0);
 
     // Make our emissive shader from one that is pre-compiled
-    const shader = graphics.Shader.initFromBuiltin(.{ .vertex_attributes = skinned_mesh.getSkinnedShaderAttributes() }, shader_builtin);
-
-    if (shader == null) {
-        debug.log("Could not get shader", .{});
-        return;
-    }
+    const shader = try graphics.Shader.initFromBuiltin(.{ .vertex_attributes = skinned_mesh.getSkinnedShaderAttributes() }, shader_builtin);
 
     var base_img: images.Image = images.loadFile(mesh_texture_file) catch {
         debug.log("Assets: Error loading image asset: {s}", .{mesh_texture_file});
         return;
     };
     defer base_img.deinit();
+
     const tex_base = graphics.Texture.init(&base_img);
 
     // Create a material out of our shader and textures
     material = try delve.platform.graphics.Material.init(.{
-        .shader = shader.?,
+        .shader = shader,
         .own_shader = true,
         .texture_0 = tex_base,
         .texture_1 = delve.platform.graphics.createSolidTexture(0x00000000),

src/examples/sprites.zig

@@ -91,8 +91,8 @@ fn on_init() !void {
     texture_2 = graphics.Texture.init(&test_image_2);
 
     // make some shaders for testing
-    shader_opaque = graphics.Shader.initDefault(.{});
-    shader_blend = graphics.Shader.initDefault(.{ .blend_mode = graphics.BlendMode.BLEND });
+    shader_opaque = try graphics.Shader.initDefault(.{});
+    shader_blend = try graphics.Shader.initDefault(.{ .blend_mode = graphics.BlendMode.BLEND });
 
     // Create some test materials out of our shader and textures
     test_material_1 = try graphics.Material.init(.{

src/framework/graphics/shaders.zig

@@ -34,7 +34,7 @@ pub fn loadFromYaml(cfg: graphics.ShaderConfig, file_path: []const u8) !?graphic
         break;
     }
 
-    return graphics.Shader.initFromShaderInfo(cfg, shader_info);
+    return try graphics.Shader.initFromShaderInfo(cfg, shader_info);
 }
 
 fn loadShaderSource(allocator: std.mem.Allocator, shader_path: []const u8) ![:0]const u8 {