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

Commit 4fcab095 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5085055 from 069c68b7 to qt-release 

Change-Id: I3f01d806cb3d6902bdb25498e6a9800e9cbbd58f
parents 00790d56 069c68b7

libs/ui/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ cc_library_shared { 


    shared_libs: [

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.common@1.1",

        "android.hardware.graphics.common@1.2",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@2.1",

        "android.hardware.configstore@1.0",
@@ -97,7 +97,7 @@ cc_library_shared { 
    ],



    export_shared_lib_headers: [

        "android.hardware.graphics.common@1.1",

        "android.hardware.graphics.common@1.2",

    ],



    static_libs: [

libs/ui/DebugUtils.cpp

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,9 @@ std::string decodeColorMode(ColorMode colorMode) { 
        case ColorMode::BT2020:

            return std::string("ColorMode::BT2020");



        case ColorMode::DISPLAY_BT2020:

            return std::string("ColorMode::DISPLAY_BT2020");



        case ColorMode::BT2100_PQ:

            return std::string("ColorMode::BT2100_PQ");

libs/ui/include/ui/GraphicTypes.h

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once



#include <android/hardware/graphics/common/1.1/types.h>

#include <android/hardware/graphics/common/1.2/types.h>

#include <system/graphics.h>



// android::ui::* in this header file will alias different types as
@@ -25,10 +26,10 @@ namespace android { 
namespace ui {



using android::hardware::graphics::common::V1_0::Hdr;

using android::hardware::graphics::common::V1_1::ColorMode;

using android::hardware::graphics::common::V1_1::Dataspace;

using android::hardware::graphics::common::V1_1::PixelFormat;

using android::hardware::graphics::common::V1_1::RenderIntent;

using android::hardware::graphics::common::V1_2::ColorMode;

using android::hardware::graphics::common::V1_2::Dataspace;



}  // namespace ui

}  // namespace android

opengl/tools/glgen/specs/egl/EGL15.spec

+2 −0
Original line number Diff line number Diff line
@@ -10,3 +10,5 @@ EGLDisplay eglGetPlatformDisplay ( EGLenum platform, EGLAttrib native_display, c 
EGLSurface eglCreatePlatformWindowSurface ( EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list )

EGLSurface eglCreatePlatformPixmapSurface ( EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list )

EGLBoolean eglWaitSync ( EGLDisplay dpy, EGLSync sync, EGLint flags )

EGLImage eglCreateImage ( EGLDisplay dpy, EGLContext context, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list )

EGLBoolean eglDestroyImage ( EGLDisplay dpy, EGLImage image )

opengl/tools/glgen/specs/egl/checks.spec

+2 −0
Original line number Diff line number Diff line
@@ -11,3 +11,5 @@ eglQuerySurface check value 1 
//STUB function: eglCreatePbufferFromClientBuffer nullAllowed attrib_list sentinel attrib_list EGL_NONE

eglCreateContext sentinel attrib_list EGL_NONE

eglQueryContext check value 1

//unsupported: eglCreatePlatformPixmapSurface nullAllowed attrib_list sentinel attrib_list EGL_NONE

eglCreatePlatformPixmapSurface unsupported