remove adreno 130 workaround support (672ddf2b) · Commits · e / devices / smdk4412 / android_frameworks_native

opengl/libs/Android.mk

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -48,10 +48,6 @@ LOCAL_CFLAGS += -DEGL_TRACE=1
	ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true)		ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true)
	LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION		LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION
	endif		endif

	ifeq ($(TARGET_BOARD_PLATFORM),msm7k)
	LOCAL_CFLAGS += -DADRENO130=1
	endif
	ifeq ($(TARGET_BOARD_PLATFORM), omap4)		ifeq ($(TARGET_BOARD_PLATFORM), omap4)
	LOCAL_CFLAGS += -DWORKAROUND_BUG_10194508=1		LOCAL_CFLAGS += -DWORKAROUND_BUG_10194508=1
	endif		endif

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -150,21 +150,6 @@ EGLBoolean egl_display_t::initialize(EGLint major, EGLint minor) {
	cnx->major = -1;		cnx->major = -1;
	cnx->minor = -1;		cnx->minor = -1;
	if (cnx->dso) {		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;		EGLDisplay idpy = disp.dpy;
	if (cnx->egl.eglInitialize(idpy, &cnx->major, &cnx->minor)) {		if (cnx->egl.eglInitialize(idpy, &cnx->major, &cnx->minor)) {
	//ALOGD("initialized dpy=%p, ver=%d.%d, cnx=%p",		//ALOGD("initialized dpy=%p, ver=%d.%d, cnx=%p",