Merge branch 'schemes-ssbo'

madcad/rendering.py

@@ -60,7 +60,7 @@ class display:
 from .nprint import nprint
 
 # minimum opengl version required by the rendering pipeline
-opengl_version = (3,3)
+opengl_version = (4,3)
 # shared open gl context, None if not yet initialized
 global_context = None
 

madcad/scheme.py

@@ -362,7 +362,7 @@ def render(self, view):
 				va = self.vas[name]
 				ctx.enable_only(shader.enable)
 				ctx.blend_func = shader.blend_func
-				self.b_spaces.bind_to_uniform_block(0)
+				self.b_spaces.bind_to_storage_buffer(0)
 				shader.program['b_spaces'].binding = 0
 				shader.program['proj'].write(view.uniforms['proj'])
 				shader.program['highlight'].write( fvec4(fvec3(settings.display['select_color_line']), 0.5) if self.selected else fvec4(0) )
@@ -371,7 +371,7 @@ def render(self, view):
 
 		def identify(self, view):
 			''' Render all the triangles and lines for identification '''
-			self.b_spaces.bind_to_uniform_block(0)
+			self.b_spaces.bind_to_storage_buffer(0)
 			self.shader_ident['b_spaces'].binding = 0
 			self.shader_ident['startident'] = view.identstep(self.nidents)
 			self.shader_ident['proj'].write(view.uniforms['proj'])

madcad/shaders/scheme.vert

@@ -1,4 +1,4 @@
-#version 330
+#version 430
 
 in uint space;
 in vec3 v_position;
@@ -9,9 +9,9 @@ in uint v_ident;
 in uint v_flags;
 
 uniform mat4 proj;
-uniform b_spaces {
-	mat4[4096] spaces;  // the GPU and CPU allocated buffers can be smaller, but we need to define a max size
-} spaces;
+buffer b_spaces {
+	mat4 spaces[];  // the GPU and CPU allocated buffers can be smaller, but we need to define a max size
+};
 uniform uint startident;
 
 out vec3 normal;
@@ -29,8 +29,8 @@ void main()
 	color = v_color;
 	uint ident = startident + v_ident;
 	identcolor = vec3(float(ident % uint(256)), float(ident/uint(256)), 0)/255.;
-	vec4 position = spaces.spaces[space] * vec4(v_position,1);
-	normal = mat3(spaces.spaces[space]) * v_normal;
+	vec4 position = spaces[space] * vec4(v_position,1);
+	normal = mat3(spaces[space]) * v_normal;
 	sight = sight_direction(position);
 	gl_Position = proj * position;
 	gl_Position[2] += v_layer * gl_Position[3];