Skip to content
The Jenkins Controller is preparing for shutdown. No new builds can be started.
Success

Changes

Summary

  1. Added allin one shader stripped for graph. (details)
  2. tegra2: split fragment shaders into two (a - 1st pass, b - 2nd pass) ; (details)
  3. Fix intendation (details)
  4. Fixed shader entry files a/b (details)
  5. Graph: Reflect shader name change in impl. TODO: Use/switch to 2nd pass (details)
  6. tegra: refine disabled discard, ie keep logic/math intact. Rami ? (details)
  7. Graph Shader Simplification, 'a'/'b' redefined; GraphUI 2-pass demo; (details)
  8. adb scripts: pass through '$*' for device naming, ie '-s device00:5555' (details)
Commit 5e06a8d665c65554904f9358e5dc0fb01c120639 by Sven Gothel
Added allin one shader stripped for graph.

tegra2 hunting, single pass, no discard, lowp,
and removed uneeded variables
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-sp-xxx.vp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-sp-xxx.fp (diff)
Commit 2689d5d6c892d197ba10240ee4c2e281032e6ade by Sven Gothel
tegra2: split fragment shaders into two (a - 1st pass, b - 2nd pass) ; disabled discard

- 1st pass (a) and 2nd pass (b), split at branch.
- all include are on one level.
- disabled discard, as it seems to be problematic

Todo:
- verify discard / pass-split on tegra2
- refect second pass usage (b) in implementation
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/precision.glsl (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-xxx.fp (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-sp-xxx.vp (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/consts.glsl (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/uniforms.glsl (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.vp (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-es2.fp (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/varyings.glsl (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp (diff)
Commit ea8129ebe2a2ec1157bb752e435d16aab2ee932a by Sven Gothel
Fixed shader entry files a/b
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-sp-xxx.vp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2-merged.vp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-gl2.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-gl2.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-es2-merged.fp (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-gl2.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-es2.fp (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-sp-xxx.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-es2.fp (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.fp (diff)
Commit 0fff6032340aec5510aba121a0a7415dbf223222 by Sven Gothel
Graph: Reflect shader name change in impl. TODO: Use/switch to 2nd pass shader
The file was modifiedmake/scripts/tests.sh (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java (diff)
Commit c76e858c7f4481cab2dae6e079e0db35e3b591e6 by Sven Gothel
tegra: refine disabled discard, ie keep logic/math intact. Rami ?
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp (diff)
Commit a095b7da968533120306ff9ef019685b6698272c by Sven Gothel
Graph Shader Simplification, 'a'/'b' redefined; GraphUI 2-pass demo;

Graph Shader Simplification

  - remove enable factor and 2nd 'discard' branch

  - use build-in 'max'/'clamp' functions, supposed to be faster

Graph Shader 'a'/'b' redefined

  - 'a' is 1-pass shader only

  - 'b' is 2-pass incl. (1st pass + 2nd pass)
    - Works well on ARM Mali-400 MP (Galaxy S2).
    - Doesn't work on NV tegra2 (P1202: Texture's gl states do not match with shader's),
      however 2-pass on mobile seems to be overkill for now.
      We may create a workaround (switch shader ..).

GraphUI 2-pass demo;
  - Propagate renderModes and texSize to UIShape's render(..)
  - TODO: Remove GL dependency in UIShape, maybe use a callback or visitor model
  - Adding GarpUI 2-pass launcher (Android and Standalone)
The file was modifiedmake/scripts/tests.sh (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-xxx.fp (diff)
The file was addedsrc/android/com/jogamp/android/launcher/NEWTLauncherGraphUI2pActivity.java (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02b-xxx.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02b-es2.fp (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/uniforms.glsl (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/consts.glsl (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02a-xxx.fp (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-gl2.fp (diff)
The file was removedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-es2.fp (diff)
The file was modifiedmake/resources/android/res-launcher/values/strings.xml (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java (diff)
The file was removedsrc/test/com/jogamp/opengl/test/android/NEWTGraphUIActivity.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/graph/demos/ui/SceneUIController.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIGLListener01.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneNewtDemo01.java (diff)
The file was modifiedmake/resources/android/AndroidManifest-launcher.xml (diff)
The file was addedsrc/test/com/jogamp/opengl/test/android/NEWTGraphUI2pActivity.java (diff)
The file was removedsrc/android/com/jogamp/android/launcher/NEWTLauncherGraphUIActivity.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02a-gl2.fp (diff)
The file was addedsrc/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneNewtDemo02.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02b-gl2.fp (diff)
The file was addedsrc/test/com/jogamp/opengl/test/android/NEWTGraphUI1pActivity.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/graph/demos/ui/RIButton.java (diff)
The file was addedsrc/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02a-es2.fp (diff)
The file was addedsrc/android/com/jogamp/android/launcher/NEWTLauncherGraphUI1pActivity.java (diff)
Commit d9c11aa31f5aae6e93715c0e732d76fd10375f18 by Sven Gothel
adb scripts: pass through '$*' for device naming, ie '-s device00:5555' or '-s 390adf8383'
The file was modifiedmake/scripts/adb-uninstall-all.sh (diff)
The file was modifiedmake/scripts/adb-install-all.sh (diff)
The file was modifiedmake/scripts/adb-reinstall-all.sh (diff)