optimize the intersection struct size

devshgraphicsprogramming · devshgraphicsprogramming · commit 994e388fc1ce · 2022-01-05T19:50:03.000+01:00
diff --git a/3rdparty/radeonrays b/3rdparty/radeonrays
@@ -1 +1 @@
-Subproject commit b968d62e7cb7758c2c779232b5f2057c80c93669
+Subproject commit e42145aa3b1bedd3a3bb0157a873e561aabb8632
diff --git a/examples_tests/22.RaytracedAO/closestHit.comp b/examples_tests/22.RaytracedAO/closestHit.comp
@@ -82,7 +82,7 @@ void main()
 			if (_continue)
 			{
 				// if we ever support spatially varying emissive, we'll need to hoist barycentric computation and UV fetching to the position fetching
-				const vec2 compactBary = vec2(1.f-intersection.uvwt.x-intersection.uvwt.y,intersection.uvwt.x); // radeon rays is a special boy and does its barycentrics weird
+				const vec2 compactBary = vec2(1.f-intersection.uv.x-intersection.uv.y,intersection.uv.x); // radeon rays is a special boy and does its barycentrics weird
 				
 				//
 				const nbl_glsl_xoroshiro64star_state_t scramble_start_state = nbl_glsl_xoroshiro64star_state_t(ray.mask,ray._active);
diff --git a/include/nbl/builtin/glsl/ext/RadeonRays/intersection.glsl b/include/nbl/builtin/glsl/ext/RadeonRays/intersection.glsl
@@ -1,19 +1,14 @@
 #ifndef _NBL_EXT_RADEON_RAYS_INTERSECTION_INCLUDED_
 #define _NBL_EXT_RADEON_RAYS_INTERSECTION_INCLUDED_
 
-// for the love of god, lets optimize this into 16 bytes
 struct nbl_glsl_ext_RadeonRays_Intersection
 {
 	// Shape ID
 	int shapeid;
 	// Primitve ID
 	int primid;
-
-	int padding0;
-	int padding1;
-
 	// UV parametrization
-	vec4 uvwt;
+	vec2 uv;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void main()`
`82`	`82`	`if (_continue)`
`83`	`83`	`{`
`84`	`84`	`// if we ever support spatially varying emissive, we'll need to hoist barycentric computation and UV fetching to the position fetching`
`85`		`- const vec2 compactBary = vec2(1.f-intersection.uvwt.x-intersection.uvwt.y,intersection.uvwt.x); // radeon rays is a special boy and does its barycentrics weird`
	`85`	`+ const vec2 compactBary = vec2(1.f-intersection.uv.x-intersection.uv.y,intersection.uv.x); // radeon rays is a special boy and does its barycentrics weird`
`86`	`86`
`87`	`87`	`//`
`88`	`88`	`const nbl_glsl_xoroshiro64star_state_t scramble_start_state = nbl_glsl_xoroshiro64star_state_t(ray.mask,ray._active);`