Updated opengl for mac to apparently the mostl widely compatible vers…

…ion (3.3), and shaders to language 330, which is also the most widely compatible
palaeoware · Apr 5, 2020 · 9d7f255 · 9d7f255
1 parent c531288
commit 9d7f255
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/SPIERSview/resources/lightingFragmentShaderTextured_mac.fsh b/SPIERSview/resources/lightingFragmentShaderTextured_mac.fsh
@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 uniform float ambientReflection;
 uniform float diffuseReflection;

diff --git a/SPIERSview/resources/lightingFragmentShader_mac.fsh b/SPIERSview/resources/lightingFragmentShader_mac.fsh
@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 uniform vec4 ambientColor;
 uniform vec4 diffuseColor;

diff --git a/SPIERSview/resources/lightingVertexShaderTextured_mac.vsh b/SPIERSview/resources/lightingVertexShaderTextured_mac.vsh
@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 uniform mat4 mvpMatrix;
 uniform mat4 mvMatrix;

diff --git a/SPIERSview/resources/lightingVertexShader_mac.vsh b/SPIERSview/resources/lightingVertexShader_mac.vsh
@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 uniform mat4 mvpMatrix;
 uniform mat4 mvMatrix;

diff --git a/SPIERSview/src/globals.h b/SPIERSview/src/globals.h
@@ -59,7 +59,7 @@ class MainWindow;
 #define GL_MAJOR 2
 #define GL_MINOR 1
 #define GL_MAJOR_MAC 3
-#define GL_MINOR_MAC 2
+#define GL_MINOR_MAC 3
 #define STEREO_SEPARATION_MODIFIER 15.0
 #define SHININESS 0.0
 #define FONT_SCALE_FACTOR 24.0 // Eqates to roughtly the same font size as the default used by the QT GUI