diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-07-07 17:00:53 +0200 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-07-10 11:17:53 +0200 |
commit | 2c7c21b3f498fa15361ce9218aba1baa38643d8d (patch) | |
tree | 170a9fddb4c4830228fb2c59706ba35e4c6939c2 /android | |
parent | Fix function signature (diff) | |
download | core-2c7c21b3f498fa15361ce9218aba1baa38643d8d.tar.gz core-2c7c21b3f498fa15361ce9218aba1baa38643d8d.zip |
LOAndroid3: upgrade TextureGenerator/Reaper to the latest version
Change-Id: Ic84d3f0901f071a22af411d914a51a2ba92dbf9f
Diffstat (limited to 'android')
-rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java | 102 | ||||
-rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java | 63 |
2 files changed, 73 insertions, 92 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java index 4392c55e1ae7..15272618d337 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java @@ -1,52 +1,30 @@ /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Android code. - * - * The Initial Developer of the Original Code is Mozilla Foundation. - * Portions created by the Initial Developer are Copyright (C) 2009-2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * James Willcox <jwillcox@mozilla.com> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.mozilla.gecko.gfx; -import android.opengl.GLES10; -import java.util.Stack; +import android.opengl.GLES20; +import android.util.Log; + +import java.util.concurrent.ArrayBlockingQueue; + +import javax.microedition.khronos.egl.EGL10; +import javax.microedition.khronos.egl.EGLContext; public class TextureGenerator { - private static final int MIN_TEXTURES = 5; + private static final String LOGTAG = "TextureGenerator"; + private static final int POOL_SIZE = 5; private static TextureGenerator sSharedInstance; - private Stack<Integer> mTextureIds; - private TextureGenerator() { mTextureIds = new Stack<Integer>(); } + private ArrayBlockingQueue<Integer> mTextureIds; + private EGLContext mContext; + + private TextureGenerator() { + mTextureIds = new ArrayBlockingQueue<Integer>(POOL_SIZE); + } public static TextureGenerator get() { if (sSharedInstance == null) @@ -55,19 +33,45 @@ public class TextureGenerator { } public synchronized int take() { - if (mTextureIds.empty()) + try { + // Will block until one becomes available + return (int) mTextureIds.take(); + } catch (InterruptedException e) { return 0; - - return (int)mTextureIds.pop(); + } } public synchronized void fill() { - int[] textures = new int[1]; - while (mTextureIds.size() < MIN_TEXTURES) { - GLES10.glGenTextures(1, textures, 0); - mTextureIds.push(textures[0]); + EGL10 egl = (EGL10) EGLContext.getEGL(); + EGLContext context = egl.eglGetCurrentContext(); + + if (mContext != null && mContext != context) { + mTextureIds.clear(); } - } -} + mContext = context; + int numNeeded = mTextureIds.remainingCapacity(); + if (numNeeded == 0) + return; + + // Clear existing GL errors + int error; + while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) { + Log.w(LOGTAG, String.format("Clearing GL error: %#x", error)); + } + + int[] textures = new int[numNeeded]; + GLES20.glGenTextures(numNeeded, textures, 0); + + error = GLES20.glGetError(); + if (error != GLES20.GL_NO_ERROR) { + Log.e(LOGTAG, String.format("Failed to generate textures: %#x", error), new Exception()); + return; + } + + for (int i = 0; i < numNeeded; i++) { + mTextureIds.offer(textures[i]); + } + } +} diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java index e18139cb9bc9..3063e5bf8412 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java @@ -1,52 +1,24 @@ /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Android code. - * - * The Initial Developer of the Original Code is Mozilla Foundation. - * Portions created by the Initial Developer are Copyright (C) 2009-2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Patrick Walton <pcwalton@mozilla.com> - * Arkady Blyakher <rkadyb@mit.edu> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.mozilla.gecko.gfx; import android.opengl.GLES20; + import java.util.ArrayList; -/** Manages a list of dead tiles, so we don't leak resources. */ +/** + * Manages a list of dead tiles, so we don't leak resources. + */ public class TextureReaper { private static TextureReaper sSharedInstance; private ArrayList<Integer> mDeadTextureIDs; - private TextureReaper() { mDeadTextureIDs = new ArrayList<Integer>(); } + private TextureReaper() { + mDeadTextureIDs = new ArrayList<Integer>(); + } public static TextureReaper get() { if (sSharedInstance == null) @@ -64,13 +36,18 @@ public class TextureReaper { } public void reap() { - int[] deadTextureIDs = new int[mDeadTextureIDs.size()]; - for (int i = 0; i < deadTextureIDs.length; i++) + int numTextures = mDeadTextureIDs.size(); + // Adreno 200 will generate INVALID_VALUE if len == 0 is passed to glDeleteTextures, + // even though it's not supposed to. + if (numTextures == 0) + return; + + int[] deadTextureIDs = new int[numTextures]; + for (int i = 0; i < numTextures; i++) { deadTextureIDs[i] = mDeadTextureIDs.get(i); + } mDeadTextureIDs.clear(); GLES20.glDeleteTextures(deadTextureIDs.length, deadTextureIDs, 0); } -} - - +}
\ No newline at end of file |