things

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;