steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

verify transform feedback format matches requested format after linking program-instances

Joe Groff 2009-07-27 13:16:41 -05:00
parent a1416e2091
commit 42556115a2
3 changed files with 81 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extra/gpu/shaders/prettyprint/prettyprint.factor
View File

@ -18,3 +18,7 @@ M: too-many-feedback-formats-error error.
M: invalid-link-feedback-format-error error. M: invalid-link-feedback-format-error error.
drop drop
"Vertex formats used for transform feedback can't contain padding fields." print ; "Vertex formats used for transform feedback can't contain padding fields." print ;
M: inaccurate-feedback-attribute-error error.
drop
"The types of the transform feedback attributes don't match those specified by the program's vertex format." print ;

3
extra/gpu/shaders/shaders-docs.factor
View File

@ -141,6 +141,9 @@ HELP: too-many-feedback-formats-error
HELP: invalid-link-feedback-format-error HELP: invalid-link-feedback-format-error
{ $class-description "This error is thrown when the " { $link vertex-format } " specified as the transform feedback output format of a " { $link program } " is not suitable for the purpose. Transform feedback formats do not support padding (fields with a name of " { $link f } ")." } ; { $class-description "This error is thrown when the " { $link vertex-format } " specified as the transform feedback output format of a " { $link program } " is not suitable for the purpose. Transform feedback formats do not support padding (fields with a name of " { $link f } ")." } ;
HELP: inaccurate-feedback-attribute-error
{ $class-description "This error is thrown when the " { $link vertex-format } " specified as the transform feedback output format of a " { $link program } " does not match the format of the output attributes linked into a " { $link program-instance } "." } ;
HELP: uniform-index HELP: uniform-index
{ $values { $values
{ "program-instance" program-instance } { "uniform-name" string } { "program-instance" program-instance } { "uniform-name" string }

94
extra/gpu/shaders/shaders.factor
View File

@ -1,14 +1,15 @@
! (c)2009 Joe Groff bsd license ! (c)2009 Joe Groff bsd license
USING: accessors alien alien.c-types alien.structs arrays USING: accessors alien alien.c-types alien.strings
assocs classes.mixin classes.parser classes.singleton alien.structs arrays assocs byte-arrays classes.mixin
combinators combinators.short-circuit definitions destructors classes.parser classes.singleton combinators
generic.parser gpu gpu.buffers hashtables combinators.short-circuit definitions destructors
images io.encodings.ascii io.files io.pathnames kernel lexer generic.parser gpu gpu.buffers hashtables images
io.encodings.ascii io.files io.pathnames kernel lexer literals
locals math math.parser memoize multiline namespaces opengl locals math math.parser memoize multiline namespaces opengl
opengl.gl opengl.shaders parser quotations sequences opengl.gl opengl.shaders parser quotations sequences
specialized-arrays.alien specialized-arrays.int splitting specialized-arrays.alien specialized-arrays.int splitting
strings ui.gadgets.worlds variants vectors vocabs strings ui.gadgets.worlds variants vectors vocabs vocabs.loader
vocabs.loader vocabs.parser words words.constant ; vocabs.parser words words.constant ;
IN: gpu.shaders IN: gpu.shaders
VARIANT: shader-kind VARIANT: shader-kind
@ -18,6 +19,7 @@ UNION: ?string string POSTPONE: f ;
ERROR: too-many-feedback-formats-error formats ; ERROR: too-many-feedback-formats-error formats ;
ERROR: invalid-link-feedback-format-error format ; ERROR: invalid-link-feedback-format-error format ;
ERROR: inaccurate-feedback-attribute-error attribute ;
TUPLE: vertex-attribute TUPLE: vertex-attribute
{ name ?string read-only initial: f } { name ?string read-only initial: f }
@ -99,6 +101,29 @@ MEMO: output-index ( program-instance output-name -- index )
: vertex-attributes-size ( vertex-attributes -- size ) : vertex-attributes-size ( vertex-attributes -- size )
[ vertex-attribute-size ] [ + ] map-reduce ; [ vertex-attribute-size ] [ + ] map-reduce ;
: feedback-type= ( component-type dim gl-type -- ? )
[ 2array ] dip {
{ $ GL_FLOAT [ { float-components 1 } ] }
{ $ GL_FLOAT_VEC2 [ { float-components 2 } ] }
{ $ GL_FLOAT_VEC3 [ { float-components 3 } ] }
{ $ GL_FLOAT_VEC4 [ { float-components 4 } ] }
{ $ GL_INT [ { int-integer-components 1 } ] }
{ $ GL_INT_VEC2 [ { int-integer-components 2 } ] }
{ $ GL_INT_VEC3 [ { int-integer-components 3 } ] }
{ $ GL_INT_VEC4 [ { int-integer-components 4 } ] }
{ $ GL_UNSIGNED_INT [ { uint-integer-components 1 } ] }
{ $ GL_UNSIGNED_INT_VEC2 [ { uint-integer-components 2 } ] }
{ $ GL_UNSIGNED_INT_VEC3 [ { uint-integer-components 3 } ] }
{ $ GL_UNSIGNED_INT_VEC4 [ { uint-integer-components 4 } ] }
} case = ;
:: assert-feedback-attribute ( size gl-type name vertex-attribute -- )
{
[ vertex-attribute name>> name = ]
[ size 1 = ]
[ gl-type vertex-attribute [ component-type>> ] [ dim>> ] bi feedback-type= ]
} 0&& [ vertex-attribute inaccurate-feedback-attribute-error ] unless ;
:: [bind-vertex-attribute] ( stride offset vertex-attribute -- stride offset' quot ) :: [bind-vertex-attribute] ( stride offset vertex-attribute -- stride offset' quot )
vertex-attribute name>> :> name vertex-attribute name>> :> name
vertex-attribute component-type>> :> type vertex-attribute component-type>> :> type
@ -149,6 +174,21 @@ MEMO: output-index ( program-instance output-name -- index )
>quotation >quotation
] if ; ] if ;
:: [verify-feedback-attribute] ( vertex-attribute index -- quot )
vertex-attribute name>> :> name
name length 1 + :> name-buffer-length
{
index name-buffer-length dup
[ f 0 <int> 0 <int> ] dip <byte-array>
[ glGetTransformFeedbackVarying ] 3keep
ascii alien>string
vertex-attribute assert-feedback-attribute
} >quotation ;
:: [verify-feedback-format] ( vertex-attributes -- quot )
vertex-attributes [ [verify-feedback-attribute] ] map-index :> verify-cleave
{ drop verify-cleave cleave } >quotation ;
GENERIC: bind-vertex-format ( program-instance buffer-ptr format -- ) GENERIC: bind-vertex-format ( program-instance buffer-ptr format -- )
GENERIC: link-feedback-format ( program-handle format -- ) GENERIC: link-feedback-format ( program-handle format -- )
@ -156,17 +196,30 @@ GENERIC: link-feedback-format ( program-handle format -- )
M: f link-feedback-format M: f link-feedback-format
2drop ; 2drop ;
GENERIC: (verify-feedback-format) ( program-instance format -- )
M: f (verify-feedback-format)
2drop ;
: verify-feedback-format ( program-instance -- )
dup program>> feedback-format>> (verify-feedback-format) ;
: define-vertex-format-methods ( class vertex-attributes -- ) : define-vertex-format-methods ( class vertex-attributes -- )
[ {
[ \ bind-vertex-format create-method-in ] dip [
[bind-vertex-format] define [ \ bind-vertex-format create-method-in ] dip
] [ [bind-vertex-format] define
[ \ link-feedback-format create-method-in ] dip ] [
[link-feedback-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 [ \ (verify-feedback-format) create-method-in ] dip
] 2tri ; [verify-feedback-format] define
] [
[ \ vertex-format-size create-method-in ] dip
[ \ drop ] dip vertex-attributes-size [ ] 2sequence define
]
} 2cleave ;
: component-type>c-type ( component-type -- c-type ) : component-type>c-type ( component-type -- c-type )
{ {
@ -303,9 +356,10 @@ DEFER: <shader-instance>
: (link-program) ( program shader-instances -- program-instance ) : (link-program) ( program shader-instances -- program-instance )
[ [ handle>> ] map ] curry [ [ handle>> ] map ] curry
[ feedback-format>> [ link-feedback-format ] curry ] bi (gl-program) [ feedback-format>> [ link-feedback-format ] curry ] bi (gl-program)
dup gl-program-ok? dup gl-program-ok? [
[ swap world get \ program-instance boa window-resource ] [ swap world get \ program-instance boa |dispose dup verify-feedback-format ]
[ link-program-error ] if ; with-destructors window-resource
] [ link-program-error ] if ;
: link-program ( program -- program-instance ) : link-program ( program -- program-instance )
dup shaders>> [ <shader-instance> ] map (link-program) ; dup shaders>> [ <shader-instance> ] map (link-program) ;