summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-04-02 18:12:32 +0800
committerOwen Lin <owenlin@google.com>2012-04-02 18:12:32 +0800
commitba7d106f7e4fcb0036e694449e6fc5b002526309 (patch)
treec9c338286ec546e384a46615e7bfad3f861fd624 /src
parentb29a27f475a2c449abdda8d4e03d30914feed8c6 (diff)
downloadandroid_packages_apps_Gallery2-ba7d106f7e4fcb0036e694449e6fc5b002526309.tar.gz
android_packages_apps_Gallery2-ba7d106f7e4fcb0036e694449e6fc5b002526309.tar.bz2
android_packages_apps_Gallery2-ba7d106f7e4fcb0036e694449e6fc5b002526309.zip
Delete buffers and textures in GL.
Change-Id: I7cd6647c7da56040c040f43859ce8e440db7b498
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/ui/GLCanvasImpl.java4
-rw-r--r--src/com/android/gallery3d/ui/GLId.java8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/ui/GLCanvasImpl.java b/src/com/android/gallery3d/ui/GLCanvasImpl.java
index 686e712bd..6411a3165 100644
--- a/src/com/android/gallery3d/ui/GLCanvasImpl.java
+++ b/src/com/android/gallery3d/ui/GLCanvasImpl.java
@@ -673,13 +673,13 @@ public class GLCanvasImpl implements GLCanvas {
synchronized (mUnboundTextures) {
IntArray ids = mUnboundTextures;
if (ids.size() > 0) {
- GLId.glDeleteTextures(ids.size(), ids.getInternalArray(), 0);
+ GLId.glDeleteTextures(mGL, ids.size(), ids.getInternalArray(), 0);
ids.clear();
}
ids = mDeleteBuffers;
if (ids.size() > 0) {
- GLId.glDeleteBuffers(ids.size(), ids.getInternalArray(), 0);
+ GLId.glDeleteBuffers(mGL, ids.size(), ids.getInternalArray(), 0);
ids.clear();
}
}
diff --git a/src/com/android/gallery3d/ui/GLId.java b/src/com/android/gallery3d/ui/GLId.java
index c228c350d..6151177d6 100644
--- a/src/com/android/gallery3d/ui/GLId.java
+++ b/src/com/android/gallery3d/ui/GLId.java
@@ -16,6 +16,8 @@
package com.android.gallery3d.ui;
+import javax.microedition.khronos.opengles.GL11;
+
// This mimics corresponding GL functions.
public class GLId {
static int sNextId = 1;
@@ -32,9 +34,11 @@ public class GLId {
}
}
- public synchronized static void glDeleteTextures(int n, int[] textures, int offset) {
+ public synchronized static void glDeleteTextures(GL11 gl, int n, int[] textures, int offset) {
+ gl.glDeleteTextures(n, textures, offset);
}
- public synchronized static void glDeleteBuffers(int n, int[] buffers, int offset) {
+ public synchronized static void glDeleteBuffers(GL11 gl, int n, int[] buffers, int offset) {
+ gl.glDeleteBuffers(n, buffers, offset);
}
}