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

Changes

Summary

  1. FloatUtil/PMVMatrix/GLUniformData: Move impl. of FloatBuffer matrix (details)
  2. UITestCase: Only print each display/reshape in verbose mode (details)
  3. GLBuffers.slice: Preserve parent buffer position/limit and the parent's (details)
  4. ImmModeSink: Fix bugs (use glBufferUsage, vboUsage, GL_POLYGON, (details)
  5. TestSWTAccessor03AWTGLn: Add '-time <duration>' commandline option (details)
  6. GLUniformData: add null format string to Buffers.toString() (details)
  7. GLUniformData.toString() matrix: Add matrix offset .. (details)
  8. Simplify GLArrayHandler and reduce VBO sideffects (details)
  9. GLArrayData* VBO binding: Adding explicit bindBuffer(..) method, since (details)
  10. ES2Impl fix: Remove code which could imply recursion if !ES2Compatible (details)
  11. ShaderState: Clean-up debug / verbose output. attachShaderProgram(..) (details)
  12. Enhance FixedFuncPipeline: Multi-Texture, Tex-Env, Alpha-Test, Lighting (details)
  13. Adding unit tests for ImmModeSink and FixedFunctionPipeline (single & (details)
Commit 6ac1c8c8995458671cf603e46bff89fcaefd8146 by Sven Gothel
FloatUtil/PMVMatrix/GLUniformData: Move impl. of FloatBuffer matrix toString(..) from PMVMatrix to FloatUtil and make it more generic; GLUniformData toString() also dumps it's matrices.
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/acore/TestPMVMatrix01NEWT.java (diff)
The file was modifiedsrc/jogl/classes/javax/media/opengl/GLUniformData.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/FloatUtil.java (diff)
Commit 1a6da1537cc7681eb1e5fe3abb26e53b3423e742 by Sven Gothel
UITestCase: Only print each display/reshape in verbose mode
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/util/UITestCase.java (diff)
Commit 13402255253dcfc64aa773f0756201ec805ec063 by Sven Gothel
GLBuffers.slice: Preserve parent buffer position/limit and the parent's byte-order for sliced result
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/GLBuffers.java (diff)
Commit 34d7e1f13a107e63bd234e4b31782cfb46feb4c0 by Sven Gothel
ImmModeSink: Fix bugs (use glBufferUsage, vboUsage, GL_POLYGON, GL_QUADS) and add API docs. (API Change)

- Changed create*(..) factory methods (API Change)
  - Drop passing GL instance, not needed
    - allows creation of ImmModeSink as final field w/o GL context
  - Use 'glBufferUsage' to determine whether to use VBO or not ( 0 == glBufferUsage )

- Use glBufferUsage in glBufferData(..) call (oops)

- Toggle vboUsage per object ( 0 == glBufferUsage ? nonVBO : VBO )
  remove static VBO usage flag

- Fix render mode
  - GL_POLYGON -> GL_TRIANGLE_FAN (not GL_LINES)
  - GL_QUADS -> Looped GL_TRIANGLE_FAN (is !GL2) in draw(..) w/ and w/o indices

- Buffer usage

  - documented

  - allow creating sink w/ all components (vertices, color, normal and texCoords)
    bit render and grow only used parts.
    This allows proper usage of sink where it is not known
    which types are being used.

- Added test case

- Manually tested w/ Jake2 ES1
  Jake2 uses the FFP immediate mode rendering, where we utilize this sink
  w/o rendering artifacts.
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java (diff)
The file was addedsrc/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES1NEWT.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es2/MultisampleDemoES2.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es1/MultisampleDemoES1.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es1/OneTriangle.java (diff)
Commit 5cabafe5482ae2f7b4bb447a225eb2a6477fee4d by Sven Gothel
TestSWTAccessor03AWTGLn: Add '-time <duration>' commandline option
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java (diff)
Commit 70d5b080a196bf9cbb71938e443c1110d9ea989c by Sven Gothel
GLUniformData: add null format string to Buffers.toString()
The file was modifiedsrc/jogl/classes/javax/media/opengl/GLUniformData.java (diff)
Commit fb3795504f7b05000651a9ea558dbb1b2a3b16f5 by Sven Gothel
GLUniformData.toString() matrix: Add matrix offset ..
The file was modifiedsrc/jogl/classes/javax/media/opengl/GLUniformData.java (diff)
Commit 8582ece7dc7f65271b3184261697a542766d9864 by Sven Gothel
Simplify GLArrayHandler and reduce VBO sideffects

VBO: Always unbind VBO ASAP after data transfer (glBufferData())
     and assignment (glVertexPointer(..), glVertexAttribPointer()).
     It's a bug to leave it bound .. due to redundancy
     and other calls which could have change the VBO binding.

Removed syncData(..), now it's only issued at enable
and hence migrated into the enable method.
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerInterleaved.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/GLDataArrayHandler.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerFlat.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerFlat.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/GLArrayHandlerFlat.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/GLArrayHandlerInterleaved.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/GLArrayHandler.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/GLFixedArrayHandler.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandler.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java (diff)
Commit f49f8e22953ed2426fd4264ee407e2dc3fc07cfc by Sven Gothel
GLArrayData* VBO binding: Adding explicit bindBuffer(..) method, since VBO is not more bound after enableBuffer(); Fix unit test (test VBO bound).

Explicit bindBuffer(..) is required now, since enableBuffer() doesn't leave it bound.
See fixed VBORegion* patch for use case, i.e. using a VBO index buffer for glDrawElements().

Complets commit 8582ece7dc7f65271b3184261697a542766d9864.
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/glsl/GLSLMiscHelper.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java (diff)
Commit 1e34dc6467d6309ae06dfe5ec317723a5b728789 by Sven Gothel
ES2Impl fix: Remove code which could imply recursion if !ES2Compatible (although impossible, but looks bad)
The file was modifiedmake/config/jogl/gl2_es2-common.cfg (diff)
The file was modifiedmake/config/jogl/gl-gl4bc.cfg (diff)
Commit da258d10d4e929bb2993e7a0329ad32d079fd731 by Sven Gothel
ShaderState: Clean-up debug / verbose output. attachShaderProgram(..) still issues UseProgram is enable==true, but no program switch.

More versatile toString(StringBuilder sb, boolean alsoUnlocated), by default don't dump uniforms/attributes
w/o valid location.
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java (diff)
Commit e3ee1e25276760cba5db0333301d3ba19d62dd69 by Sven Gothel
Enhance FixedFuncPipeline: Multi-Texture, Tex-Env, Alpha-Test, Lighting (fix, incomplete still), ShaderSelectionMode, Fix default values

Besides the above mentioned additional features towards completness of the FFP emu,
the ShaderSelectionMode allows fixating a shader program configuration,
i.e. AUTO switch (default) or choosing a static shader program to avoid heavy program switches
incl. uniform/attribute updates.
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_uniform_light.glsl (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_const.glsl (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColor.fp (diff)
The file was modifiedsrc/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorLight.vp (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncHook.java (diff)
The file was addedsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/ShaderSelectionMode.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java (diff)
The file was addedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_alphatest.fp (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_uniform.glsl (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/mgl_lightdef.glsl (diff)
Commit 2958508131e5f0b3336f07c6f1c2865eb954921b by Sven Gothel
Adding unit tests for ImmModeSink and FixedFunctionPipeline (single & combinations, plus texture usage)
The file was addedsrc/test/com/jogamp/opengl/test/junit/jogl/util/DemoGL2ES1ImmModeSink.java (diff)
The file was modifiedmake/scripts/tests.sh (diff)
The file was addedsrc/test/com/jogamp/opengl/test/junit/jogl/util/DemoGL2ES1TextureImmModeSink.java (diff)
The file was addedsrc/test/com/jogamp/opengl/test/junit/jogl/util/DemoGL2ES1Plain.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/util/UITestCase.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestGearsES1NEWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestRedSquareES1NEWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES1NEWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es1/RedSquareES1.java (diff)
The file was addedsrc/test/com/jogamp/opengl/test/junit/jogl/util/TestES1FixedFunctionPipelineNEWT.java (diff)