Revert "Rootless Debug for GLES"
This reverts commit d9f0ec416aa89d8213effa8b983de974b2c667bd.
Bug: 110883880
Test: Chrome no longer crashes
Change-Id: I57d08a33a392394bd0a2cf4d7af97a3cce7ed8f5
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
index 8870d5f..1229bc2 100644
--- a/opengl/libs/EGL/egl.cpp
+++ b/opengl/libs/EGL/egl.cpp
@@ -30,10 +30,11 @@
#include "egl_tls.h"
#include "egl_display.h"
#include "egl_object.h"
-#include "egl_layers.h"
#include "CallStack.h"
#include "Loader.h"
+typedef __eglMustCastToProperFunctionPointerType EGLFuncPointer;
+
// ----------------------------------------------------------------------------
namespace android {
// ----------------------------------------------------------------------------
@@ -195,14 +196,6 @@
cnx->dso = loader.open(cnx);
}
- // Check to see if any layers are enabled and route functions through them
- if (cnx->dso) {
- // Layers can be enabled long after the drivers have been loaded.
- // They will only be initialized once.
- LayerLoader& layer_loader(LayerLoader::getInstance());
- layer_loader.InitLayers(cnx);
- }
-
return cnx->dso ? EGL_TRUE : EGL_FALSE;
}