summaryrefslogtreecommitdiffstats
path: root/make/config/jogl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-01-14 19:38:49 +0100
committerSven Gothel <[email protected]>2014-01-14 19:38:49 +0100
commitf8a74c9831c65725a699320c27e62161a0378241 (patch)
treed98f024c84ab31404e4b8bb7608dd60941965f4b /make/config/jogl
parent961930f9e2cd40dc4de736201bcfa68c1ff09909 (diff)
Revert "Bug 942 - Share GLBufferStateTracker ; Unify GLBufferStateTracker and GLBufferSizeTracker (simplification)"
This reverts commit 7c5483d5b20aed9c87c5ce3f6bc840b6546edcd1.
Diffstat (limited to 'make/config/jogl')
-rw-r--r--make/config/jogl/gl-common.cfg2
-rw-r--r--make/config/jogl/gl-gl4bc.cfg2
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-common.java6
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java3
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gles1.java3
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gles3.java3
6 files changed, 14 insertions, 5 deletions
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index ee4af5e69..b84115445 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -557,7 +557,7 @@ JavaEpilogue glPushClientAttrib bufferStateTracker.clearBufferObjectState();
JavaEpilogue glPushClientAttrib glStateTracker.pushAttrib(mask);
JavaEpilogue glPopClientAttrib bufferStateTracker.clearBufferObjectState();
JavaEpilogue glPopClientAttrib glStateTracker.popAttrib();
-JavaEpilogue glBufferData bufferStateTracker.setBufferSize({0}, this, {1});
+JavaEpilogue glBufferData bufferSizeTracker.setBufferSize(bufferStateTracker, {0}, this, {1});
BufferObjectKind Array glColorPointer
BufferObjectKind Array glEdgeFlagPointer
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index e6e85e2e5..c3a392c52 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -59,7 +59,7 @@ Include gl2_es2-CustomJavaCode.cfg
# can only be computed by calling another routine
ManuallyImplement glMapNamedBufferEXT
ForceProcAddressGen glMapNamedBufferEXT
-JavaEpilogue glNamedBufferDataEXT bufferStateTracker.setDirectStateBufferSize({0}, this, {1});
+JavaEpilogue glNamedBufferDataEXT bufferSizeTracker.setDirectStateBufferSize({0}, this, {1});
# Manuall implement glDebugMessageCallback* using the proc address resolver
ForceProcAddressGen glDebugMessageCallback
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java
index 3aeda1309..b8da61065 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-common.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java
@@ -11,7 +11,7 @@
@Override
public final long glGetBufferSize(int buffer) {
- return bufferStateTracker.getDirectStateBufferSize(buffer, this);
+ return bufferSizeTracker.getDirectStateBufferSize(buffer, this);
}
@Override
@@ -135,7 +135,7 @@
if (glProcAddress == 0) {
throw new GLException("Method \""+(useRange?"glMapBufferRange":"glMapBuffer")+"\" not available");
}
- final long sz = bufferStateTracker.getBufferSize(target, this);
+ final long sz = bufferSizeTracker.getBufferSize(bufferStateTracker, target, this);
if (0 == sz) {
return null;
}
@@ -188,7 +188,7 @@
if (glProcAddress == 0) {
throw new GLException("Method \"glMapNamedBufferEXT\" not available");
}
- final long sz = bufferStateTracker.getDirectStateBufferSize(bufferName, this);
+ final long sz = bufferSizeTracker.getDirectStateBufferSize(bufferName, this);
if (0 == sz) {
return null;
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index 980603edc..e7389de10 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -18,9 +18,11 @@ public void setObjectTracker(GLObjectTracker tracker) {
public GL4bcImpl(GLProfile glp, GLContextImpl context) {
this._context = context;
if(null != context) {
+ this.bufferSizeTracker = context.getBufferSizeTracker();
this.bufferStateTracker = context.getBufferStateTracker();
this.glStateTracker = context.getGLStateTracker();
} else {
+ this.bufferSizeTracker = null;
this.bufferStateTracker = null;
this.glStateTracker = null;
}
@@ -278,6 +280,7 @@ public final void glFreeMemoryNV(java.nio.ByteBuffer pointer) {
// Helpers for ensuring the correct amount of texture data
//
+private final GLBufferSizeTracker bufferSizeTracker;
private final GLBufferStateTracker bufferStateTracker;
private final GLStateTracker glStateTracker;
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index 1d1cf3abf..8d5dcc7a5 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -1,9 +1,11 @@
public GLES1Impl(GLProfile glp, GLContextImpl context) {
this._context = context;
if(null != context) {
+ this.bufferSizeTracker = context.getBufferSizeTracker();
this.bufferStateTracker = context.getBufferStateTracker();
this.glStateTracker = context.getGLStateTracker();
} else {
+ this.bufferSizeTracker = null;
this.bufferStateTracker = null;
this.glStateTracker = null;
}
@@ -197,6 +199,7 @@ public final GL2GL3 getGL2GL3() throws GLException {
// Helpers for ensuring the correct amount of texture data
//
+private final GLBufferSizeTracker bufferSizeTracker;
private final GLBufferStateTracker bufferStateTracker;
private final GLStateTracker glStateTracker;
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
index 006ee4da1..d5ad16873 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
@@ -2,9 +2,11 @@
public GLES3Impl(GLProfile glp, GLContextImpl context) {
this._context = context;
if(null != context) {
+ this.bufferSizeTracker = context.getBufferSizeTracker();
this.bufferStateTracker = context.getBufferStateTracker();
this.glStateTracker = context.getGLStateTracker();
} else {
+ this.bufferSizeTracker = null;
this.bufferStateTracker = null;
this.glStateTracker = null;
}
@@ -209,6 +211,7 @@ public final GL2GL3 getGL2GL3() throws GLException {
//
private final boolean _isES3;
+private final GLBufferSizeTracker bufferSizeTracker;
private final GLBufferStateTracker bufferStateTracker;
private final GLStateTracker glStateTracker;