aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/jogamp/graph
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-04-05 01:44:07 +0200
committerSven Gothel <[email protected]>2011-04-05 01:44:07 +0200
commit8297ef88b927e07b41760ab3e9de05bc49fd4695 (patch)
treefa04678a48b061c6a5355623fbba4012ff5a1be5 /src/jogl/classes/com/jogamp/graph
parent2f2879256fe999c5019bd800f564e9cb2a83a0b6 (diff)
Fix: shaderProgram.program(); glBindAttribLocation() call; dispose/disposeImpl sequence;
Use shaderProgram.program() instead of shaderProgram.id() - the id() is just a unique sequence name. Call glBindAttribLocation() after program object init and before linkage. Chain call disposeImpl() properly to fix destruction sequence: TextRendererImpl01 -> TextRenderer -> GlyphString -> Region RegionRendererImpl01 -> RegionRenderer -> Region
Diffstat (limited to 'src/jogl/classes/com/jogamp/graph')
-rw-r--r--src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java5
-rw-r--r--src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
index c1fec10b8..c6e03cad6 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
@@ -54,6 +54,11 @@ public abstract class RegionRenderer extends Renderer {
regions.clear();
}
+ @Override
+ protected void disposeImpl(GL2ES2 gl) {
+ flushCache();
+ }
+
/** Create an ogl {@link Region} defining this {@link OutlineShape}
* @param sharpness parameter for Region generation
* @return the resulting Region.
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
index 79ae8c11e..45f78fc23 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
@@ -72,6 +72,11 @@ public abstract class TextRenderer extends Renderer {
stringCacheArray.clear();
}
+ @Override
+ protected void disposeImpl(GL2ES2 gl) {
+ flushCache();
+ }
+
public final void setCacheMaxSize(int newSize ) { stringCacheMaxSize = newSize; validateCache(0); }
public final int getCacheMaxSize() { return stringCacheMaxSize; }
public final int getCacheSize() { return stringCacheArray.size(); }