summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/java/android/view/GLES20Canvas.java8
-rw-r--r--core/java/android/view/HardwareRenderer.java18
-rw-r--r--core/jni/android_view_GLES20Canvas.cpp6
-rw-r--r--libs/hwui/LayerCache.cpp2
-rw-r--r--libs/hwui/OpenGLRenderer.cpp16
-rw-r--r--libs/hwui/OpenGLRenderer.h10
6 files changed, 52 insertions, 8 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java
index 11a5d698355a..e0c4b14b591e 100644
--- a/core/java/android/view/GLES20Canvas.java
+++ b/core/java/android/view/GLES20Canvas.java
@@ -148,9 +148,15 @@ class GLES20Canvas extends Canvas {
void onPreDraw() {
nPrepare(mRenderer);
}
-
+
private native void nPrepare(int renderer);
+ void onPostDraw() {
+ nFinish(mRenderer);
+ }
+
+ private native void nFinish(int renderer);
+
@Override
public boolean acquireContext() {
if (!mContextLocked) {
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index 5d85076a1f6a..3796994bc8ef 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -210,7 +210,7 @@ public abstract class HardwareRenderer {
* is invoked and the requested flag is turned off. The error code is
* also logged as a warning.
*/
- void checkErrors() {
+ void checkEglErrors() {
if (isEnabled()) {
int error = sEgl.eglGetError();
if (error != EGL10.EGL_SUCCESS) {
@@ -221,7 +221,7 @@ public abstract class HardwareRenderer {
// we'll try again if it was context lost
setRequested(false);
}
- Log.w(LOG_TAG, "OpenGL error: " + error);
+ Log.w(LOG_TAG, "EGL error: " + Integer.toHexString(error));
}
}
}
@@ -348,7 +348,7 @@ public abstract class HardwareRenderer {
void initializeIfNeeded(int width, int height, View.AttachInfo attachInfo,
SurfaceHolder holder) {
if (isRequested()) {
- checkErrors();
+ checkEglErrors();
super.initializeIfNeeded(width, height, attachInfo, holder);
}
}
@@ -386,6 +386,9 @@ public abstract class HardwareRenderer {
void onPreDraw() {
}
+ void onPostDraw() {
+ }
+
/**
* Defines the EGL configuration for this renderer. The default configuration
* is RGBX, no depth, no stencil.
@@ -418,10 +421,12 @@ public abstract class HardwareRenderer {
canvas.restoreToCount(saveCount);
}
+ onPostDraw();
+
attachInfo.mIgnoreDirtyState = false;
sEgl.eglSwapBuffers(sEglDisplay, mEglSurface);
- checkErrors();
+ checkEglErrors();
}
}
@@ -570,6 +575,11 @@ public abstract class HardwareRenderer {
mGlCanvas.onPreDraw();
}
+ @Override
+ void onPostDraw() {
+ mGlCanvas.onPostDraw();
+ }
+
static HardwareRenderer create(boolean translucent) {
if (GLES20Canvas.isAvailable()) {
return new Gl20Renderer(translucent);
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp
index aa717468050e..a61a9d1048d3 100644
--- a/core/jni/android_view_GLES20Canvas.cpp
+++ b/core/jni/android_view_GLES20Canvas.cpp
@@ -84,6 +84,11 @@ static void android_view_GLES20Canvas_prepare(JNIEnv* env, jobject canvas,
renderer->prepare();
}
+static void android_view_GLES20Canvas_finish(JNIEnv* env, jobject canvas,
+ OpenGLRenderer* renderer) {
+ renderer->finish();
+}
+
static void android_view_GLES20Canvas_acquireContext(JNIEnv* env, jobject canvas,
OpenGLRenderer* renderer) {
renderer->acquireContext();
@@ -384,6 +389,7 @@ static JNINativeMethod gMethods[] = {
{ "nDestroyRenderer", "(I)V", (void*) android_view_GLES20Canvas_destroyRenderer },
{ "nSetViewport", "(III)V", (void*) android_view_GLES20Canvas_setViewport },
{ "nPrepare", "(I)V", (void*) android_view_GLES20Canvas_prepare },
+ { "nFinish", "(I)V", (void*) android_view_GLES20Canvas_finish },
{ "nAcquireContext", "(I)V", (void*) android_view_GLES20Canvas_acquireContext },
{ "nReleaseContext", "(I)V", (void*) android_view_GLES20Canvas_releaseContext },
diff --git a/libs/hwui/LayerCache.cpp b/libs/hwui/LayerCache.cpp
index 1a18766e1d2e..39c311115167 100644
--- a/libs/hwui/LayerCache.cpp
+++ b/libs/hwui/LayerCache.cpp
@@ -110,11 +110,9 @@ Layer* LayerCache::get(LayerSize& size) {
layer = new Layer;
layer->blend = true;
- // Generate the texture in which the FBO will draw
glGenTextures(1, &layer->texture);
glBindTexture(GL_TEXTURE_2D, layer->texture);
- // The FBO will not be scaled, so we can use lower quality filtering
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index f187d3ec3d9c..670d049956f9 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -124,6 +124,8 @@ OpenGLRenderer::OpenGLRenderer(): mCaches(Caches::getInstance()) {
if (maxTextureUnits < REQUIRED_TEXTURE_UNITS_COUNT) {
LOGW("At least %d texture units are required!", REQUIRED_TEXTURE_UNITS_COUNT);
}
+
+ glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
}
OpenGLRenderer::~OpenGLRenderer() {
@@ -161,6 +163,15 @@ void OpenGLRenderer::prepare() {
mSnapshot->setClip(0.0f, 0.0f, mWidth, mHeight);
}
+void OpenGLRenderer::finish() {
+#if DEBUG_OPENGL
+ GLenum status = GL_NO_ERROR;
+ while ((status = glGetError()) != GL_NO_ERROR) {
+ LOGD("GL error from OpenGLRenderer: 0x%x", status);
+ }
+#endif
+}
+
void OpenGLRenderer::acquireContext() {
if (mCaches.currentProgram) {
if (mCaches.currentProgram->isInUse()) {
@@ -342,7 +353,10 @@ bool OpenGLRenderer::createLayer(sp<Snapshot> snapshot, float left, float top,
// Layers only make sense if they are in the framebuffer's bounds
bounds.intersect(*mSnapshot->clipRect);
- if (bounds.isEmpty()) return false;
+ if (bounds.isEmpty() || bounds.getWidth() > mMaxTextureSize ||
+ bounds.getHeight() > mMaxTextureSize) {
+ return false;
+ }
LayerSize size(bounds.getWidth(), bounds.getHeight());
Layer* layer = mCaches.layerCache.get(size);
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index 49a69f97c9af..387fb1297506 100644
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -45,6 +45,13 @@ namespace android {
namespace uirenderer {
///////////////////////////////////////////////////////////////////////////////
+// Defines
+///////////////////////////////////////////////////////////////////////////////
+
+// Debug
+#define DEBUG_OPENGL 1
+
+///////////////////////////////////////////////////////////////////////////////
// Renderer
///////////////////////////////////////////////////////////////////////////////
@@ -59,6 +66,7 @@ public:
void setViewport(int width, int height);
void prepare();
+ void finish();
void acquireContext();
void releaseContext();
@@ -395,6 +403,8 @@ private:
// List of rectangles to clear due to calls to saveLayer()
Vector<Rect*> mLayers;
+ GLint mMaxTextureSize;
+
}; // class OpenGLRenderer
}; // namespace uirenderer
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-20 13:42:36 +0000