Moved #version definition to c code and added config option for enabling/disabling vsync

assets/shaders/blinn_phong.frag

@@ -1,4 +1,4 @@
-//include fog.glsl common.glsl commonFrag.glsl version.glsl
+//include fog.glsl common.glsl commonFrag.glsl 
 
 struct Light
 {

assets/shaders/blinn_phong.vert

@@ -1,4 +1,4 @@
-//include commonVert.glsl version.glsl
+//include commonVert.glsl
 
 void main()
 {

assets/shaders/debug.frag

@@ -1,5 +1,3 @@
-//include version.glsl
-
 uniform vec4 debug_color;
 
 out vec4 frag_color;

assets/shaders/debug.vert

@@ -1,5 +1,3 @@
-//include version.glsl
-
 uniform mat4 mvp;
 
 in vec3 vPosition;

assets/shaders/deferred_light.frag

@@ -1,5 +1,3 @@
-//include version.glsl
-
 in vec2 uv;
 
 out vec4 frag_color;

assets/shaders/deferred_light.vert

@@ -1,5 +1,3 @@
-//include version.glsl
-
 in vec2 vPosition;
 in vec2 vUV;
 

assets/shaders/fbo.frag

@@ -1,5 +1,3 @@
-//include version.glsl
-
 in vec2 uv;
 
 out vec4 frag_color;

assets/shaders/fbo.vert

@@ -1,5 +1,3 @@
-//include version.glsl
-
 in vec2 vPosition;
 in vec2 vUV;
 

assets/shaders/gui.frag

@@ -1,5 +1,3 @@
-//include version.glsl
-
 in vec2 uv;
 in vec4 color;
 

assets/shaders/gui.vert

@@ -1,5 +1,3 @@
-//include version.glsl
-
 uniform mat4 proj_mat;
 
 in vec2 vPosition;

assets/shaders/im_geom.frag

@@ -1,5 +1,3 @@
-//include version.glsl
-
 uniform vec4 geom_color;
 
 out vec4 frag_color;

assets/shaders/im_geom.vert

@@ -1,5 +1,3 @@
-//include version.glsl
-
 uniform mat4 mvp;
 
 in vec3 vPosition;

assets/shaders/phong.frag

@@ -1,4 +1,4 @@
-//include fog.glsl phongCommon.glsl common.glsl commonFrag.glsl version.glsl 
+//include fog.glsl phongCommon.glsl common.glsl commonFrag.glsl 
 
 void main()
 {

assets/shaders/phong.vert

@@ -1,4 +1,4 @@
-//include commonVert.glsl version.glsl
+//include commonVert.glsl
 
 void main()
 {

assets/shaders/phongTextured.frag

@@ -1,4 +1,4 @@
-//include fog.glsl phongCommon.glsl common.glsl commonFrag.glsl version.glsl 
+//include fog.glsl phongCommon.glsl common.glsl commonFrag.glsl 
 
 uniform sampler2D sampler;
 

assets/shaders/quad.frag

@@ -1,5 +1,3 @@
-#version 130
-
 in vec2 uv;
 
 out vec4 fragColor;

assets/shaders/quad.vert

@@ -1,5 +1,3 @@
-#version 130
-
 in vec2 vPosition;
 in vec2 vUV;
 

assets/shaders/simple.frag

@@ -1,5 +1,3 @@
-#version 130
-
 uniform sampler2D sampler;
 
 in  vec2 uv;

assets/shaders/simple.vert

@@ -1,5 +1,3 @@
-#version 130
-
 in vec3 vPosition;
 in vec2 vUV;
 

assets/shaders/sprite.frag

@@ -1,5 +1,3 @@
-//include version.glsl
-
 in vec2 uv;
 in vec4 color;
 

assets/shaders/sprite.vert

@@ -1,5 +1,3 @@
-//include version.glsl
-
 uniform mat4 mvp;
 
 in vec2 vPosition;

assets/shaders/unshaded.frag

@@ -1,4 +1,4 @@
-//include fog.glsl common.glsl commonFrag.glsl version.glsl
+//include fog.glsl common.glsl commonFrag.glsl
 
 uniform sampler2D diffuse_texture;
 

assets/shaders/unshaded.vert

@@ -1,4 +1,4 @@
-//include commonVert.glsl version.glsl
+//include commonVert.glsl
 
 void main()
 {

assets/shaders/unshaded_textured.frag

@@ -1,4 +1,4 @@
-//include fog.glsl commonFrag.glsl common.glsl version.glsl
+//include fog.glsl commonFrag.glsl common.glsl 
 
 uniform sampler2D sampler;
 

assets/shaders/unshaded_textured.vert

@@ -1,4 +1,4 @@
-//include commonVert.glsl version.glsl
+//include commonVert.glsl 
 
 void main()
 {

assets/shaders/version.glsl

@@ -1 +0,0 @@
-#version 330

src/game/shader.c

@@ -13,10 +13,11 @@
 #include <string.h>
 #include <assert.h>
 
+#define MAX_INCLUDE_LINE_LEN 256
+
 static uint* shader_list;
 static int*  empty_indices;
-
+static const char* GLSL_VERSION_STR = "#version 330\n";
-#define MAX_INCLUDE_LINE_LEN 256
 
 void debug_print_shader(const char* shaderText)
 {
@@ -93,17 +94,11 @@ int shader_create(const char* vert_shader_name, const char* frag_shader_name)
 	vert_source = run_preprocessor(vert_source);		
 	frag_source = run_preprocessor(frag_source);
 		
-	GLint v_size = (GLint)strlen(vert_source);
+    const char* vert_sourcePtr[2] = { GLSL_VERSION_STR, vert_source };
-	GLint f_size = (GLint)strlen(frag_source);
+    const char* frag_sourcePtr[2] = { GLSL_VERSION_STR, frag_source };
-		
-	const char* vert_sourcePtr = vert_source;
-	const char* frag_sourcePtr = frag_source;
-		
-	const GLint* vert_size = &v_size;
-	const GLint* frag_size = &f_size;
 		
-	GL_CHECK(glShaderSource(vert_shader, 1, &vert_sourcePtr, vert_size));
+	GL_CHECK(glShaderSource(vert_shader, 2, &vert_sourcePtr, NULL));
-	GL_CHECK(glShaderSource(frag_shader, 1, &frag_sourcePtr, frag_size));
+	GL_CHECK(glShaderSource(frag_shader, 2, &frag_sourcePtr, NULL));
 
 	GL_CHECK(glCompileShader(vert_shader));
 	GL_CHECK(glCompileShader(frag_shader));

src/system/config_vars.c

@@ -15,6 +15,7 @@ void config_vars_init(struct Hashmap* cvars)
     /* Initialize with default values incase there is no config file */
     hashmap_int_set(cvars,   "render_width",                 1280);
     hashmap_int_set(cvars,   "render_height",                720);
+    hashmap_bool_set(cvars,  "vsync_enabled",                true);
     hashmap_int_set(cvars,   "fog_mode",                     0);
     hashmap_vec3_setf(cvars, "fog_color",                    0.9f, 0.2f, 0.2f);
     hashmap_float_set(cvars, "fog_density",                  0.1f);

src/system/main.c

@@ -80,7 +80,8 @@ bool init(void)
     int  height      = hashmap_int_get(cvars,  "render_height");
     int  msaa        = hashmap_bool_get(cvars, "msaa_enabled");
     int  msaa_levels = hashmap_int_get(cvars,  "msaa_levels");
-    window = window_create("Symmetry", width, height, msaa, msaa_levels);
+    bool vsync       = hashmap_bool_get(cvars, "vsync_enabled");
+    window = window_create("Symmetry", width, height, msaa, msaa_levels, vsync);
     if(!window)
     {
         log_error("main:init", "Window creation failed");

src/system/platform.c

@@ -18,7 +18,7 @@ struct Window
     bool          is_fullscreen;
 };
 
-struct Window* window_create(const char* title, int width, int height, int msaa, int msaa_levels)
+struct Window* window_create(const char* title, int width, int height, int msaa, int msaa_levels, bool vsync)
 {
     struct Window* new_window = NULL;
     if(!new_window)
@@ -83,7 +83,8 @@ struct Window* window_create(const char* title, int width, int height, int msaa,
     SDL_Window* current_window = SDL_GL_GetCurrentWindow();
     SDL_GLContext current_context = SDL_GL_GetCurrentContext();
     SDL_GL_MakeCurrent((SDL_Window*)new_window->sdl_window, new_window->gl_context);
-    SDL_GL_SetSwapInterval(0);	/* 0: Vsync disabled, 1: Vsync enabled*/
+    
+    SDL_GL_SetSwapInterval(vsync ? 1 : 0);	/* 0: Vsync disabled, 1: Vsync enabled*/
     if(current_window && current_context) SDL_GL_MakeCurrent(current_window, current_context);
 
     int major = 0, minor = 0;

src/system/platform.h

@@ -14,7 +14,7 @@ enum Video_Drivers_Linux
 // Window Related functions
 struct Window;
 
-struct Window* window_create(const char* title, int width, int height, int msaa, int msaa_levels);
+struct Window* window_create(const char* title, int width, int height, int msaa, int msaa_levels, bool vsync);
 void           window_destroy(struct Window* window);
 void           window_show(struct Window* window);
 void           window_hide(struct Window* window);

todo.txt

@@ -1,4 +1,7 @@
 Todo:
+	- Move MAX_LIGHTS shader definition from inside the shader to be dynamically defined and added to the shader code when it is compiled 
+      to reduce inconsistencies
+	- Fix bug with blinn shader reaching maximum uniform number on mac
 	- Fix Deployment target issue in xcode build on macos 
 	- Implement/Fix copying libraries to executable folder after build completes on mac os
 	- Fix symlink issue in genie for macos which interferes with fopen operations
@@ -116,6 +119,7 @@ Bugs:
 	- Fix hang on fullscreen toggle
 	- Fix axis lines not aligning with grid lines
 	- Fix arc angles resetting when rotating
+	- Fix shader preprocessor failing when the file in //include directive is empty
 	
 Done:
 	* Input
@@ -310,4 +314,4 @@ Done:
 	* Added editor shortcut key to delete selected entity
 	* Console command to read/write entity to file and add it to scene
 	* Fix editor camera right-click behaviour
-
+	* Moved #version definition from shaders to c code for easier control