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

Commit 47a79466 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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

Merge commit 'fb31036fd844444c395a2ae9c97439eec9f774e4'

* commit 'fb31036fd844444c395a2ae9c97439eec9f774e4':
  Use the context_priority extension when present.
parents f6715ba6 db02bde7

services/surfaceflinger/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES 
ifeq ($(TARGET_BOARD_PLATFORM), omap3)

	LOCAL_CFLAGS += -DNO_RGBX_8888 -DHAS_PUSH_BUFFERS

endif

ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)

	LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY

endif





# need "-lrt" on Linux simulator to pick up clock_gettime

ifeq ($(TARGET_SIMULATOR),true)

services/surfaceflinger/DisplayHardware/DisplayHardware.cpp

+12 −2
Original line number Diff line number Diff line
@@ -199,7 +199,17 @@ void DisplayHardware::init(uint32_t dpy) 
     * 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;

    mConfig  = config;