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

Commit 8b42e8a5 authored by Andreas Huber's avatar Andreas Huber
Browse files

Squashed commit of the following: 

commit 35cc68814a9537c31fde146e171e7b0bbdfe211e
Author: Andreas Huber <andih@google.com>
Date:   Mon Aug 16 08:48:42 2010 -0700

    Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else.

commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 13 13:56:44 2010 -0700

    The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise.

commit 684972074b74318bdcb826ed9b5b0864d2d2e273
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 13 09:34:35 2010 -0700

    A first shot at supporting the new rendering APIs.

Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
parent 76c043ad

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;

            }