コミット: 4e6c5240a2e1bc4f3cdfa265efc31e302364d2a9 - Saffron (git)

Graphics library for Mercury, including OpenGL bindings, TGA image reading, and X11, Win32, and SDL2 windowing and input.

コミットメタ情報

• リビジョン: 4e6c5240a2e1bc4f3cdfa265efc31e302364d2a9 (tree)
• 日時: 2022-04-01 11:53:57
• 作者: AlaskanEmily <emily@alas...>
• コミッター: AlaskanEmily

ログメッセージ

Handle Glow failures

変更サマリ

• modified: demo/saffron_cube_demo.m
• modified: glow
• modified: util/glow/saffron_glow.m

差分

--- a/demo/saffron_cube_demo.m
+++ b/demo/saffron_cube_demo.m
@@ -238,81 +238,98 @@ cube_geometry = [
 main(!IO) :-
     % Load the demo image
     saffron_tga.load_path("res/crate.tga", ImageResult, !IO),
+    
+    % The Mercury compiler is smart enough to see that the error branch will
+    % throw, and will unify the result outside that disjunction.
     (
         ImageResult = io.error(Err),
         exception.throw(exception.software_error(io.error_message(Err)))
     ;
-        ImageResult = io.ok({BMP, TexW, TexH}),
-        
-        W = 640,
-        H = 480,
-        Title = "Saffron Cube Demo",
-        
-        % Create the window and OpenGL context
-        saffron_glow.viewport_size(W, H, WinW, WinH),
-        saffron_glow.create_window(WinW, WinH, Title, Win, !IO),
-        saffron_glow.create_context(Win, 1, 3, GlowCtx, !IO),
-        
-        % Show the window.
-        % Depending on the Glow backend, this *might* need to happen after
-        % creating the OpenGL context.
-        saffron_glow.show_window(Win, !IO),
-        
-        % Using the backend-specific type is what determines what backend we
-        % will use.
-        saffron.gl2.init(GlowCtx, Ctx, !IO),
-        
-        saffron.gl.shader_model_version_string(Ctx, VersionString, !IO),
-        io.write_string("GLSL Version: ", !IO),
-        io.write_string(VersionString, !IO),
-        io.nl(!IO),
-        
-        % Set the ortho mode
-        AR = float(W) / float(H),
-        
-        Matrix = matrix.ortho(-AR, AR, 1.0, -1.0, -1000.0, 1000.0),
-        saffron.draw.set_matrix(Ctx, Matrix, !IO),
-        
-        saffron.draw.transform(Ctx, matrix.scale(0.4, 0.4, 0.4), !IO),
-        
-        % foo(!IO),
-        
-        % Upload the image to create a texture.
-        saffron.gl.create_texture_from_bitmap(Ctx, BMP, TexW, TexH, Texture, !IO),
-        Faces = cube_geometry,
-        
-        % Upload geometry to buffers.
-        % Most programs would probably want to use index buffers for a shape
-        % like this with mostly shared geometry.
-        list.map_foldl(
-            saffron.geometry.create_buffer_list(Ctx),
-            % list.map(list.reverse, Faces), FaceBuffers,
-            Faces, FaceBuffers,
-            !IO),
-        
-        % Construct the faces.
-        % This *could* be done as one large, wound shape, but a majority of
-        % programs will be loading meshes that will contain individual hulls/
-        % faces that will need to be constructed in this way.
-        list.map_foldl(
-            saffron.geometry.create_shape2(Ctx, saffron.geometry.triangle_strip, Texture),
-            FaceBuffers, Shapes,
-            !IO),
-        
-        % Construct the shape.
-        saffron.draw.create_group_list(Ctx, Shapes, Group, !IO),
-        
-        % Run the engine.
-        run(Ctx, Win, Group, !IO),
-        
-        % Cleanup
-        saffron.destroy(Ctx, Group, !IO),
-        list.foldl(saffron.destroy(Ctx), Shapes, !IO),
-        list.foldl(saffron.destroy(Ctx), FaceBuffers, !IO),
-        saffron.destroy(Ctx, Texture, !IO),
-        
-        % The window and context will be garbage-collected?
-        % I wrote the bindings years ago, I don't remember the intention :(
-        saffron_glow.hide_window(Win, !IO)
-    ).
+        ImageResult = io.ok({BMP, TexW, TexH})
+    ),
+    W = 640,
+    H = 480,
+    Title = "Saffron Cube Demo",
+    
+    % Create the window and OpenGL context
+    saffron_glow.viewport_size(W, H, WinW, WinH),
+    saffron_glow.create_window(WinW, WinH, Title, WinRes, !IO),
+    (
+        WinRes = io.error(Err),
+        exception.throw(exception.software_error(io.error_message(Err)))
+    ;
+        WinRes = io.ok(Win)
+    ),
+    saffron_glow.create_context(Win, 1, 3, GlowCtxRes, !IO),
+    (
+        GlowCtxRes = io.error(Err),
+        exception.throw(exception.software_error(io.error_message(Err)))
+    ;
+        GlowCtxRes = io.ok(GlowCtx)
+    ),
+    
+    % Show the window.
+    % Depending on the Glow backend, this *might* need to happen after creating
+    % the OpenGL context, but not necessarily.
+    saffron_glow.show_window(Win, !IO),
+    
+    % Using the backend-specific type is what determines what backend Glow is
+    % using.
+    saffron.gl2.init(GlowCtx, Ctx, !IO),
+    
+    saffron.gl.opengl_version_string(Ctx, GLVersion, !IO),
+    io.write_string("OpenGL Version: ", !IO),
+    io.write_string(GLVersion, !IO),
+    io.nl(!IO),
+    
+    saffron.gl.shader_model_version_string(Ctx, GLSLVersion, !IO),
+    io.write_string("GLSL Version: ", !IO),
+    io.write_string(GLSLVersion, !IO),
+    io.nl(!IO),
+    
+    % Set the ortho mode
+    AR = float(W) / float(H),
+    
+    Matrix = matrix.ortho(-AR, AR, 1.0, -1.0, -1000.0, 1000.0),
+    saffron.draw.set_matrix(Ctx, Matrix, !IO),
+    
+    saffron.draw.transform(Ctx, matrix.scale(0.4, 0.4, 0.4), !IO),
+    
+    % Upload the image to create a texture.
+    saffron.gl.create_texture_from_bitmap(Ctx, BMP, TexW, TexH, Texture, !IO),
+    Faces = cube_geometry,
+    
+    % Upload geometry to buffers.
+    % Most programs would probably want to use index buffers for a shape like
+    % this with mostly shared geometry.
+    list.map_foldl(
+        saffron.geometry.create_buffer_list(Ctx),
+        Faces, FaceBuffers,
+        !IO),
+    
+    % Construct the faces.
+    % This *could* be done as one large, wound shape, but the majority of
+    % programs will be loading meshes that will contain individual hulls/faces
+    % that will need to be constructed in this way.
+    list.map_foldl(
+        saffron.geometry.create_shape2(Ctx, saffron.geometry.triangle_strip, Texture),
+        FaceBuffers,
+        Shapes,
+        !IO),
+    
+    % Construct the shape.
+    saffron.draw.create_group_list(Ctx, Shapes, Group, !IO),
+    
+    % Run the engine.
+    run(Ctx, Win, Group, !IO),
+    
+    % Cleanup
+    saffron.destroy(Ctx, Group, !IO),
+    list.foldl(saffron.destroy(Ctx), Shapes, !IO),
+    list.foldl(saffron.destroy(Ctx), FaceBuffers, !IO),
+    saffron.destroy(Ctx, Texture, !IO),
+    
+    % The window and context will be garbage-collected?
+    % I wrote the bindings years ago, I don't remember the intention :(
+    saffron_glow.hide_window(Win, !IO).
 

--- a/glow
+++ b/glow
@@ -1 +1 @@
-Subproject commit 95e81a9a328299d5c8193ec1cd5180bc4e2a015d
+Subproject commit e4dad582e2f58b9ae1e55247257c97c25a9f12bb

--- a/util/glow/saffron_glow.m
+++ b/util/glow/saffron_glow.m
@@ -21,6 +21,11 @@
 
 %-----------------------------------------------------------------------------%
 
+:- inst io_res_uniq == unique(io.ok(unique) ; io.error(ground)).
+:- mode io_res_uo == (free >> io_res_uniq).
+
+%-----------------------------------------------------------------------------%
+
 :- type window.
 
 %-----------------------------------------------------------------------------%
@@ -32,9 +37,9 @@
 :- pred viewport_size(int::in, int::in, int::uo, int::uo) is det.
 
 %-----------------------------------------------------------------------------%
-% create_window(Width, Height, Title, Win, !IO)
-:- pred create_window(int, int, string, window, io.io, io.io).
-:- mode create_window(in, in, in, uo, di, uo) is det.
+% create_window(Width, Height, Title, WinRes, !IO)
+:- pred create_window(int, int, string, io.res(window), io.io, io.io).
+:- mode create_window(in, in, in, io_res_uo, di, uo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -52,9 +57,9 @@
 :- mode get_window_event(in, uo, di, uo) is det.
 
 %-----------------------------------------------------------------------------%
-% create_context(Win, GLMajor, GLMinor, Ctx, !IO)
-:- pred create_context(window, int, int, context, io.io, io.io).
-:- mode create_context(in, in, in, uo, di, uo) is det.
+% create_context(Win, GLMajor, GLMinor, CtxRes, !IO)
+:- pred create_context(window, int, int, io.res(context), io.io, io.io).
+:- mode create_context(in, in, in, io_res_uo, di, uo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -197,13 +202,35 @@ SAFFRON_GLOW_SPECIAL_KEY_CASE_EX(GLOW_ ## NAME, SAFFRON_KEY_ ## NAME)
 
 %-----------------------------------------------------------------------------%
 
+:- func create_window_ok(window::di) = (io.res(window)::uo) is det.
+create_window_ok(Win) = io.ok(Win).
+:- pragma foreign_export("C",
+    create_window_ok(di) = (uo),
+    "SaffronGlow_CreateWindowOK").
+
+%-----------------------------------------------------------------------------%
+
+:- func create_window_error = (io.res(window)::io_res_uo) is det.
+create_window_error = io.error(io.make_io_error("Could not create Glow window")).
+:- pragma foreign_export("C",
+    create_window_error = (io_res_uo),
+    "SaffronGlow_CreateWindowError").
+
+%-----------------------------------------------------------------------------%
+
 :- pragma foreign_proc("C",
-    create_window(W::in, H::in, Title::in, Win::uo, IOi::di, IOo::uo),
+    create_window(W::in, H::in, Title::in, WinRes::io_res_uo, IOi::di, IOo::uo),
     [promise_pure, will_not_call_mercury, will_not_throw_exception, thread_safe,
     tabled_for_io, may_duplicate],
     "
-        Win = MR_GC_malloc_atomic(Glow_WindowStructSize());
-        Glow_CreateWindow(Win, W, H, Title, 0);
+        struct Glow_Window *win = MR_GC_malloc_atomic(Glow_WindowStructSize());
+        if(Glow_CreateWindow(win, W, H, Title, 0) == 0){
+            WinRes = SaffronGlow_CreateWindowOK(win);
+        }
+        else{
+            MR_GC_free(win);
+            WinRes = SaffronGlow_CreateWindowError();
+        }
         IOo = IOi;
     ").
 
@@ -326,13 +353,37 @@ SAFFRON_GLOW_SPECIAL_KEY_CASE_EX(GLOW_ ## NAME, SAFFRON_KEY_ ## NAME)
 
 %-----------------------------------------------------------------------------%
 
+:- func create_context_ok(context::di) = (io.res(context)::uo) is det.
+create_context_ok(Ctx) = io.ok(Ctx).
+:- pragma foreign_export("C",
+    create_context_ok(di) = (uo),
+    "SaffronGlow_CreateContextOK").
+
+%-----------------------------------------------------------------------------%
+
+:- func create_context_error = (io.res(context)::io_res_uo) is det.
+create_context_error = io.error(io.make_io_error("Could not create Glow context")).
+:- pragma foreign_export("C",
+    create_context_error = (io_res_uo),
+    "SaffronGlow_CreateContextError").
+
+%-----------------------------------------------------------------------------%
+
 :- pragma foreign_proc("C",
-    create_context(Win::in, Major::in, Minor::in, Ctx::uo, IOi::di, IOo::uo),
+    create_context(Win::in, Major::in, Minor::in, CtxRes::io_res_uo, IOi::di, IOo::uo),
     [promise_pure, will_not_call_mercury, will_not_throw_exception, thread_safe,
     tabled_for_io, may_duplicate],
     "
-        Ctx = MR_GC_malloc_atomic(Glow_ContextStructSize());
-        Glow_CreateContext(Win, NULL, Major, Minor, Ctx);
+        struct Glow_Context *ctx =
+            MR_GC_malloc_atomic(Glow_ContextStructSize());
+        if(Glow_CreateContext(Win, NULL, Major, Minor, ctx) == 0){
+            CtxRes = SaffronGlow_CreateContextOK(ctx);
+        }
+        else{
+            MR_GC_free(ctx);
+            CtxRes = SaffronGlow_CreateContextError();
+        }
+
         IOo = IOi;
     ").