GLSL: Improvements (#2321)

This improves GLSL by extending C instead of C-like.

components.json

@@ -379,7 +379,7 @@
 		},
 		"glsl": {
 			"title": "GLSL",
-			"require": "clike",
+			"require": "c",
 			"owner": "Golmote"
 		},
 		"gml": {

examples/prism-glsl.html

@@ -15,18 +15,18 @@ <h2>Vertex shader example</h2>
 vec3 specularColor = vec3(1.0,1.0,1.0);
 
 void main(void) {
-    // compute position
-    gl_Position = _mvProj * vec4(vertex, 1.0);
-    
-    localPos = vertex;
-    
-    // compute light info
-    vec3 n = normalize(_norm * normal);
-    vec3 diffuse;
-    float specular;
-    float glowingSpecular = 50.0;
-    getDirectionalLight(n, _dLight, glowingSpecular, diffuse, specular);
-    vColor = max(diffuse,_ambient.xyz)*materialColor+specular*specularColor+_ambient;
+	// compute position
+	gl_Position = _mvProj * vec4(vertex, 1.0);
+
+	localPos = vertex;
+
+	// compute light info
+	vec3 n = normalize(_norm * normal);
+	vec3 diffuse;
+	float specular;
+	float glowingSpecular = 50.0;
+	getDirectionalLight(n, _dLight, glowingSpecular, diffuse, specular);
+	vColor = max(diffuse,_ambient.xyz)*materialColor+specular*specularColor+_ambient;
 }</code></pre>
 
 <h2>Fragment shader example</h2>
@@ -42,17 +42,17 @@ <h2>Fragment shader example</h2>
 varying vec3 localPos;
 void main()
 {
-    vec3 color;
+	vec3 color;
 	vec3 position, useBrick;
-	
+
 
 	position = localPos / BrickSize.xyz;
 
 	if (fract(position.y * 0.5) > 0.5){
 		position.x += 0.5;
-        position.z += 0.5;
+		position.z += 0.5;
 	}
-    
+
 	position = fract(position);
 
 	useBrick = step(position, BrickPct.xyz);
@@ -62,4 +62,4 @@ <h2>Fragment shader example</h2>
 
 	gl_FragColor = vec4(color, 1.0);
 }
-</code></pre>
+</code></pre>

plugins/autoloader/prism-autoloader.js

@@ -42,7 +42,7 @@
 		"firestore-security-rules": "clike",
 		"flow": "javascript",
 		"ftl": "markup-templating",
-		"glsl": "clike",
+		"glsl": "c",
 		"gml": "clike",
 		"go": "clike",
 		"groovy": "clike",

tests/languages/glsl/keyword_feature.test

@@ -89,15 +89,15 @@ uimage1DArray uimage2DArray
 imageCubeArray iimageCubeArray uimageCubeArray
 image2DMS iimage2DMS uimage2DMS
 image2DMSArray iimage2DMSArray uimage2DMSArray
-struct
+struct;
 common
 partition
 active
 asm
 class;
 union
-enum
-typedef
+enum;
+typedef;
 template
 this
 resource
@@ -220,15 +220,15 @@ using
 	["keyword", "imageCubeArray"], ["keyword", "iimageCubeArray"], ["keyword", "uimageCubeArray"],
 	["keyword", "image2DMS"], ["keyword", "iimage2DMS"], ["keyword", "uimage2DMS"],
 	["keyword", "image2DMSArray"], ["keyword", "iimage2DMSArray"], ["keyword", "uimage2DMSArray"],
-	["keyword", "struct"],
+	["keyword", "struct"], ["punctuation", ";"],
 	["keyword", "common"],
 	["keyword", "partition"],
 	["keyword", "active"],
 	["keyword", "asm"],
 	["keyword", "class"], ["punctuation", ";"],
 	["keyword", "union"],
-	["keyword", "enum"],
-	["keyword", "typedef"],
+	["keyword", "enum"], ["punctuation", ";"],
+	["keyword", "typedef"], ["punctuation", ";"],
 	["keyword", "template"],
 	["keyword", "this"],
 	["keyword", "resource"],
@@ -260,4 +260,4 @@ using
 
 ----------------------------------------------------
 
-Checks for keywords.
+Checks for keywords.

tests/languages/glsl/macro_feature.test

@@ -0,0 +1,74 @@
+#define
+#undef
+#if
+#ifdef
+#ifndef
+#else
+#elif
+#endif
+#error
+#pragma
+#extension
+#version
+#line
+
+----------------------------------------------------
+
+[
+	["macro", [
+		"#",
+		["directive", "define"]
+	]],
+	["macro", [
+		"#",
+		["directive", "undef"]
+	]],
+	["macro", [
+		"#",
+		["directive", "if"]
+	]],
+	["macro", [
+		"#",
+		["directive", "ifdef"]
+	]],
+	["macro", [
+		"#",
+		["directive", "ifndef"]
+	]],
+	["macro", [
+		"#",
+		["directive", "else"]
+	]],
+	["macro", [
+		"#",
+		["directive", "elif"]
+	]],
+	["macro", [
+		"#",
+		["directive", "endif"]
+	]],
+	["macro", [
+		"#",
+		["directive", "error"]
+	]],
+	["macro", [
+		"#",
+		["directive", "pragma"]
+	]],
+	["macro", [
+		"#",
+		["directive", "extension"]
+	]],
+	["macro", [
+		"#",
+		["directive", "version"]
+	]],
+	["macro", [
+		"#",
+		["directive", "line"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for preprocessor instructions.