diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index eb263d368..528b983dd 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -48,10 +48,6 @@ LOCAL_CFLAGS += -DEGL_TRACE=1 ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true) LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION endif - -ifeq ($(TARGET_BOARD_PLATFORM),msm7k) - LOCAL_CFLAGS += -DADRENO130=1 -endif ifeq ($(TARGET_BOARD_PLATFORM), omap4) LOCAL_CFLAGS += -DWORKAROUND_BUG_10194508=1 endif diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index 038052198..26240f1bc 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -150,21 +150,6 @@ EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) { cnx->major = -1; cnx->minor = -1; if (cnx->dso) { - -#if defined(ADRENO130) -#warning "Adreno-130 eglInitialize() workaround" - /* - * The ADRENO 130 driver returns a different EGLDisplay each time - * eglGetDisplay() is called, but also makes the EGLDisplay invalid - * after eglTerminate() has been called, so that eglInitialize() - * cannot be called again. Therefore, we need to make sure to call - * eglGetDisplay() before calling eglInitialize(); - */ - if (i == IMPL_HARDWARE) { - disp[i].dpy = cnx->egl.eglGetDisplay(EGL_DEFAULT_DISPLAY); - } -#endif - EGLDisplay idpy = disp.dpy; if (cnx->egl.eglInitialize(idpy, &cnx->major, &cnx->minor)) { //ALOGD("initialized dpy=%p, ver=%d.%d, cnx=%p",