diff options
| author | Mathias Agopian <mathias@google.com> | 2013-08-28 15:27:30 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2013-08-28 15:27:30 -0700 |
| commit | 672ddf2b58b6c6ddef4fc4f296e5fa53910d8e3b (patch) | |
| tree | 9b8afc0c6500623469e699be8aa6a8a9c3b23d7a /opengl/libs | |
| parent | f4486c6ea4bcb728ee0f38df7a8ec75c389d9d2e (diff) | |
| download | frameworks_native-672ddf2b58b6c6ddef4fc4f296e5fa53910d8e3b.zip frameworks_native-672ddf2b58b6c6ddef4fc4f296e5fa53910d8e3b.tar.gz frameworks_native-672ddf2b58b6c6ddef4fc4f296e5fa53910d8e3b.tar.bz2 | |
remove adreno 130 workaround support
Change-Id: I8ea5ee65d405114b30cfaa44e1a0c971d1ef2a61
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 15 |
2 files changed, 0 insertions, 19 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index eb263d3..528b983 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 0380521..26240f1 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", |