コミット: c44b3bd3e05bcfadbab2847a05f9ec81d1015f79 - Saffron (git)

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

コミットメタ情報

• リビジョン: c44b3bd3e05bcfadbab2847a05f9ec81d1015f79 (tree)
• 日時: 2022-03-21 05:09:28
• 作者: AlaskanEmily <emily@alas...>
• コミッター: AlaskanEmily

ログメッセージ

Improve GL version parsing

変更サマリ

• modified: saffron.gl.m

差分

--- a/saffron.gl.m
+++ b/saffron.gl.m
@@ -121,7 +121,7 @@
 
 :- pred opengl_version_string(Ctx, string, io.io, io.io)
     <= saffron.gl.context(Ctx).
-:- mode opengl_version_string(in, uo, di, uo) is det.
+:- mode opengl_version_string(in, out, di, uo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -133,7 +133,7 @@
 
 :- pred shader_model_version_string(Ctx, string, io.io, io.io)
     <= saffron.gl.context(Ctx).
-:- mode shader_model_version_string(in, uo, di, uo) is det.
+:- mode shader_model_version_string(in, out, di, uo) is det.
 
 %-----------------------------------------------------------------------------%
 
@@ -425,54 +425,56 @@ gl_load_function(gl_load_func_ctx(Ctx), Name, MaybeFunc, !IO) :-
 
 %-----------------------------------------------------------------------------%
 
+:- type version_type ---> gl ; glsl.
+
+:- pragma foreign_enum("C", version_type/0, [
+    gl      - "GL_VERSION",
+    glsl    - "GL_SHADING_LANGUAGE_VERSION"
+]).
+
+%-----------------------------------------------------------------------------%
+
+:- pred version_string(version_type, string, io.io, io.io).
+:- mode version_string(in, out, di, uo) is det.
+
 :- pragma foreign_proc("C",
-    opengl_version_string(_Ctx::in, Str::uo, IOi::di, IOo::uo),
-    [will_not_call_mercury, promise_pure, thread_safe, will_not_throw_exception],
+    version_string(Type::in, Str::out, IOi::di, IOo::uo),
+    [will_not_call_mercury, promise_pure, thread_safe, will_not_throw_exception,
+    does_not_affect_liveness, may_duplicate],
     "
-    const void *ver = glGetString(GL_VERSION);
-    if(glGetError() != GL_NO_ERROR || ver == NULL){
-        ver = ""0.0"";
+    const char *ver = (char*)glGetString(Type);
+    if(glGetError() != GL_NO_ERROR || ver == NULL || *ver == 0){
+        Str = ""0.0"";
+    }
+    else{
+        while(*ver == ' ')
+            ver++;
+        MR_Integer len = strspn(ver, ""0123456789."");
+        Str = MR_GC_malloc_atomic(len + 1);
+        memcpy(Str, ver, len + 1);
     }
-    MR_Integer len = strlen(ver);
-    Str = MR_GC_malloc_atomic(len + 1);
-    memcpy(Str, ver, len + 1);
     IOo = IOi;
     ").
 
 %-----------------------------------------------------------------------------%
 
-:- pragma inline(opengl_version/4).
+opengl_version_string(Ctx, Str, !IO) :-
+    saffron.make_current(Ctx, !IO),
+    version_string(gl, Str, !IO).
+
+%-----------------------------------------------------------------------------%
 
 opengl_version(Ctx, saffron.parse_sem_ver(Version), !IO) :-
-    saffron.make_current(Ctx, !IO),
     opengl_version_string(Ctx, Version, !IO).
 
 %-----------------------------------------------------------------------------%
 
-:- pragma foreign_proc("C",
-    shader_model_version_string(_Ctx::in, VersionString::uo, IOi::di, IOo::uo),
-    [will_not_call_mercury, promise_pure, thread_safe, will_not_throw_exception],
-    "
-    const void *version_string;
-    MR_Integer version_string_len;
-    (void)glGetError();
-    version_string = glGetString(GL_SHADING_LANGUAGE_VERSION);
-    if(glGetError() != GL_NO_ERROR || version_string == NULL){
-        version_string = ""0"";
-        version_string_len = 1;
-    }
-    else{
-        version_string_len = strcspn(version_string, "" "");
-    }
-    VersionString = MR_GC_malloc_atomic(version_string_len + 1);
-    memcpy(VersionString, version_string, version_string_len);
-    ((char*)VersionString)[version_string_len] = '\\0';
-    IOo = IOi;
-    ").
+shader_model_version_string(Ctx, Str, !IO) :-
+    saffron.make_current(Ctx, !IO),
+    version_string(glsl, Str, !IO).
 
 %-----------------------------------------------------------------------------%
 
 shader_model_version(Ctx, saffron.parse_sem_ver(Version), !IO) :-
-    saffron.make_current(Ctx, !IO),
     shader_model_version_string(Ctx, Version, !IO).