Merge branch 'v3-0'

OGRECave · Jun 17, 2024 · b349548 · b349548
2 parents 3f8479e + 3b711b4
commit b349548
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Samples/Media/Hlms/Terra/Any/500.Structs_piece_vs_piece_ps.any b/Samples/Media/Hlms/Terra/Any/500.Structs_piece_vs_piece_ps.any
@@ -96,6 +96,7 @@ struct CellData
 
 @undefpiece( DeclareObjLightMask )
 @property( hlms_fine_light_mask || hlms_forwardplus_fine_light_mask )
+	// Currently unimplemented (also makes little sense since there's nothing fine granularity to do).
 	@property( syntax == metal )
 		@piece( DeclareObjLightMask )uint objLightMask = 0xFFFFFFFFu;@end
 	@else

diff --git a/Samples/Media/Hlms/Terra/Any/800.VertexShader_piece_vs.any b/Samples/Media/Hlms/Terra/Any/800.VertexShader_piece_vs.any
@@ -136,11 +136,14 @@
 
 @property( syntax == metal || lower_gpu_overhead )
 	@property( hlms_fine_light_mask || hlms_forwardplus_fine_light_mask )
-		outVs.objLightMask = worldMaterialIdx[inVs_drawId].z;
+		// Currently unimplemented (also makes little sense since there's nothing fine granularity to do).
+		outVs.objLightMask = 0xFFFFFFFF;
+		// outVs.objLightMask = worldMaterialIdx[inVs_drawId].z;
 	@end
 
 	@property( use_planar_reflections )
-		outVs.planarReflectionIdx = (ushort)(worldMaterialIdx[inVs_drawId].w);
+		#error "Unimplemented Feature: Using Terra as Planar Reflections"
+		// outVs.planarReflectionIdx = (ushort)(worldMaterialIdx[inVs_drawId].w);
 	@end
 @else
 	@property( (!hlms_shadowcaster || alpha_test) && !lower_gpu_overhead )