set transform feedback format at program link

diff --git a/basis/opengl/shaders/shaders.factor b/basis/opengl/shaders/shaders.factor
index 1561138522a9ea5e3fb05029e3f9202a1fdd3102..9d5f4810e1f78cc97287bfc520b489d1b283f605 100755 (executable)
--- a/basis/opengl/shaders/shaders.factor
+++ b/basis/opengl/shaders/shaders.factor
@@ -61,22 +61,18 @@ PREDICATE: fragment-shader < gl-shader (fragment-shader?) ;
 
 ! Programs
 
-: <mrt-gl-program> ( shaders frag-data-locations -- program )
+: (gl-program) ( shaders quot: ( gl-program -- ) -- program )
     glCreateProgram 
     [
         [ swap [ glAttachShader ] with each ]
-        [ swap [ first2 swap glBindFragDataLocation ] with each ] bi-curry bi*
-    ]
-    [ glLinkProgram ]
-    [ ] tri
-    gl-error ;
+        [ swap call ] bi-curry bi*
+    ] [ glLinkProgram ] [ ] tri gl-error ; inline
+
+: <mrt-gl-program> ( shaders frag-data-locations -- program )
+    [ [ first2 swap glBindFragDataLocation ] with each ] curry (gl-program) ;
 
 : <gl-program> ( shaders -- program )
-    glCreateProgram 
-    [ swap [ glAttachShader ] with each ]
-    [ glLinkProgram ]
-    [ ] tri
-    gl-error ;
+    [ drop ] (gl-program) ;
     
 : (gl-program?) ( object -- ? )
     dup integer? [ glIsProgram c-bool> ] [ drop f ] if ;

diff --git a/extra/gpu/buffers/buffers.factor b/extra/gpu/buffers/buffers.factor
index ce53a25422482c11f73b21ef87936ba9554abc9d..c4f85bb5af4d1104a844dd7e25f67a0fb882c581 100644 (file)
--- a/extra/gpu/buffers/buffers.factor
+++ b/extra/gpu/buffers/buffers.factor
@@ -79,6 +79,11 @@ UNION: gpu-data-ptr buffer-ptr c-ptr ;
 : buffer-size ( buffer -- size )
     bind-buffer GL_BUFFER_SIZE get-buffer-int ;
 
+: buffer-ptr>range ( buffer-ptr -- buffer-range )
+    [ buffer>> ] [ offset>> ] bi
+    2dup [ buffer-size ] dip -
+    buffer-range boa ;
+
 :: allocate-buffer ( buffer size initial-data -- )
     buffer bind-buffer :> target
     target size initial-data buffer gl-buffer-usage glBufferData ;

diff --git a/extra/gpu/shaders/prettyprint/prettyprint.factor b/extra/gpu/shaders/prettyprint/prettyprint.factor
index 3d739a55f3c3ce231a77d711e9e8e9038713c05b..862922c34c9aeeb2f45cbca5d9236d32f5e5e6c0 100644 (file)
--- a/extra/gpu/shaders/prettyprint/prettyprint.factor
+++ b/extra/gpu/shaders/prettyprint/prettyprint.factor
@@ -14,3 +14,7 @@ M: link-program-error error.
 M: too-many-feedback-formats-error error.
     drop
     "Only one transform feedback format can be specified for a program." print ;
+
+M: invalid-link-feedback-format-error error.
+    drop
+    "Vertex formats used for transform feedback can't contain padding fields." print ;

diff --git a/extra/gpu/shaders/shaders.factor b/extra/gpu/shaders/shaders.factor
index 933522b3d029b699ac9358229cc3dba53bbfcd51..fd31e8b2794e8317aaf75642c375ecfdbe1e06af 100755 (executable)
--- a/extra/gpu/shaders/shaders.factor
+++ b/extra/gpu/shaders/shaders.factor
@@ -6,9 +6,9 @@ generic.parser gpu gpu.buffers hashtables
 images io.encodings.ascii io.files io.pathnames kernel lexer
 locals math math.parser memoize multiline namespaces opengl
 opengl.gl opengl.shaders parser quotations sequences
-specialized-arrays.int splitting strings ui.gadgets.worlds
-variants vectors vocabs vocabs.loader vocabs.parser words
-words.constant ;
+specialized-arrays.alien specialized-arrays.int splitting
+strings ui.gadgets.worlds variants vectors vocabs
+vocabs.loader vocabs.parser words words.constant ;
 IN: gpu.shaders
 
 VARIANT: shader-kind
@@ -17,6 +17,7 @@ VARIANT: shader-kind
 UNION: ?string string POSTPONE: f ;
 
 ERROR: too-many-feedback-formats-error formats ;
+ERROR: invalid-link-feedback-format-error format ;
 
 TUPLE: vertex-attribute
     { name            ?string        read-only initial: f }
@@ -137,16 +138,35 @@ MEMO: output-index ( program-instance output-name -- index )
 
     { drop vertex-buffer with-block with-buffer-ptr } >quotation ; 
 
+:: [link-feedback-format] ( vertex-attributes -- quot )
+    vertex-attributes [ name>> not ] any?
+    [ [ nip invalid-link-feedback-format-error ] ] [
+        vertex-attributes
+        [ name>> ascii malloc-string ]
+        void*-array{ } map-as :> varying-names
+        vertex-attributes length :> varying-count
+        { drop varying-count varying-names GL_INTERLEAVED_ATTRIBS glTransformFeedbackVaryings }
+        >quotation
+    ] if ;
+
 GENERIC: bind-vertex-format ( program-instance buffer-ptr format -- )
 
+GENERIC: link-feedback-format ( program-handle format -- )
+
+M: f link-feedback-format
+    2drop ;
+
 : define-vertex-format-methods ( class vertex-attributes -- )
     [
         [ \ bind-vertex-format create-method-in ] dip
         [bind-vertex-format] define
+    ] [
+        [ \ link-feedback-format create-method-in ] dip
+        [link-feedback-format] define
     ] [
         [ \ vertex-format-size create-method-in ] dip
         [ \ drop ] dip vertex-attributes-size [ ] 2sequence define
-    ] 2bi ;
+    ] 2tri ;
 
 : component-type>c-type ( component-type -- c-type )
     {
@@ -281,7 +301,7 @@ DEFER: <shader-instance>
     [ compile-shader-error ] if ;
 
 : (link-program) ( program shader-instances -- program-instance )
-    [ handle>> ] map <gl-program>
+    [ [ handle>> ] map ] [ feedback-format>> [ link-feedback-format ] curry ] bi (gl-program)
     dup gl-program-ok?
     [ swap world get \ program-instance boa window-resource ]
     [ link-program-error ] if ;