things

client/main.c

@@ -46,7 +46,6 @@ int main(int argc, char** argv){
 	param.tick = tick;
 	param.get_tick = MwTimeGetTick;
 	param.sleep = MwTimeSleep;
-	param.gl_getprocaddress = gl_getprocaddress;
 	param.gl_swapbuffer = gl_swapbuffer;
 
 	GBInit();

engine/CMakeLists.txt

@@ -18,7 +18,7 @@ add_subdirectory(net)
 
 file(GLOB GearBox_SRC src/*.c)
 
-add_library(GearBox SHARED ${GearBox_SRC} external/glad/src/glad.c)
+add_library(GearBox SHARED ${GearBox_SRC})
 target_include_directories(GearBox PUBLIC include external/glad/include)
 target_compile_definitions(GearBox PRIVATE _GEARBOX)
 target_link_libraries(GearBox PRIVATE gbnet)
@@ -27,6 +27,11 @@ target_link_libraries(GearBox PRIVATE m)
 endif()
 
 install_target(GearBox)
+install(
+	DIRECTORY include/
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	FILES_MATCHING PATTERN "*.h"
+)
 
 add_subdirectory(tools)
 

engine/external/glad/include/KHR/khrplatform.h

@@ -1,311 +0,0 @@
-#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_ */

engine/include/GearBox/Foundation.h

@@ -10,5 +10,6 @@
 #include <GearBox/Client.h>
 #include <GearBox/Server.h>
 #include <GearBox/Math.h>
+#include <GearBox/GL.h>
 
 #endif

engine/include/GearBox/GL.h

@@ -0,0 +1,20 @@
+#ifndef __GEARBOX_GL_H__
+#define __GEARBOX_GL_H__
+
+#include <GearBox/MachDep.h>
+#include <GearBox/TypeDefs.h>
+
+#include <GearBox/GL/GL.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* gl_shader.c */
+GBDECL int GBGLShaderPrepare(GLuint* shader, const char* vs, const char* fs);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

engine/include/GearBox/TypeDefs.h

@@ -13,7 +13,6 @@ typedef void* GBServer;
 typedef void* GBEngine;
 #endif
 
-typedef void* (*GBGLGetProcAddressCallback)(const char* name);
 typedef void (*GBGLSwapBufferCallback)(void);
 typedef void (*GBReadyCallback)(int width, int height);
 typedef void (*GBTickCallback)(void);
@@ -22,9 +21,11 @@ typedef void (*GBSleepCallback)(int ms);
 
 #ifdef _GEARBOX
 struct _GBClient {
+	GBEngine engine;
 };
 
 struct _GBServer {
+	GBEngine engine;
 };
 
 struct _GBEngine {
@@ -42,14 +43,13 @@ struct _GBVersion {
 };
 
 struct _GBEngineParam {
-	int			   client;
-	int			   server;
-	GBGLGetProcAddressCallback gl_getprocaddress;
-	GBGLSwapBufferCallback	   gl_swapbuffer;
-	GBReadyCallback		   ready;
-	GBTickCallback		   tick;
-	GBGetTickCallback	   get_tick;
-	GBSleepCallback		   sleep;
+	int		       client;
+	int		       server;
+	GBGLSwapBufferCallback gl_swapbuffer;
+	GBReadyCallback	       ready;
+	GBTickCallback	       tick;
+	GBGetTickCallback      get_tick;
+	GBSleepCallback	       sleep;
 };
 
 #endif

engine/src/client.c

@@ -7,6 +7,8 @@ GBClient GBClientCreate(GBEngine engine) {
 
 	memset(client, 0, sizeof(*client));
 
+	client->engine = engine;
+
 	GBLog(GBLogInfo, "Creating client");
 
 	return client;

engine/src/core.c

@@ -4,8 +4,7 @@
 #include <GearBox/Log.h>
 #include <GearBox/Client.h>
 #include <GearBox/Server.h>
-
-#include <glad/glad.h>
+#include <GearBox/GL.h>
 
 void GBInit(void) {
 	GBVersion version;
@@ -13,6 +12,8 @@ void GBInit(void) {
 	GBVersionGet(&version);
 
 	GBLog(GBLogInfo, "GearBox Engine %s", version.string);
+
+	gload_init();
 }
 
 GBEngine GBEngineCreate(GBEngineParam* param) {
@@ -27,10 +28,6 @@ GBEngine GBEngineCreate(GBEngineParam* param) {
 		param->ready(1024, 768);
 	}
 
-	if(param->gl_getprocaddress != NULL) {
-		gladLoadGLLoader(param->gl_getprocaddress);
-	}
-
 	if(engine != NULL && param->client && (engine->client = GBClientCreate(engine)) == NULL) {
 		GBLog(GBLogError, "Failed to create client");
 
@@ -65,13 +62,12 @@ void GBEngineDestroy(GBEngine engine) {
 void GBEngineParamInit(GBEngineParam* param) {
 	memset(param, 0, sizeof(*param));
 
-	param->server		 = 0;
-	param->client		 = 1;
-	param->gl_getprocaddress = NULL;
-	param->gl_swapbuffer	 = NULL;
-	param->ready		 = NULL;
-	param->sleep		 = NULL;
-	param->get_tick		 = NULL;
+	param->server	     = 0;
+	param->client	     = 1;
+	param->gl_swapbuffer = NULL;
+	param->ready	     = NULL;
+	param->sleep	     = NULL;
+	param->get_tick	     = NULL;
 }
 
 void GBEngineLoop(GBEngine engine) {
@@ -90,8 +86,8 @@ void GBEngineLoop(GBEngine engine) {
 	}
 
 	while(1) {
-		GBClientStep(engine->client);
-		GBServerStep(engine->server);
+		if(engine->client != NULL) GBClientStep(engine->client);
+		if(engine->server != NULL) GBServerStep(engine->server);
 
 		if(engine->param->tick != NULL) engine->param->tick();
 

engine/src/gl_shader.c

@@ -0,0 +1,108 @@
+#include <GearBox/GL.h>
+
+static void err(const char* path, GLuint shader) {
+	GLint len, ret;
+	char* e;
+
+	glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &len);
+
+	e      = malloc(len);
+	e[len] = 0;
+
+	glGetShaderInfoLog(shader, len, &ret, e);
+
+	fprintf(stderr, "%s: %s\n", path, e);
+
+	free(e);
+}
+
+int GBGLShaderPrepare(GLuint* shader, const char* vs, const char* fs) {
+	GLuint vsi;
+	GLuint fsi;
+	FILE*  f;
+	int    vsl = 0;
+	int    fsl = 0;
+	char*  vss;
+	char*  fss;
+	GLint  st;
+
+	if((f = fopen(vs, "rb")) != NULL) {
+		fseek(f, 0, SEEK_END);
+		vsl = ftell(f);
+		fseek(f, 0, SEEK_SET);
+
+		vss = malloc(vsl + 1);
+		fread(vss, vsl, 1, f);
+		vss[vsl] = 0;
+
+		fclose(f);
+	} else {
+		return 0;
+	}
+
+	if((f = fopen(fs, "rb")) != NULL) {
+		fseek(f, 0, SEEK_END);
+		fsl = ftell(f);
+		fseek(f, 0, SEEK_SET);
+
+		fss = malloc(fsl + 1);
+		fread(fss, fsl, 1, f);
+		fss[fsl] = 0;
+
+		fclose(f);
+	} else {
+		free(vss);
+
+		return 0;
+	}
+
+	vsi = glCreateShader(GL_VERTEX_SHADER);
+	fsi = glCreateShader(GL_FRAGMENT_SHADER);
+
+	glShaderSource(vsi, 1, (const GLchar**)&vss, NULL);
+	glShaderSource(fsi, 1, (const GLchar**)&fss, NULL);
+
+	glCompileShader(vsi);
+	glGetShaderiv(vsi, GL_COMPILE_STATUS, &st);
+	if(!st) {
+		err(vs, vsi);
+
+		glDeleteShader(vsi);
+		glDeleteShader(fsi);
+		free(vss);
+		free(fss);
+		return 0;
+	}
+
+	glCompileShader(fsi);
+	glGetShaderiv(fsi, GL_COMPILE_STATUS, &st);
+	if(!st) {
+		err(fs, fsi);
+
+		glDeleteShader(vsi);
+		glDeleteShader(fsi);
+		free(vss);
+		free(fss);
+		return 0;
+	}
+
+	free(vss);
+	free(fss);
+
+	*shader = glCreateProgram();
+
+	glAttachShader(*shader, vsi);
+	glAttachShader(*shader, fsi);
+
+	glDeleteShader(vsi);
+	glDeleteShader(fsi);
+
+	glLinkProgram(*shader);
+	glGetProgramiv(*shader, GL_LINK_STATUS, &st);
+	if(!st) {
+		glDeleteProgram(*shader);
+		return 0;
+	}
+
+	return 1;
+}

engine/src/gload.c

@@ -0,0 +1,2 @@
+#define GLOAD_IMPLEMENTATION
+#include <GearBox/GL/GL.h>

engine/src/server.c

@@ -7,6 +7,8 @@ GBServer GBServerCreate(GBEngine engine) {
 
 	memset(server, 0, sizeof(*server));
 
+	server->engine = engine;
+
 	GBLog(GBLogInfo, "Creating server");
 
 	return server;

format.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-clang-format --verbose -i `find engine/src engine/include engine/net engine/tools -name "*.c" -or -name "*.h"`
+clang-format --verbose -i `find engine/src engine/include engine/net engine/tools '(' -name "*.c" -or -name "*.h" ')' -and -not -name "stb_*.h" | sed 's%engine/include/GearBox/GL/GL.h%%g'`