コミット: 8f211d9892a54f92bfcbfff5a40d2cd5491e82e7 - Saffron (git)

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

コミットメタ情報

• リビジョン: 8f211d9892a54f92bfcbfff5a40d2cd5491e82e7 (tree)
• 日時: 2022-04-27 11:04:55
• 作者: AlaskanEmily <emily@alas...>
• コミッター: AlaskanEmily

ログメッセージ

Fix support for non-GL3+ systems

変更サマリ

• modified: saffron.gl.buffer.inc
• modified: saffron.gl.buffer.m
• modified: saffron.gl.m
• modified: saffron.gl.shader.csv
• modified: saffron.gl.shader.inc
• modified: saffron.gl.shader.m
• modified: saffron.gl2.m
• modified: saffron.gl_gen.awk

差分

--- a/saffron.gl.buffer.inc
+++ b/saffron.gl.buffer.inc
@@ -62,7 +62,7 @@ struct SaffronGL_BufferCtx{
 #define SAFFRON_GL_LOAD_BUFFER_CTX(GLCTX, CTX) (*(CTX) = 0)
 #else
 #define SAFFRON_GL_BUFFER_FUNC(CTX, X) ((CTX)->X)
-#define SAFFRON_GL_BUFFER_CTX struct SaffronGL_BufferCtx
+#define SAFFRON_GL_BUFFER_CTX struct SaffronGL_BufferCtx*
 int SaffronGL_LoadBufferCtx(MR_Word gl_ctx, struct SaffronGL_BufferCtx **ctx_ptr);
 #define SAFFRON_GL_LOAD_BUFFER_CTX SaffronGL_LoadBufferCtx
 #endif
@@ -80,11 +80,13 @@ int SaffronGL_LoadBufferCtx(MR_Word gl_ctx, struct SaffronGL_BufferCtx **ctx_ptr
         return 0;
     }while(0);
 #define SAFFRON_GL_LOAD_FUNC_BUFFER_ARB(X) SAFFRON_GL_FUNC_LOAD(X, "ARB")
-    if(SaffronGL_SupportsExtension("GL_ARB_vertex_buffer_object")) do{ 
-        SAFFRON_GL_BUFFER_FUNCS(SAFFRON_GL_LOAD_FUNC_BUFFER_ARB)
-        *ctx_ptr = ctx;
-        return 0;
-    }while(0);
+    if(SaffronGL_SupportsExtension(gl_ctx, (MR_String)"GL_ARB_vertex_buffer_object")){
+        do{
+            SAFFRON_GL_BUFFER_FUNCS(SAFFRON_GL_LOAD_FUNC_BUFFER_ARB)
+            *ctx_ptr = ctx;
+            return 0;
+        }while(0);
+    }
     return 1;
 }
 #endif

--- a/saffron.gl.buffer.m
+++ b/saffron.gl.buffer.m
@@ -41,7 +41,8 @@
 %-----------------------------------------------------------------------------%
 
 :- pred create_buffer_ctx(Ctx, maybe.maybe_error(buffer_ctx), io.io, io.io)
-    <= saffron.gl.context(Ctx).
+    <= (saffron.gl.context(Ctx),
+        saffron.gl.supports_extensions(Ctx)).
 :- mode create_buffer_ctx(in, out, di, uo) is det.
 
 %-----------------------------------------------------------------------------%

--- a/saffron.gl.m
+++ b/saffron.gl.m
@@ -155,6 +155,8 @@ typedef char SaffronGLchar;
 
 #endif
 
+# undef SAFFRON_GL_EXPECT_BUFFER
+# undef SAFFRON_GL_EXPECT_SHADER
 /* GL_NV_draw_texture */
 typedef void(APIENTRY*SaffronGL_DrawTextureNV_PROC)(
     GLuint,
@@ -326,7 +328,10 @@ texture_upload_at(_Ctx, Tex, B, X, Y, W, H, !IO) :-
 % existentially type functor which we can pass to a Mercury predicate that will
 % unpack it and invoke the predicate.
 :- type gl_load_func_ctx --->
-    some [Ctx] (gl_load_func_ctx(Ctx) => saffron.context(Ctx)).
+    some [Ctx] (gl_load_func_ctx(Ctx)
+        => (saffron.context(Ctx),
+            saffron.gl.context(Ctx),
+            saffron.gl.supports_extensions(Ctx))).
 
 %-----------------------------------------------------------------------------%
 % A non-higher-typed version of load_function that takes gl_load_func_ctx.
@@ -349,6 +354,47 @@ gl_load_function(gl_load_func_ctx(Ctx), Name, MaybeFunc, !IO) :-
     gl_load_function(in, in, out, di, uo),
     "SaffronGL_LoadFunction").
 
+:- pred gl_version(
+    gl_load_func_ctx,
+    int,
+    int,
+    io.io, io.io).
+:- mode gl_version(
+    in,
+    out,
+    out,
+    di, uo) is det.
+
+gl_version(gl_load_func_ctx(Ctx), Major, Minor, !IO) :-
+    opengl_version(Ctx, MaybeSemVer, !IO),
+    (
+        MaybeSemVer = maybe.ok(SemVer),
+        Major = major(SemVer),
+        Minor = minor(SemVer)
+    ;
+        MaybeSemVer = maybe.error(Error),
+        trace [io(!XIO)] (
+            io.write_string("Error getting OpenGL version: ", !XIO),
+            io.write_string(Error, !XIO),
+            io.nl(!XIO)
+        ),
+        Major = 0,
+        Minor = 0
+    ).
+
+:- pragma foreign_export("C",
+    gl_version(in, out, out, di, uo),
+    "SaffronGL_Version").
+
+:- pred gl_supports_extension(gl_load_func_ctx::in, string::in) is semidet.
+
+gl_supports_extension(gl_load_func_ctx(Ctx), Ext) :-
+    saffron.gl.supports_extension(Ctx, Ext).
+
+:- pragma foreign_export("C",
+    gl_supports_extension(in, in),
+    "SaffronGL_SupportsExtension").
+
 %-----------------------------------------------------------------------------%
 
 :- type version_type ---> gl ; glsl.

--- a/saffron.gl.shader.csv
+++ b/saffron.gl.shader.csv
@@ -1,6 +1,6 @@
 func,CreateShader,GLenum,=GLuint
 func,DeleteShader,GLuint
-func,ShaderSource,GLuint,GLsizei,const SaffronGLchar**,const GLint
+func,ShaderSource,GLuint,GLsizei,const SaffronGLchar**,const GLint*
 func,CompileShader,GLuint
 func,GetShaderiv,GLuint,GLenum,GLint*
 func,GetShaderInfoLog,GLuint,GLsizei,GLsizei*,SaffronGLchar*

--- a/saffron.gl.shader.inc
+++ b/saffron.gl.shader.inc
@@ -23,7 +23,7 @@ typedef void(APIENTRY*SaffronGL_ShaderSource_PROC)(
     GLuint,
     GLsizei,
     const SaffronGLchar**,
-    const GLint);
+    const GLint*);
 #endif
 #ifndef SAFFRON_GL_IMPL
 typedef void(APIENTRY*SaffronGL_CompileShader_PROC)(
@@ -96,7 +96,7 @@ struct SaffronGL_ShaderCtx{
 #define SAFFRON_GL_LOAD_SHADER_CTX(GLCTX, CTX) (*(CTX) = 0)
 #else
 #define SAFFRON_GL_SHADER_FUNC(CTX, X) ((CTX)->X)
-#define SAFFRON_GL_SHADER_CTX struct SaffronGL_ShaderCtx
+#define SAFFRON_GL_SHADER_CTX struct SaffronGL_ShaderCtx*
 int SaffronGL_LoadShaderCtx(MR_Word gl_ctx, struct SaffronGL_ShaderCtx **ctx_ptr);
 #define SAFFRON_GL_LOAD_SHADER_CTX SaffronGL_LoadShaderCtx
 #endif

--- a/saffron.gl.shader.m
+++ b/saffron.gl.shader.m
@@ -25,7 +25,8 @@
 %-----------------------------------------------------------------------------%
 
 :- pred create_shader_ctx(Ctx, maybe.maybe_error(shader_ctx), io.io, io.io)
-    <= saffron.context(Ctx).
+    <= (saffron.gl.context(Ctx),
+        saffron.gl.supports_extensions(Ctx)).
 :- mode create_shader_ctx(in, out, di, uo) is det.
 
 %-----------------------------------------------------------------------------%
@@ -85,7 +86,7 @@
 #include ""saffron.gl.shader.inc""
 ").
 
-:- pragma foreign_decl("C", "
+:- pragma foreign_code("C", "
 #define SAFFRON_GL_IMPL
 #include ""saffron.gl.shader.inc""
 #undef SAFFRON_GL_IMPL

--- a/saffron.gl2.m
+++ b/saffron.gl2.m
@@ -859,6 +859,8 @@ init(Ctx,
     !IO) :-
     
     saffron.make_current(Ctx, !IO),
+    % Get the supports_extension implementation for GL 2 contexts.
+    TempCtx = context(Ctx, maybe.no, maybe.no),
     saffron.gl.shader_model_version(Ctx, MaybeGLSLVersion, !IO),
     % TODO: Should this live inside create_shader_ctx?
     ( if
@@ -866,12 +868,12 @@ init(Ctx,
         saffron.sem_ver_compare(GLSLCmp, GLSLVersion, saffron.sem_ver(1, 20)),
         GLSLCmp \= (<)
     then
-        saffron.gl.shader.create_shader_ctx(Ctx, MaybeErrShaderCtx, !IO),
+        saffron.gl.shader.create_shader_ctx(TempCtx, MaybeErrShaderCtx, !IO),
         MaybeShaderCtx = complete_load_ctx("shader", MaybeErrShaderCtx)
     else
         MaybeShaderCtx = maybe.no
     ),
-    saffron.gl.buffer.create_buffer_ctx(Ctx, MaybeErrBufferCtx, !IO),
+    saffron.gl.buffer.create_buffer_ctx(TempCtx, MaybeErrBufferCtx, !IO),
     MaybeBufferCtx = complete_load_ctx("buffer", MaybeErrBufferCtx),
     init(!IO).
 

--- a/saffron.gl_gen.awk
+++ b/saffron.gl_gen.awk
@@ -87,7 +87,7 @@ $1 == "load" {
     sig = "int SaffronGL_Load" $2 "Ctx(MR_Word gl_ctx, " struct " **ctx_ptr)";
     print("\
 #define SAFFRON_GL_" upper2 "_FUNC(CTX, X) ((CTX)->X)\n\
-#define SAFFRON_GL_" upper2 "_CTX " struct "\n\
+#define SAFFRON_GL_" upper2 "_CTX " struct "*\n\
 " sig ";\n\
 #define SAFFRON_GL_LOAD_" upper2 "_CTX SaffronGL_Load" $2 "Ctx");
     if(core != ""){
@@ -128,11 +128,13 @@ $1 == "load" {
             macro = "SAFFRON_GL_LOAD_FUNC_" upper2 "_" sfx;
             print("\
 #define " macro "(X) SAFFRON_GL_FUNC_LOAD(X, \"" sfx "\")\n\
-    if(SaffronGL_SupportsExtension(\"" ext "\")) do{ \n\
-        SAFFRON_GL_" upper2 "_FUNCS(" macro ")\n\
-        *ctx_ptr = ctx;\n\
-        return 0;\n\
-    }while(0);");
+    if(SaffronGL_SupportsExtension(gl_ctx, (MR_String)\"" ext "\")){\n\
+        do{\n\
+            SAFFRON_GL_" upper2 "_FUNCS(" macro ")\n\
+            *ctx_ptr = ctx;\n\
+            return 0;\n\
+        }while(0);\n\
+    }");
         }
     }
     print("    return 1;\n}");