Merge pull request #256 from cortex-command-community/mac-fixes

Mac Fixes

Author: Causeless

.gitignore

@@ -9,6 +9,8 @@
 *.user
 # IDE files
 /.idea
+# Meson files
+*.wraplock
 
 compile_commands.json
 **/.ccls-cache

Data/Base.rte/Shaders/Background.frag

@@ -1,4 +1,4 @@
-#version 330
+#version 330 core
 #extension GL_KHR_blend_equation_advanced: enable
 #extension GL_ARB_sample_shading: enable
 
@@ -16,7 +16,7 @@ uniform bool rteBlendInvert = false;
 uniform bool drawMasked = false;
 
 
-vec4 texture2DAA(sampler2D tex, vec2 uv) {
+vec4 textureAA(sampler2D tex, vec2 uv) {
 	vec2 texsize = vec2(textureSize(tex, 0));
 	vec2 uv_texspace = uv * texsize;
 	vec2 seam = floor(uv_texspace + .5);
@@ -26,13 +26,13 @@ vec4 texture2DAA(sampler2D tex, vec2 uv) {
 }
 
 void main() {
-	float red = texture2D(rteTexture, textureUV).r;
+	float red = texture(rteTexture, textureUV).r;
 	if (red==0 && drawMasked) {
 		discard;
 	}
 	if (!rteBlendInvert) {
-		FragColor = texture2DAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, rteColor.a * vertexColor.a);
+		FragColor = textureAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, rteColor.a * vertexColor.a);
 	} else {
-		FragColor = vec4(vec3(1.0), 0.0) - (texture2DAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, -rteColor.a * vertexColor.a));
+		FragColor = vec4(vec3(1.0), 0.0) - (textureAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, -rteColor.a * vertexColor.a));
 	}
 }

Data/Base.rte/Shaders/Blit8.frag

@@ -1,5 +1,5 @@
 // Blit8.frag
-#version 130
+#version 330 core
 
 in vec2 textureUV;
 

Data/Base.rte/Shaders/Blit8.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 core
 
 in vec3 rteVertexPosition;
 in vec2 rteVertexTexUV;

Data/Base.rte/Shaders/Dissolve.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 core
 
 in vec2 textureUV;
 in vec4 vertexColor;
@@ -32,7 +32,7 @@ float noise( vec2 U )
 	return mix( C.x, C.y, U.y );
 }
 
-vec4 texture2DAA(sampler2D tex, vec2 uv) {
+vec4 textureAA(sampler2D tex, vec2 uv) {
 	vec2 texsize = vec2(textureSize(tex, 0));
 	vec2 uv_texspace = uv * texsize;
 	vec2 seam = floor(uv_texspace + .5);
@@ -45,8 +45,8 @@ void main() {
 	if (noise(gl_FragCoord.xy + textureUV) < 0.5) {
 		discard;
 	}
-	float red = texture2D(rteTexture, textureUV).r;
-	vec4 color = texture2DAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, rteColor.a * vertexColor.a);
+	float red = texture(rteTexture, textureUV).r;
+	vec4 color = textureAA(rtePalette, vec2(red * vertexColor.r, 0.0)) * vec4(rteColor.rgb, rteColor.a * vertexColor.a);
 
 	FragColor = color;
 }

Data/Base.rte/Shaders/Flat.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 core
 
 in vec2 textureUV;
 

Data/Base.rte/Shaders/PostProcess.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 core
 
 in vec2 textureUV;
 in vec4 vertexColor;
@@ -9,7 +9,7 @@ uniform sampler2D rteTexture;
 uniform vec4 rteColor;
 
 
-vec4 texture2DAA(sampler2D tex, vec2 uv) {
+vec4 textureAA(sampler2D tex, vec2 uv) {
 	vec2 texsize = vec2(textureSize(tex, 0));
 	vec2 uv_texspace = uv * texsize;
 	vec2 seam = floor(uv_texspace + .5);
@@ -19,5 +19,5 @@ vec4 texture2DAA(sampler2D tex, vec2 uv) {
 }
 
 void main() {
-	FragColor = texture2DAA(rteTexture, textureUV) * rteColor * vertexColor;
+	FragColor = textureAA(rteTexture, textureUV) * rteColor * vertexColor;
 }

Data/Base.rte/Shaders/PostProcess.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 core
 
 in vec3 rteVertexPosition;
 in vec2 rteVertexTexUV;

Data/Base.rte/Shaders/ScreenBlit.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 core
 
 in vec2 textureUV;
 
@@ -7,7 +7,7 @@ out vec4 FragColor;
 uniform sampler2D rteTexture;
 uniform sampler2D rteGUITexture;
 
-vec4 texture2DAA(sampler2D tex, vec2 uv) {
+vec4 textureAA(sampler2D tex, vec2 uv) {
 	vec2 texsize = vec2(textureSize(tex, 0));
 	vec2 uv_texspace = uv * texsize;
 	vec2 seam = floor(uv_texspace + .5);
@@ -17,8 +17,8 @@ vec4 texture2DAA(sampler2D tex, vec2 uv) {
 }
 
 void main() {
-	vec4 guiColor = texture2DAA(rteGUITexture, vec2(textureUV.x, -textureUV.y));
+	vec4 guiColor = textureAA(rteGUITexture, vec2(textureUV.x, -textureUV.y));
 	float guiSolid = float((guiColor.r + guiColor.g + guiColor.b) > 0.0);
 	float blendRatio = max(guiColor.a, guiSolid);
-	FragColor = (texture2DAA(rteTexture, textureUV) * (1.0F - blendRatio)) + guiColor * blendRatio;
+	FragColor = (textureAA(rteTexture, textureUV) * (1.0F - blendRatio)) + guiColor * blendRatio;
 }

Data/Base.rte/Shaders/ScreenBlit.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 core
 
 in vec3 rteVertexPosition;
 in vec2 rteVertexTexUV;