Change to depend on GL 3.3 instead of 4.1

jdah · Feb 21, 2021 · 1c14fc3 · 1c14fc3 · jdah · Mar 17, 2021
1 parent ede927b
commit 1c14fc3
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/res/shaders/basic2d.fs b/res/shaders/basic2d.fs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 uniform sampler2D tex;
 uniform bool use_tex;

diff --git a/res/shaders/basic2d.vs b/res/shaders/basic2d.vs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 layout (location = 0) in vec3 position;
 layout (location = 1) in vec2 uv;

diff --git a/res/shaders/basic_color.fs b/res/shaders/basic_color.fs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 uniform vec4 color;
 

diff --git a/res/shaders/basic_color.vs b/res/shaders/basic_color.vs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 layout (location = 0) in vec3 position;
 

diff --git a/res/shaders/basic_texture.fs b/res/shaders/basic_texture.fs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 uniform sampler2D tex;
 uniform vec4 color;

diff --git a/res/shaders/basic_texture.vs b/res/shaders/basic_texture.vs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 layout (location = 0) in vec3 position;
 layout (location = 1) in vec2 uv;

diff --git a/res/shaders/chunk.fs b/res/shaders/chunk.fs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 uniform sampler2D tex;
 

diff --git a/res/shaders/chunk.vs b/res/shaders/chunk.vs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 layout (location = 0) in vec3 position;
 layout (location = 1) in vec2 uv;
@@ -9,12 +9,12 @@ uniform mat4 m, v, p;
 uniform vec4 sunlight_color;
 
 // should match enum Direction in direction.h
-const uint NORTH = 0;
-const uint SOUTH = 1;
-const uint EAST = 2;
-const uint WEST = 3;
-const uint UP = 4;
-const uint DOWN = 5;
+const uint NORTH = 0U;
+const uint SOUTH = 1U;
+const uint EAST = 2U;
+const uint WEST = 3U;
+const uint UP = 4U;
+const uint DOWN = 5U;
 
 out vec4 v_color;
 out vec2 v_uv;

diff --git a/res/shaders/sky.fs b/res/shaders/sky.fs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 uniform sampler2D tex;
 uniform bool use_tex;

diff --git a/res/shaders/sky.vs b/res/shaders/sky.vs
@@ -1,4 +1,4 @@
-#version 410
+#version 330
 
 layout (location = 0) in vec3 position;
 layout (location = 1) in vec2 uv;

diff --git a/src/gfx/window.c b/src/gfx/window.c
@@ -71,8 +71,8 @@ void window_create(FWindow init, FWindow destroy, FWindow tick,  FWindow update,
     }
 
     glfwWindowHint(GLFW_RESIZABLE, GL_TRUE);
-	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
 	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 	glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);