Kaydet (Commit) 9a52bad4 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

android: don't crash in TextureReaper when Integer is null

Change-Id: I1514aa7a3fbab682b0d282ba0f504470943d7e4a
üst 6d9124de
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
package org.mozilla.gecko.gfx; package org.mozilla.gecko.gfx;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -14,28 +15,30 @@ import java.util.ArrayList; ...@@ -14,28 +15,30 @@ import java.util.ArrayList;
*/ */
public class TextureReaper { public class TextureReaper {
private static TextureReaper sSharedInstance; private static TextureReaper sSharedInstance;
private ArrayList<Integer> mDeadTextureIDs; private ArrayList<Integer> mDeadTextureIDs = new ArrayList<Integer>();
private static final String LOGTAG = TextureReaper.class.getSimpleName();
private TextureReaper() { private TextureReaper() {
mDeadTextureIDs = new ArrayList<Integer>();
} }
public static TextureReaper get() { public static TextureReaper get() {
if (sSharedInstance == null) if (sSharedInstance == null) {
sSharedInstance = new TextureReaper(); sSharedInstance = new TextureReaper();
}
return sSharedInstance; return sSharedInstance;
} }
public void add(int[] textureIDs) { public void add(int[] textureIDs) {
for (int textureID : textureIDs) for (int textureID : textureIDs) {
add(textureID); add(textureID);
} }
}
public void add(int textureID) { public synchronized void add(int textureID) {
mDeadTextureIDs.add(textureID); mDeadTextureIDs.add(textureID);
} }
public void reap() { public synchronized void reap() {
int numTextures = mDeadTextureIDs.size(); int numTextures = mDeadTextureIDs.size();
// Adreno 200 will generate INVALID_VALUE if len == 0 is passed to glDeleteTextures, // Adreno 200 will generate INVALID_VALUE if len == 0 is passed to glDeleteTextures,
// even though it's not supposed to. // even though it's not supposed to.
...@@ -44,8 +47,14 @@ public class TextureReaper { ...@@ -44,8 +47,14 @@ public class TextureReaper {
int[] deadTextureIDs = new int[numTextures]; int[] deadTextureIDs = new int[numTextures];
for (int i = 0; i < numTextures; i++) { for (int i = 0; i < numTextures; i++) {
Integer id = mDeadTextureIDs.get(i);
if (id == null) {
deadTextureIDs[i] = 0;
Log.e(LOGTAG, "Dead texture id is null");
} else {
deadTextureIDs[i] = mDeadTextureIDs.get(i); deadTextureIDs[i] = mDeadTextureIDs.get(i);
} }
}
mDeadTextureIDs.clear(); mDeadTextureIDs.clear();
GLES20.glDeleteTextures(deadTextureIDs.length, deadTextureIDs, 0); GLES20.glDeleteTextures(deadTextureIDs.length, deadTextureIDs, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment