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

Commit 3f45e44a authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Squashed commit of the following:"

parents f75e9680 8b42e8a5

include/surfaceflinger/Surface.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ private: 
    // MediaPlayer needs access to ISurface for display

    friend class MediaPlayer;

    friend class IOMX;

    friend class SoftwareRenderer;

    // this is just to be able to write some unit tests

    friend class Test;

services/surfaceflinger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" 
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES



ifeq ($(TARGET_BOARD_PLATFORM), omap3)

	LOCAL_CFLAGS += -DNO_RGBX_8888

	LOCAL_CFLAGS += -DNO_RGBX_8888 -DHAS_PUSH_BUFFERS

endif



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

services/surfaceflinger/SurfaceFlinger.cpp

+22 −19
Original line number Diff line number Diff line
@@ -1211,9 +1211,12 @@ sp<ISurface> SurfaceFlinger::createSurface(const sp<Client>& client, int pid, 
    sp<Layer> normalLayer;

    switch (flags & eFXSurfaceMask) {

        case eFXSurfaceNormal:

#if HAS_PUSH_BUFFERS

            if (UNLIKELY(flags & ePushBuffers)) {

                layer = createPushBuffersSurface(client, d, w, h, flags);

            } else {

            } else

#endif

            {

                normalLayer = createNormalSurface(client, d, w, h, flags, format);

                layer = normalLayer;

            }