Merge branch 'gz-rendering7' into fix-missing-cstdint

gazebosim · May 22, 2023 · ffffdfb · ffffdfb
2 parents c34d044 + 388a766
commit ffffdfb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/ogre2/src/media/2.0/scripts/materials/Common/GLSL/GaussianBlurBase_cs.glsl b/ogre2/src/media/2.0/scripts/materials/Common/GLSL/GaussianBlurBase_cs.glsl
@@ -1,5 +1,11 @@
 @property( syntax != glslvk )
-	#version 430
+	@property( GL3+ >= 430 )
+		#version 430
+	@else
+		#version 420
+		#extension GL_ARB_arrays_of_arrays: enable
+		#extension GL_ARB_compute_shader: enable
+	@end
 @else
 	#version 450
 @end

diff --git a/ogre2/src/media/2.0/scripts/materials/Terra/GLSL/TerraShadowGenerator.glsl b/ogre2/src/media/2.0/scripts/materials/Terra/GLSL/TerraShadowGenerator.glsl
@@ -1,5 +1,10 @@
 @property( syntax != glslvk )
-	#version 430
+	@property( GL3+ >= 430 )
+		#version 430
+	@else
+		#version 420
+		#extension GL_ARB_compute_shader: enable
+	@end
 	#define ogre_B0 binding = 0
 	#define ogre_B1 binding = 1
 @else

diff --git a/ogre2/src/media/Hlms/Common/GLSL/CrossPlatformSettings_piece_all.glsl b/ogre2/src/media/Hlms/Common/GLSL/CrossPlatformSettings_piece_all.glsl
@@ -6,6 +6,10 @@
 		#version 430 core
 	@else
 		#version 330 core
+
+		@property( !hlms_readonly_is_tex )
+			#extension GL_ARB_shader_storage_buffer_object: require
+		@end
 	@end
 @end