summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2018-09-14 15:22:35 -0700
committerJohn Reck <jreck@google.com>2018-09-14 15:34:22 -0700
commitbdc9f1bb9065196e9c63f480f2924bef946be23c (patch)
treed2b5d986a3116f57aca0910fbd3e5d4cc9df0bca
parent5185bc79b1d15f8db9e7cac202fae836ea4ce954 (diff)
Disable GLES validation
Need to disable this for SurfaceTexture users specifically but the quickest is to just disable it globally Bug: 115311435 Test: builds Change-Id: I75daddf993c784238593db3d40126af0e9d0ffdc
-rw-r--r--libs/hwui/Android.bp2
-rw-r--r--libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp2
-rw-r--r--libs/hwui/renderthread/EglManager.cpp1
3 files changed, 4 insertions, 1 deletions
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 04bbe248263f..b01136361101 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -247,7 +247,7 @@ cc_library {
// Enables fine-grained GLES error checking
// If enabled, every GLES call is wrapped & error checked
// Has moderate overhead
- "hwui_enable_opengl_validation",
+ //"hwui_enable_opengl_validation",
],
}
diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
index d58b59e83380..3155aba8d2b2 100644
--- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
@@ -27,6 +27,8 @@
#include "utils/GLUtils.h"
#include "utils/TraceUtils.h"
+#include <GLES3/gl3.h>
+
#include <GrBackendSurface.h>
#include <SkBlendMode.h>
#include <SkImageInfo.h>
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp
index 5f8d7ad3373a..0685812b87f3 100644
--- a/libs/hwui/renderthread/EglManager.cpp
+++ b/libs/hwui/renderthread/EglManager.cpp
@@ -27,6 +27,7 @@
#include "Properties.h"
#include <EGL/eglext.h>
+#include <GLES/gl.h>
#include <string>
#include <vector>