Ray tracing texturing and alpha mapping sample

data/shaders/glsl/raytracingtextures/anyhit.rahit

@@ -1,4 +1,10 @@
+/* Copyright (c) 2023, Sascha Willems
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
 #version 460
+
 #extension GL_EXT_ray_tracing : require
 #extension GL_GOOGLE_include_directive : require
 #extension GL_EXT_nonuniform_qualifier : require
@@ -10,13 +16,15 @@ hitAttributeEXT vec2 attribs;
 
 layout(binding = 3, set = 0) uniform sampler2D image;
 
-#include "_bufferreferences.glsl"
-#include "_geometrytypes.glsl"
+#include "bufferreferences.glsl"
+#include "geometrytypes.glsl"
 
 void main()
 {
 	Triangle tri = unpackTriangle(gl_PrimitiveID, 32);
 	vec4 color = texture(image, tri.uv);
+	// If the alpha value of the texture at the current UV coordinates is below a given threshold, we'll ignore this intersection
+	// That way ray traversal will be stopped and the miss shader will be invoked
 	if (color.a < 0.9) {
 		ignoreIntersectionEXT;
 	}

data/shaders/glsl/raytracingtextures/bufferreferences.glsl

@@ -1,3 +1,9 @@
+/* Copyright (c) 2023, Sascha Willems
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
 layout(push_constant) uniform BufferReferences {
 	uint64_t vertices;
 	uint64_t indices;

data/shaders/glsl/raytracingtextures/closesthit.rchit

@@ -1,4 +1,11 @@
+/* Copyright (c) 2023, Sascha Willems
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
 #version 460
+
 #extension GL_EXT_ray_tracing : require
 #extension GL_GOOGLE_include_directive : require
 #extension GL_EXT_nonuniform_qualifier : require
@@ -9,14 +16,16 @@
 layout(location = 0) rayPayloadInEXT vec3 hitValue;
 hitAttributeEXT vec2 attribs;
 
-#include "_bufferreferences.glsl"
-#include "_geometrytypes.glsl"
+layout(binding = 3, set = 0) uniform sampler2D image;
+
+#include "bufferreferences.glsl"
+#include "geometrytypes.glsl"
 
 void main()
 {
 	Triangle tri = unpackTriangle(gl_PrimitiveID, 32);
 	hitValue = vec3(tri.uv, 0.0f);
+	// Fetch the color for this ray hit from the texture at the current uv coordinates
 	vec4 color = texture(image, tri.uv);
 	hitValue = color.rgb;
-
 }

data/shaders/glsl/raytracingtextures/geometrytypes.glsl

@@ -1,3 +1,9 @@
+/* Copyright (c) 2023, Sascha Willems
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
 struct Vertex
 {
   vec3 pos;
@@ -9,6 +15,7 @@ struct Triangle {
 	vec2 uv;
 };
 
+// This function will unpack our vertex buffer data into a single triangle and calculates uv coordinates
 Triangle unpackTriangle(uint index, int vertexSize) {
 	Triangle tri;
 	const uint triIndex = index * 3;

data/shaders/glsl/raytracingtextures/miss.rmiss

@@ -1,3 +1,9 @@
+/* Copyright (c) 2023, Sascha Willems
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
 #version 460
 #extension GL_EXT_ray_tracing : enable
 

data/shaders/glsl/raytracingtextures/raygen.rgen

@@ -1,3 +1,9 @@
+/* Copyright (c) 2023, Sascha Willems
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
 #version 460
 #extension GL_EXT_ray_tracing : enable
 
@@ -28,5 +34,5 @@ void main()
 
     traceRayEXT(topLevelAS, gl_RayFlagsNoneEXT, 0xff, 0, 0, 0, origin.xyz, tmin, direction.xyz, tmax, 0);
 
-	imagexStore(image, ivec2(gl_LaunchIDEXT.xy), vec4(hitValue, 0.0));
+	imageStore(image, ivec2(gl_LaunchIDEXT.xy), vec4(hitValue, 0.0));
 }

examples/raytracingtextures/raytracingtextures.cpp

@@ -487,7 +487,6 @@ public:
 		}
 
 		// Closest hit group for doing texture lookups
-		// This group also uses an anyhit shader for doing transparency
 		{
 			shaderStages.push_back(loadShader(getShadersPath() + "raytracingbasic/closesthit.rchit.spv", VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR));
 			VkRayTracingShaderGroupCreateInfoKHR shaderGroup{};
@@ -496,7 +495,7 @@ public:
 			shaderGroup.generalShader = VK_SHADER_UNUSED_KHR;
 			shaderGroup.closestHitShader = static_cast<uint32_t>(shaderStages.size()) - 1;
 			shaderGroup.intersectionShader = VK_SHADER_UNUSED_KHR;
-			// @todo: comment
+			// This group also uses an anyhit shader for doing transparency (see anyhit.rahit for details)
 			shaderStages.push_back(loadShader(getShadersPath() + "raytracingbasic/anyhit.rahit.spv", VK_SHADER_STAGE_ANY_HIT_BIT_KHR));
 			shaderGroup.anyHitShader = static_cast<uint32_t>(shaderStages.size()) - 1;
 			shaderGroups.push_back(shaderGroup);