add platform separation

examples/simple-init.c

@@ -2,6 +2,12 @@
 
 int main() {
     gr_state_init();
+    gr_log_add_file("log.txt");
     gr_window_init(4, 1);
-    gr_window_create(800, 600, "hi");
+    gr_window_create(1920, 1080, "hi");
+
+    while(!gr_window_should_close()) {
+       gr_window_clear(249, 163, 255);
+    }
 }
+

src/Makefile

@@ -18,5 +18,3 @@ $(LIBRARY): $(OBJ) Makefile
 
 clean:
 	rm -rf $(OBJ) $(LIBRARY)
-
-

src/gearlib.h

@@ -21,19 +21,29 @@ typedef intptr_t iptr;
 typedef float_t f32;
 typedef double_t f64;
 
+typedef void* (*gr_load_proc)(const char* name);
+
 #define GRAPI extern
 #define GR_DEFAULT_MAJOR 4
 #define GR_DEFAULT_MINOR 6
 
-GRAPI i32 gr_state_init();
+GRAPI bool gr_state_init();
 #define gr_state_assert() assert(gr_state != NULL && "State not initialized")
 #define gr_state_set(prop, val) gr_state_assert(); gr_state->prop = val
 #define gr_state_get(prop) ({ gr_state_assert(); gr_state->prop; })
 
-GRAPI i32 gr_window_init(i32 major, i32 minor);
+GRAPI bool gr_window_init(i32 major, i32 minor);
-GRAPI i32 gr_window_create(i32 width, i32 height, char* title);
+GRAPI bool gr_window_create(i32 width, i32 height, const char* title);
+GRAPI bool gr_window_should_close();
+GRAPI void gr_window_clear(u8 red, u8 green, u8 blue);
 
-GRAPI i32 gr_log_add_file(char* filename);
+GRAPI const char* gr_platform_get_name();
+GRAPI bool gr_platform_init();
+GRAPI void* gr_platform_create_window(i32 width, i32 height, const char* title);
+GRAPI bool gr_platform_window_should_close();
+GRAPI gr_load_proc gr_platform_get_load_proc();
+
+GRAPI bool gr_log_add_file(char* filename);
 
 typedef struct {
     i32 major;

src/log.c

@@ -1,14 +1,14 @@
 #include <gearlib.h>
 #include <log.c/src/log.h>
 
-i32 gr_log_add_file(char* filename) {
+bool gr_log_add_file(char* filename) {
     FILE* fd = fopen(filename, "w");
     if(fd == NULL) {
         log_error("Couldn't open file \"%s\"", filename);
-        return 1;
+        return false;
     }
 
-    log_add_fp(fd, LOG_INFO);
+    log_add_fp(fd, LOG_TRACE);
     log_info("Added file \"%s\" as logging file", filename);
-    return 0;
+    return true;
 }

src/platforms/glfw.c

@@ -0,0 +1,44 @@
+#ifdef USE_GLFW
+
+#include <GLFW/glfw3.h>
+#include <gearlib.h>
+
+const char* gr_platform_get_name() {
+    return "GLFW";
+}
+
+bool gr_platform_init() {
+    if(glfwInit() != GLFW_TRUE) {
+        return false;
+    }
+
+    return true;
+}
+
+void* gr_platform_create_window(i32 width, i32 height, const char* title) {
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, gr_state_get(major));
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, gr_state_get(minor));
+    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+    glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
+
+    GLFWwindow* window = glfwCreateWindow(width, height, title, NULL, NULL); 
+    if(window == NULL) {
+        glfwTerminate();
+        return NULL;
+    }
+
+    glfwMakeContextCurrent(window);
+    return window;
+}
+
+bool gr_platform_window_should_close() {
+    glfwPollEvents();
+    glfwSwapBuffers(gr_state_get(window));
+    return glfwWindowShouldClose(gr_state_get(window));
+}
+
+gr_load_proc gr_platform_get_load_proc() {
+    return (gr_load_proc)glfwGetProcAddress;
+}
+
+#endif

src/platforms/sdl.c

@@ -0,0 +1,58 @@
+#ifdef USE_SDL
+
+#include <SDL2/SDL.h>
+#include <gearlib.h>
+
+const char* gr_platform_get_name() {
+    return "SDL2";
+}
+
+bool gr_platform_init() {
+    if(SDL_Init(SDL_INIT_VIDEO) != 0) {
+        return false;
+    }
+
+    return true;
+}
+
+void* gr_platform_create_window(i32 width, i32 height, const char* title) {
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+    SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
+    SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, gr_state_get(major));
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, gr_state_get(minor));
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG);
+    
+    SDL_Window* window = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 
+                                          width, height,SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN);
+    if(window == NULL) {
+        SDL_Quit();
+        return NULL;
+    }
+
+    SDL_GL_CreateContext(window);
+    return window;
+}
+
+bool gr_platform_window_should_close() {
+    SDL_Event event;
+    while (SDL_PollEvent(&event)) {
+        if (event.type == SDL_QUIT) {
+            return true;
+        }
+    }
+
+    SDL_GL_SwapWindow(gr_state_get(window));
+    return false;
+}
+
+gr_load_proc gr_platform_get_load_proc() {
+    return (gr_load_proc)SDL_GL_GetProcAddress;
+}
+
+#endif

src/state.c

@@ -4,13 +4,13 @@
 
 gr_state_t* gr_state = NULL;
 
-i32 gr_state_init() {
+bool gr_state_init() {
     if(gr_state != NULL) {
         log_fatal("Init must only be called once");
-        return 1;
+        return false;
     }
 
     gr_state = calloc(1, sizeof(gr_state_t));
     log_info("Created state");
-    return 0;
+    return true;
 }

src/thirdparty/KHR/khrplatform.h

@@ -0,0 +1,311 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2018 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * The master copy of khrplatform.h is maintained in the Khronos EGL
+ * Registry repository at https://github.com/KhronosGroup/EGL-Registry
+ * The last semantic modification to khrplatform.h was at commit ID:
+ *      67a3e0864c2d75ea5287b9f3d2eb74a745936692
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by filing pull requests or issues on
+ * the EGL Registry repository linked above.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
+#   define KHRONOS_STATIC 1
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(KHRONOS_STATIC)
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+     * header compatible with static linking. */
+#   define KHRONOS_APICALL
+#elif defined(_WIN32)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+/*
+ * To support platform where unsigned long cannot be used interchangeably with
+ * inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
+ * Ideally, we could just use (u)intptr_t everywhere, but this could result in
+ * ABI breakage if khronos_uintptr_t is changed from unsigned long to
+ * unsigned long long or similar (this results in different C++ name mangling).
+ * To avoid changes for existing platforms, we restrict usage of intptr_t to
+ * platforms where the size of a pointer is larger than the size of long.
+ */
+#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
+#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
+#define KHRONOS_USE_INTPTR_T
+#endif
+#endif
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef KHRONOS_USE_INTPTR_T
+typedef intptr_t               khronos_intptr_t;
+typedef uintptr_t              khronos_uintptr_t;
+#elif defined(_WIN64)
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+#endif
+
+#if defined(_WIN64)
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */

src/window.c

@@ -1,11 +1,12 @@
 #include <gearlib.h>
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 #include <log.c/src/log.h>
 
-i32 gr_window_init(i32 major, i32 minor) {
+bool gr_window_init(i32 major, i32 minor) {
     if(gr_state->window_initialized == true) {
         log_fatal("Init already called");
-        return 1;
+        return false;
     }
 
     gr_state_set(major, major);
@@ -14,36 +15,49 @@ i32 gr_window_init(i32 major, i32 minor) {
 
     log_info("Initialized for OpenGL %d.%d", major, minor);
 
-    return 0;
+    return true;
 }
 
-i32 gr_window_create(i32 width, i32 height, char* title) {
+bool gr_window_create(i32 width, i32 height, const char* title) {
     if(!gr_state_get(window_initialized)) {
         log_info("Window was not initialized before calling create, defaulting to OpenGL %d.%d", 
                  GR_DEFAULT_MAJOR, GR_DEFAULT_MINOR);
         gr_window_init(GR_DEFAULT_MAJOR, GR_DEFAULT_MINOR);
     }
 
-#ifdef USE_GLFW
+    const char* platform = gr_platform_get_name();
-    if(glfwInit() != GLFW_TRUE) {
+    if(!gr_platform_init()) {
-        log_fatal("GLFW failed to initialize");
+        log_fatal("%s failed to initialize", platform);
-    } else {
+        return false;
-        log_info("GLFW initialized successfully");
     }
 
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, gr_state_get(major));
+    log_info("%s initialized successfully", platform);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, gr_state_get(minor));
-    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-    glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
 
-    gr_state_set(window, glfwCreateWindow(width, height, title, NULL, NULL));
+    void* window = gr_platform_create_window(width, height, title);
-    if(gr_state_get(window) == NULL) {
+    if(window == NULL) {
-        log_fatal("Failed to create window");
+        log_fatal("%s failed to create window", platform);
-        return 1;
+        return false;
-    } else {
-        log_info("Window created successfully");
     }
-#endif
 
-    return 0;
+    log_info("%s window created successfully", platform);
+    log_debug("Window pointer: %p", window);
+
+    gr_state_set(window, window);
+
+    if(!gladLoadGLLoader(gr_platform_get_load_proc())) {
+        log_fatal("Glad failed to load");
+        return false;
+    }
+    log_info("Glad loaded successfully");
+
+    return true;
+}
+
+bool gr_window_should_close() {
+    return gr_platform_window_should_close();
+}
+
+void gr_window_clear(u8 red, u8 green, u8 blue) {
+    glClearColor(red / 255.0f, green / 255.0f, blue / 255.0f, 1.0f);
+    glClear(GL_COLOR_BUFFER_BIT);
 }