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

Commit 7756859a authored by Kra1o5's avatar Kra1o5 Committed by Ethan Yonker
Browse files

Add support for RGBA_8888 pixel format 

Change-Id: Ia15d49e51cad5bc8a3291975e1ff515a2b1c419c
parent a59da09d

minui.old/Android.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,9 @@ LOCAL_MODULE := libminui 
# ordinary characters in this context).  Strip double-quotes from the

# ordinary characters in this context).  Strip double-quotes from the

# value so that either will work.

# value so that either will work.





ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBA_8888)

  LOCAL_CFLAGS += -DRECOVERY_RGBA

endif

ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBX_8888)

ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBX_8888)

  LOCAL_CFLAGS += -DRECOVERY_RGBX

  LOCAL_CFLAGS += -DRECOVERY_RGBX

endif

endif

minui.old/graphics.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,9 @@ 
#if defined(RECOVERY_BGRA)

#if defined(RECOVERY_BGRA)

#define PIXEL_FORMAT GGL_PIXEL_FORMAT_BGRA_8888

#define PIXEL_FORMAT GGL_PIXEL_FORMAT_BGRA_8888

#define PIXEL_SIZE   4

#define PIXEL_SIZE   4

#elif defined(RECOVERY_RGBA)

#define PIXEL_FORMAT GGL_PIXEL_FORMAT_RGBA_8888

#define PIXEL_SIZE   4

#elif defined(RECOVERY_RGBX)

#elif defined(RECOVERY_RGBX)

#define PIXEL_FORMAT GGL_PIXEL_FORMAT_RGBX_8888

#define PIXEL_FORMAT GGL_PIXEL_FORMAT_RGBX_8888

#define PIXEL_SIZE   4

#define PIXEL_SIZE   4
@@ -111,6 +114,15 @@ static int get_framebuffer(GGLSurface *fb) 
      vi.blue.length    = 8;

      vi.blue.length    = 8;

      vi.transp.offset  = 0;

      vi.transp.offset  = 0;

      vi.transp.length  = 8;

      vi.transp.length  = 8;

    } else if (PIXEL_FORMAT == GGL_PIXEL_FORMAT_RGBA_8888) {

      vi.red.offset     = 0;

      vi.red.length     = 8;

      vi.green.offset   = 8;

      vi.green.length   = 8;

      vi.blue.offset    = 16;

      vi.blue.length    = 8;

      vi.transp.offset  = 24;

      vi.transp.length  = 8;

    } else if (PIXEL_FORMAT == GGL_PIXEL_FORMAT_RGBX_8888) {

    } else if (PIXEL_FORMAT == GGL_PIXEL_FORMAT_RGBX_8888) {

      vi.red.offset     = 24;

      vi.red.offset     = 24;

      vi.red.length     = 8;

      vi.red.length     = 8;

minui.old/graphics_overlay.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,8 @@ static int map_mdp_pixel_format() 
    int format = MDP_RGB_565;

    int format = MDP_RGB_565;

#if defined(RECOVERY_BGRA)

#if defined(RECOVERY_BGRA)

    format = MDP_BGRA_8888;

    format = MDP_BGRA_8888;

#elif defined(RECOVERY_RGBA)

    format = MDP_RGBA_8888;

#elif defined(RECOVERY_RGBX)

#elif defined(RECOVERY_RGBX)

    format = MDP_RGBA_8888;

    format = MDP_RGBA_8888;

#endif

#endif

minui/Android.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,9 @@ LOCAL_CLANG := true 
ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),ABGR_8888)

ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),ABGR_8888)

  LOCAL_CFLAGS += -DRECOVERY_ABGR

  LOCAL_CFLAGS += -DRECOVERY_ABGR

endif

endif

ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBA_8888)

  LOCAL_CFLAGS += -DRECOVERY_RGBA

endif

ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBX_8888)

ifeq ($(subst ",,$(TARGET_RECOVERY_PIXEL_FORMAT)),RGBX_8888)

  LOCAL_CFLAGS += -DRECOVERY_RGBX

  LOCAL_CFLAGS += -DRECOVERY_RGBX

endif

endif

minui/graphics_adf.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -145,6 +145,8 @@ static GRSurface* adf_init(minui_backend *backend) 
    pdata->format = DRM_FORMAT_ABGR8888;

    pdata->format = DRM_FORMAT_ABGR8888;

#elif defined(RECOVERY_BGRA)

#elif defined(RECOVERY_BGRA)

    pdata->format = DRM_FORMAT_BGRA8888;

    pdata->format = DRM_FORMAT_BGRA8888;

#elif defined(RECOVERY_RGBA)

    pdata->format = DRM_FORMAT_RGBA8888;

#elif defined(RECOVERY_RGBX)

#elif defined(RECOVERY_RGBX)

    pdata->format = DRM_FORMAT_RGBX8888;

    pdata->format = DRM_FORMAT_RGBX8888;

#else

#else