Updated (multi) indirect draw example

data/shaders/indirectdraw/generate-spirv.bat

@@ -1,2 +0,0 @@
-glslangvalidator -V indirectdraw.vert -o indirectdraw.vert.spv
-glslangvalidator -V indirectdraw.frag -o indirectdraw.frag.spv

data/shaders/indirectdraw/ground.frag

@@ -0,0 +1,28 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (binding = 2) uniform sampler2D samplerColor;
+
+layout (location = 0) in vec3 inNormal;
+layout (location = 1) in vec3 inColor;
+layout (location = 2) in vec2 inUV;
+layout (location = 3) in vec3 inViewVec;
+layout (location = 4) in vec3 inLightVec;
+
+layout (location = 0) out vec4 outFragColor;
+
+void main() 
+{
+	// Last array layer is terrain tex
+	vec4 color = texture(samplerColor, inUV);
+	vec3 N = normalize(inNormal);
+	vec3 L = normalize(inLightVec);
+	vec3 V = normalize(inViewVec);
+	vec3 R = reflect(-L, N);
+	vec3 ambient = vec3(0.65);
+	vec3 diffuse = max(dot(N, L), 0.0) * inColor;
+	vec3 specular = pow(max(dot(R, V), 0.0), 16.0) * vec3(0.1);
+	outFragColor = vec4((ambient + diffuse) * color.rgb + specular, 1.0);		
+}

data/shaders/indirectdraw/ground.vert

@@ -0,0 +1,42 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+// Vertex attributes
+layout (location = 0) in vec4 inPos;
+layout (location = 1) in vec3 inNormal;
+layout (location = 2) in vec2 inUV;
+layout (location = 3) in vec3 inColor;
+
+layout (binding = 0) uniform UBO 
+{
+	mat4 projection;
+	mat4 modelview;
+} ubo;
+
+layout (location = 0) out vec3 outNormal;
+layout (location = 1) out vec3 outColor;
+layout (location = 2) out vec2 outUV;
+layout (location = 3) out vec3 outViewVec;
+layout (location = 4) out vec3 outLightVec;
+
+out gl_PerVertex
+{
+	vec4 gl_Position;
+};
+
+void main() 
+{
+	outColor = inColor;
+	outUV = inUV * 32.0;
+
+	vec4 pos = vec4(inPos.xyz, 1.0);
+
+	gl_Position = ubo.projection * ubo.modelview * pos;
+	
+	vec4 wPos = ubo.modelview * vec4(pos.xyz, 1.0); 
+	vec4 lPos = vec4(0.0, -5.0, 0.0, 1.0);
+	outLightVec = lPos.xyz - pos.xyz;
+	outViewVec = -pos.xyz;	
+}

data/shaders/indirectdraw/indirectdraw.frag

@@ -7,28 +7,24 @@ layout (binding = 1) uniform sampler2DArray samplerArray;
 
 layout (location = 0) in vec3 inNormal;
 layout (location = 1) in vec3 inColor;
-layout (location = 2) in vec3 inEyePos;
-layout (location = 3) in vec3 inLightVec;
-layout (location = 4) in vec3 inUV;
+layout (location = 2) in vec3 inUV;
+layout (location = 3) in vec3 inViewVec;
+layout (location = 4) in vec3 inLightVec;
 
 layout (location = 0) out vec4 outFragColor;
 
-void main() 
+void main()
 {
-	vec4 color = texture(samplerArray, inUV) * vec4(inColor, 1.0);	
+	vec4 color = texture(samplerArray, inUV);
+
+	if (color.a < 0.5)
+	{
+		discard;
+	}
 
 	vec3 N = normalize(inNormal);
-	vec3 L = normalize(vec3(1.0));	
-	
-	vec3 Eye = normalize(-inEyePos);
-	vec3 Reflected = normalize(reflect(-inLightVec, inNormal)); 
-
-	vec4 IAmbient = vec4(vec3(0.1), 1.0);
-	vec4 IDiffuse = vec4(1.0) * max(dot(inNormal, inLightVec), 0.0);
-	
-	float specular = 0.75;
-	vec4 ISpecular = vec4(0.5, 0.5, 0.5, 1.0) * pow(max(dot(Reflected, Eye), 0.0), 32.0) * specular; 	
- 
-	outFragColor = vec4((IAmbient + IDiffuse) * color + ISpecular);	
-	
-}
+	vec3 L = normalize(inLightVec);
+	vec3 ambient = vec3(0.65);
+	vec3 diffuse = max(dot(N, L), 0.0) * inColor;
+	outFragColor = vec4((ambient + diffuse) * color.rgb, 1.0);
+}

data/shaders/indirectdraw/indirectdraw.vert

@@ -12,22 +12,20 @@ layout (location = 3) in vec3 inColor;
 // Instanced attributes
 layout (location = 4) in vec3 instancePos;
 layout (location = 5) in vec3 instanceRot;
-layout (location = 6) in vec3 instanceColor;
-layout (location = 7) in float instanceScale;
-layout (location = 8) in int instanceTexIndex;
+layout (location = 6) in float instanceScale;
+layout (location = 7) in int instanceTexIndex;
 
 layout (binding = 0) uniform UBO 
 {
 	mat4 projection;
-	mat4 view;
-	float time;
+	mat4 modelview;
 } ubo;
 
 layout (location = 0) out vec3 outNormal;
 layout (location = 1) out vec3 outColor;
-layout (location = 2) out vec3 outEyePos;
-layout (location = 3) out vec3 outLightVec;
-layout (location = 4) out vec3 outUV;
+layout (location = 2) out vec3 outUV;
+layout (location = 3) out vec3 outViewVec;
+layout (location = 4) out vec3 outLightVec;
 
 out gl_PerVertex
 {
@@ -36,8 +34,9 @@ out gl_PerVertex
 
 void main() 
 {
-	outColor = instanceColor;
+	outColor = inColor;
 	outUV = vec3(inUV, instanceTexIndex);
+	outUV.t = 1.0 - outUV.t;
 
 	mat4 mx, my, mz;
 	
@@ -51,8 +50,8 @@ void main()
 	mx[3] = vec4(0.0, 0.0, 0.0, 1.0);	
 	
 	// rotate around y
-	s = sin(instanceRot.y + ubo.time);
-	c = cos(instanceRot.y + ubo.time);
+	s = sin(instanceRot.y);
+	c = cos(instanceRot.y);
 
 	my[0] = vec4(c, 0.0, s, 0.0);
 	my[1] = vec4(0.0, 1.0, 0.0, 0.0);
@@ -74,10 +73,10 @@ void main()
 	
 	vec4 pos = vec4((inPos.xyz * instanceScale) + instancePos, 1.0) * rotMat;
 
-	outEyePos = vec3(ubo.view * pos);
+	gl_Position = ubo.projection * ubo.modelview * pos;
 	
-	gl_Position = ubo.projection * ubo.view * pos;
-	
-	vec4 lightPos = vec4(0.0, 0.0, 0.0, 1.0) * ubo.view;
-	outLightVec = normalize(lightPos.xyz - outEyePos);
+	vec4 wPos = ubo.modelview * vec4(pos.xyz, 1.0); 
+	vec4 lPos = vec4(0.0, -5.0, 0.0, 1.0);
+	outLightVec = lPos.xyz - pos.xyz;
+	outViewVec = -pos.xyz;	
 }

data/shaders/indirectdraw/skysphere.frag

@@ -0,0 +1,17 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+layout (binding = 2) uniform sampler2D samplerColor;
+
+layout (location = 0) in vec2 inUV;
+
+layout (location = 0) out vec4 outFragColor;
+
+void main() 
+{
+	const vec4 gradientStart = vec4(0.93, 0.9, 0.81, 1.0);
+	const vec4 gradientEnd = vec4(0.35, 0.5, 1.0, 1.0);
+	outFragColor = mix(gradientStart, gradientEnd, min(0.5 - inUV.t, 0.5)/0.15 + 0.5);
+}

data/shaders/indirectdraw/skysphere.vert

@@ -0,0 +1,28 @@
+#version 450
+
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+
+// Vertex attributes
+layout (location = 0) in vec4 inPos;
+layout (location = 2) in vec2 inUV;
+
+layout (binding = 0) uniform UBO 
+{
+	mat4 projection;
+	mat4 modelview;
+} ubo;
+
+layout (location = 0) out vec2 outUV;
+
+out gl_PerVertex
+{
+	vec4 gl_Position;
+};
+
+void main() 
+{
+	outUV = vec2(inUV.s, 1.0-inUV.t);
+	// Skysphere always at center, only use rotation part of modelview matrix
+	gl_Position = ubo.projection * mat4(mat3(ubo.modelview)) * vec4(inPos.xyz, 1.0);
+}