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

Fix broken opengl shader words

db4
Joe Groff 2008-01-29 20:50:15 -08:00
parent e3c8f34c14
commit d56acaab86
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extra/opengl/opengl.factor
View File

@ -255,7 +255,7 @@ TUPLE: sprite loc dim dim2 dlist texture ;
: c-true? ( int -- ? ) zero? not ; inline : c-true? ( int -- ? ) zero? not ; inline
: with-gl-shader-source-ptr ( string quot -- ) : with-gl-shader-source-ptr ( string quot -- )
swap >byte-array malloc-byte-array [ swap string>char-alien malloc-byte-array [
<void*> swap call <void*> swap call
] keep free ; inline ] keep free ; inline
@ -294,9 +294,8 @@ TUPLE: sprite loc dim dim2 dlist texture ;
GL_INFO_LOG_LENGTH gl-shader-get-int ; inline GL_INFO_LOG_LENGTH gl-shader-get-int ; inline
: gl-shader-info-log ( shader -- log ) : gl-shader-info-log ( shader -- log )
dup gl-shader-info-log-length dup gl-shader-info-log-length dup [
dup [ [ 0 <int> swap glGetShaderInfoLog ] keep
0 <int> over glGetShaderInfoLog
alien>char-string alien>char-string
] with-malloc ; ] with-malloc ;
@ -330,9 +329,10 @@ PREDICATE: gl-shader fragment-shader (fragment-shader?) ;
GL_INFO_LOG_LENGTH gl-program-get-int ; inline GL_INFO_LOG_LENGTH gl-program-get-int ; inline
: gl-program-info-log ( program -- log ) : gl-program-info-log ( program -- log )
dup gl-program-info-log-length dup gl-program-info-log-length dup [
dup [ [ 0 <int> swap glGetProgramInfoLog ] keep [ 0 <int> swap glGetProgramInfoLog ] keep
alien>char-string ] with-malloc ; alien>char-string
] with-malloc ;
: check-gl-program ( program -- program* ) : check-gl-program ( program -- program* )
dup gl-program-ok? [ dup gl-program-info-log throw ] unless ; dup gl-program-ok? [ dup gl-program-info-log throw ] unless ;
@ -342,7 +342,8 @@ PREDICATE: gl-shader fragment-shader (fragment-shader?) ;
: gl-program-shaders ( program -- shaders ) : gl-program-shaders ( program -- shaders )
dup gl-program-shaders-length [ dup gl-program-shaders-length [
dup "GLuint" <c-array> 0 <int> over glGetAttachedShaders dup "GLuint" <c-array>
[ 0 <int> swap glGetAttachedShaders ] keep
] keep c-uint-array> ; ] keep c-uint-array> ;
: delete-gl-program-only ( program -- ) : delete-gl-program-only ( program -- )