From f6e4b4afcec4425f266536d02fd0487e383aa1c4 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 7 Apr 2023 09:23:20 +0200 Subject: VBORegion2P*ES2: Just instantiate SyncMatrices4f16 in place, drop local ref --- src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java | 3 +-- src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/jogl/classes/jogamp/graph') diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java index e70657b76..bc5fe7d11 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java @@ -81,7 +81,6 @@ public final class VBORegion2PMSAAES2 extends GLRegion { private final GLUniformData gcu_FboTexUnit; private final Matrix4f matP = new Matrix4f(); private final Matrix4f matMv = new Matrix4f(); - private final SyncMatrices4f16 pmvMatrix02 = new SyncMatrices4f16( new Matrix4f[] { matP, matMv } ); private final GLUniformData gcu_PMVMatrix02; private ShaderProgram spPass2 = null; @@ -114,7 +113,7 @@ public final class VBORegion2PMSAAES2 extends GLRegion { colorTexBBox = null; gcu_ColorTexBBox = null; } - gcu_PMVMatrix02 = new GLUniformData(UniformNames.gcu_PMVMatrix02, 4, 4, pmvMatrix02); + gcu_PMVMatrix02 = new GLUniformData(UniformNames.gcu_PMVMatrix02, 4, 4, new SyncMatrices4f16( new Matrix4f[] { matP, matMv } )); // Pass 2: gcu_FboTexUnit = new GLUniformData(UniformNames.gcu_FboTexUnit, pass2TexUnit); diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java index 844ba5e38..a7fce3a92 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java @@ -49,7 +49,6 @@ import com.jogamp.graph.curve.opengl.RenderState; import com.jogamp.opengl.FBObject; import com.jogamp.opengl.FBObject.Attachment; import com.jogamp.opengl.FBObject.TextureAttachment; -import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.math.Matrix4f; import com.jogamp.opengl.math.Recti; import com.jogamp.opengl.math.geom.AABBox; @@ -116,7 +115,6 @@ public final class VBORegion2PVBAAES2 extends GLRegion { private final GLUniformData gcu_FboTexSize; private final Matrix4f matP = new Matrix4f(); private final Matrix4f matMv = new Matrix4f(); - private final SyncMatrices4f16 pmvMatrix02 = new SyncMatrices4f16( new Matrix4f[] { matP, matMv } ); private final GLUniformData gcu_PMVMatrix02; private ShaderProgram spPass2 = null; @@ -207,7 +205,7 @@ public final class VBORegion2PVBAAES2 extends GLRegion { colorTexBBox = null; gcu_ColorTexBBox = null; } - gcu_PMVMatrix02 = new GLUniformData(UniformNames.gcu_PMVMatrix02, 4, 4, pmvMatrix02); + gcu_PMVMatrix02 = new GLUniformData(UniformNames.gcu_PMVMatrix02, 4, 4, new SyncMatrices4f16( new Matrix4f[] { matP, matMv } )); // Pass 2: gcu_FboTexUnit = new GLUniformData(UniformNames.gcu_FboTexUnit, pass2TexUnit); -- cgit v1.2.3