ffi progress

ffi/gles3-export.c

@@ -1,99 +0,0 @@
-#include "export.h"
-#include "glad.h"
-#include <GLFW/glfw3.h>
-#include <stdbool.h>
-
-// OpenGL constants used below
-unsigned int VERTEX_SHADER = GL_VERTEX_SHADER;
-unsigned int FRAGMENT_SHADER = GL_FRAGMENT_SHADER;
-unsigned int TRIANGLES = GL_TRIANGLES;
-unsigned int STATIC_DRAW = GL_STATIC_DRAW;
-unsigned int DYNAMIC_DRAW = GL_DYNAMIC_DRAW;
-
-// OpenGL functions used below
-void loadGlad() {
-  gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
-  glEnable(GL_DEPTH_TEST);
-}
-
-void viewport(int width, int height) {
-  glViewport(0, 0, width, height);
-}
-
-void clearColor(float r, float g, float b, float a) {
-  glClearColor(r, g, b, a);
-}
-
-void clear() {
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-unsigned int createBuffer() {
-  unsigned int buffer;
-  glGenBuffers(1, &buffer);
-  return buffer;
-}
-
-void bindBuffer(unsigned int buffer) {
-  glBindBuffer(GL_ARRAY_BUFFER, buffer);
-}
-
-void bufferData(float* vector, int vectorLength, unsigned int updateMode) {
-  glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vectorLength, vector, updateMode);
-}
-
-unsigned int createShader(unsigned int shaderType) {
-  return glCreateShader(shaderType);
-}
-
-void shaderSource(unsigned int shader, const char *sourceString) {
-  glShaderSource(shader, 1, &sourceString, NULL);
-}
-
-void compileShader(unsigned int shader) {
-  glCompileShader(shader);
-}
-
-void deleteShader(unsigned int shader) {
-  glDeleteShader(shader);
-}
-
-void vertexAttribPointer(int location, int numVecComponents, int stride, int offset) {
-  glVertexAttribPointer(location, numVecComponents, GL_FLOAT, GL_FALSE, stride * sizeof(float), (void*)offset);
-}
-
-void enableVertexAttribArray(int location) {
-  glEnableVertexAttribArray(location);
-}
-
-unsigned int createProgram() {
-  return glCreateProgram();
-}
-
-void attachShader(unsigned int program, unsigned int shader) {
-  glAttachShader(program, shader);
-}
-
-void linkProgram(unsigned int program) {
-  glLinkProgram(program);
-}
-
-void useProgram(unsigned int program) {
-  glUseProgram(program);
-}
-
-void deleteProgram(unsigned int program) {
-  glDeleteProgram(program);
-}
-
-void drawArrays(unsigned int drawMode, int startIndex, int numVertices) {
-  glDrawArrays(drawMode, startIndex, numVertices);
-}
-
-int getUniformLocation(unsigned int program, const char *uniformName) {
-  glGetUniformLocation(program, uniformName);
-}
-
-void uniform4f(int uniformLocation, float a, float b, float c, float d) {
-  glUniform4f(uniformLocation, a, b, c, d);
-}

ffi/gles3-import.sml

@@ -29,8 +29,8 @@ struct
   val DYNAMIC_DRAW = DYNAMIC_DRAW ()
 
   (* OpenGL functions used. *)
-  val loadGlad = _import "loadGlad" public : unit -> unit;
   val viewport = _import "viewport" public : int * int -> unit;
+  val enableDepthTest = _import "enableDepthTest" : unit -> unit;
 
   val createBuffer = _import "createBuffer" public : unit -> buffer;
   val bindBuffer = _import "bindBuffer" public : buffer -> unit;

ffi/glfw-export.c

@@ -1,6 +1,8 @@
 #include <stdbool.h>
 #define GLFW_INCLUDE_NONE
+#include "glad.h"
 #include <GLFW/glfw3.h>
+#include <stdbool.h>
 
 // GLFW constants used below
 int CONTEXT_VERSION_MAJOR = GLFW_CONTEXT_VERSION_MAJOR;
@@ -44,3 +46,100 @@ void setClipboardString (GLFWwindow *window, const char *copyString) {
   glfwSetClipboardString(window, copyString);
 }
 
+void loadGlad() {
+  gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
+}
+
+// OpenGL constants used below
+unsigned int VERTEX_SHADER = GL_VERTEX_SHADER;
+unsigned int FRAGMENT_SHADER = GL_FRAGMENT_SHADER;
+unsigned int TRIANGLES = GL_TRIANGLES;
+unsigned int STATIC_DRAW = GL_STATIC_DRAW;
+unsigned int DYNAMIC_DRAW = GL_DYNAMIC_DRAW;
+
+// OpenGL functions used below
+void enableDepthTest() {
+  glEnable(GL_DEPTH_TEST);
+}
+
+void viewport(int width, int height) {
+  glViewport(0, 0, width, height);
+}
+
+void clearColor(float r, float g, float b, float a) {
+  glClearColor(r, g, b, a);
+}
+
+void clear() {
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+}
+
+unsigned int createBuffer() {
+  unsigned int buffer;
+  glGenBuffers(1, &buffer);
+  return buffer;
+}
+
+void bindBuffer(unsigned int buffer) {
+  glBindBuffer(GL_ARRAY_BUFFER, buffer);
+}
+
+void bufferData(float* vector, int vectorLength, unsigned int updateMode) {
+  glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vectorLength, vector, updateMode);
+}
+
+unsigned int createShader(unsigned int shaderType) {
+  return glCreateShader(shaderType);
+}
+
+void shaderSource(unsigned int shader, const char *sourceString) {
+  glShaderSource(shader, 1, &sourceString, NULL);
+}
+
+void compileShader(unsigned int shader) {
+  glCompileShader(shader);
+}
+
+void deleteShader(unsigned int shader) {
+  glDeleteShader(shader);
+}
+
+void vertexAttribPointer(int location, int numVecComponents, int stride, int offset) {
+  glVertexAttribPointer(location, numVecComponents, GL_FLOAT, GL_FALSE, stride * sizeof(float), (void*)offset);
+}
+
+void enableVertexAttribArray(int location) {
+  glEnableVertexAttribArray(location);
+}
+
+unsigned int createProgram() {
+  return glCreateProgram();
+}
+
+void attachShader(unsigned int program, unsigned int shader) {
+  glAttachShader(program, shader);
+}
+
+void linkProgram(unsigned int program) {
+  glLinkProgram(program);
+}
+
+void useProgram(unsigned int program) {
+  glUseProgram(program);
+}
+
+void deleteProgram(unsigned int program) {
+  glDeleteProgram(program);
+}
+
+void drawArrays(unsigned int drawMode, int startIndex, int numVertices) {
+  glDrawArrays(drawMode, startIndex, numVertices);
+}
+
+int getUniformLocation(unsigned int program, const char *uniformName) {
+  glGetUniformLocation(program, uniformName);
+}
+
+void uniform4f(int uniformLocation, float a, float b, float c, float d) {
+  glUniform4f(uniformLocation, a, b, c, d);
+}

ffi/glfw-import.sml

@@ -21,4 +21,5 @@ struct
   val waitEvents = _import "waitEvents" public reentrant : unit -> unit;
   val swapBuffers = _import "swapBuffers" public : window -> unit;
   val setClipboardString = _import "setClipboardString" public : window * string -> unit;
+  val loadGlad = _import "loadGlad" public : unit -> unit;
 end

ffi/rgfw-export.c

@@ -27,3 +27,97 @@ bool shouldCloseWindow(RGFW_window* window) {
 void swapBuffers(RGFW_window* window) {
   RGFW_window_swapBuffers_OpenGL(window);
 }
+
+// OpenGL constants used below
+unsigned int VERTEX_SHADER = GL_VERTEX_SHADER;
+unsigned int FRAGMENT_SHADER = GL_FRAGMENT_SHADER;
+unsigned int TRIANGLES = GL_TRIANGLES;
+unsigned int STATIC_DRAW = GL_STATIC_DRAW;
+unsigned int DYNAMIC_DRAW = GL_DYNAMIC_DRAW;
+
+// OpenGL functions used below
+void enableDepthTest() {
+  glEnable(GL_DEPTH_TEST);
+}
+
+void viewport(int width, int height) {
+  glViewport(0, 0, width, height);
+}
+
+void clearColor(float r, float g, float b, float a) {
+  glClearColor(r, g, b, a);
+}
+
+void clear() {
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+}
+
+unsigned int createBuffer() {
+  unsigned int buffer;
+  glGenBuffers(1, &buffer);
+  return buffer;
+}
+
+void bindBuffer(unsigned int buffer) {
+  glBindBuffer(GL_ARRAY_BUFFER, buffer);
+}
+
+void bufferData(float* vector, int vectorLength, unsigned int updateMode) {
+  glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vectorLength, vector, updateMode);
+}
+
+unsigned int createShader(unsigned int shaderType) {
+  return glCreateShader(shaderType);
+}
+
+void shaderSource(unsigned int shader, const char *sourceString) {
+  glShaderSource(shader, 1, &sourceString, NULL);
+}
+
+void compileShader(unsigned int shader) {
+  glCompileShader(shader);
+}
+
+void deleteShader(unsigned int shader) {
+  glDeleteShader(shader);
+}
+
+void vertexAttribPointer(int location, int numVecComponents, int stride, int offset) {
+  glVertexAttribPointer(location, numVecComponents, GL_FLOAT, GL_FALSE, stride * sizeof(float), (void*)offset);
+}
+
+void enableVertexAttribArray(int location) {
+  glEnableVertexAttribArray(location);
+}
+
+unsigned int createProgram() {
+  return glCreateProgram();
+}
+
+void attachShader(unsigned int program, unsigned int shader) {
+  glAttachShader(program, shader);
+}
+
+void linkProgram(unsigned int program) {
+  glLinkProgram(program);
+}
+
+void useProgram(unsigned int program) {
+  glUseProgram(program);
+}
+
+void deleteProgram(unsigned int program) {
+  glDeleteProgram(program);
+}
+
+void drawArrays(unsigned int drawMode, int startIndex, int numVertices) {
+  glDrawArrays(drawMode, startIndex, numVertices);
+}
+
+int getUniformLocation(unsigned int program, const char *uniformName) {
+  glGetUniformLocation(program, uniformName);
+}
+
+void uniform4f(int uniformLocation, float a, float b, float c, float d) {
+  glUniform4f(uniformLocation, a, b, c, d);
+}