Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db02bde7 authored Oct 20, 2010 by Mathias Agopian Committed by Android Git Automerger Oct 20, 2010

am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread

Merge commit '583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp

* commit '583fefc8dcadecc7fc933513d3569dd9c16c100c':
  Use the context_priority extension when present.

parents 3f9f60fa 3c85e4ad

services/surfaceflinger/Android.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,10 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
	ifeq ($(TARGET_BOARD_PLATFORM), omap3)		ifeq ($(TARGET_BOARD_PLATFORM), omap3)
	LOCAL_CFLAGS += -DNO_RGBX_8888		LOCAL_CFLAGS += -DNO_RGBX_8888
	endif		endif
			ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)
			LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY
			endif


	# need "-lrt" on Linux simulator to pick up clock_gettime		# need "-lrt" on Linux simulator to pick up clock_gettime
	ifeq ($(TARGET_SIMULATOR),true)		ifeq ($(TARGET_SIMULATOR),true)

services/surfaceflinger/DisplayHardware/DisplayHardware.cpp

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -199,7 +199,17 @@ void DisplayHardware::init(uint32_t dpy)
	* Create our OpenGL ES context		* Create our OpenGL ES context
	*/		*/

	context = eglCreateContext(display, config, NULL, NULL);
			EGLint contextAttributes[] = {
			#ifdef EGL_IMG_context_priority
			#ifdef HAS_CONTEXT_PRIORITY
			#warning "using EGL_IMG_context_priority"
			EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG,
			#endif
			#endif
			EGL_NONE, EGL_NONE
			};
			context = eglCreateContext(display, config, NULL, contextAttributes);

	mDisplay = display;		mDisplay = display;
	mConfig = config;		mConfig = config;