diff options
| author | Sven Gothel <[email protected]> | 2011-04-25 15:54:35 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-04-25 15:54:35 +0200 |
| commit | 727ad54808664e3028fee64cfca98dd9f0bcfbf6 (patch) | |
| tree | 94446464532d741d533038e35b3fabd3abb40d0e /make/scripts | |
| parent | e24ea541924d365c8a0896245436ca55e1575a22 (diff) | |
ShaderState: 'Update' vertexAttribMap on enable
ShaderProgram:
- shaderCode's HashMap -> HashSet
- adding HashSet for attached ShaderCode
- link: allow relink, attachShader only if not yet attached
- new add(gl, ShaderCode, ..) method, allowing compile/attach pre linkage
- remove boxing of integer 'id', use generics style (warnings)
- rename: glReplaceShader -> replaceShader, glUseProgram -> useProgram
- fix: replaceShader
- hashCode _is_ 'id'
ShaderCode:
- remove boxing of integer 'id', use generics style (warnings)
- hashCode _is_ 'id'
ShaderUtil: Use generics style (warnings), static names
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/tests.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index bd0a4777d..73780a7de 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -74,7 +74,8 @@ function jrun() { #D_ARGS="-Djogl.debug.GLCanvas" #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler" #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL" - D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL" + D_ARGS="-Djogl.debug.GLDebugMessageHandler" + #D_ARGS="-Djogl.debug.GLDebugMessageHandler -Djogl.debug.DebugGL" #D_ARGS="-Dnativewindow.debug.ToolkitLock.TraceLock" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState" @@ -208,9 +209,9 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT $* #testnoawt com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 $* -testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $* +#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01 $* -#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 $* +testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $* |