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

Commit 04961491 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change to using sysprop for libEGL and EGL_test" into rvc-dev am: ef960f8a am: 55ae21cc 

Change-Id: I1a6242534eaf58c0b7ea72de4e5f67013326fa39
parents a5893ca1 55ae21cc

opengl/libs/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ cc_library_shared { 
        "libnativebridge_lazy",

        "libnativeloader_lazy",

        "libutils",

        "libSurfaceFlingerProp",

    ],

    static_libs: [

        "libEGL_getProcAddress",
@@ -165,6 +166,7 @@ cc_library_shared { 
        symbol_file: "libEGL.map.txt",

        versions: ["29"],

    },

    header_libs: ["libsurfaceflinger_headers"],

}



cc_test {

opengl/libs/EGL/egl_display.cpp

+3 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "egl_object.h"

#include "egl_tls.h"



#include <SurfaceFlingerProperties.h>

#include <android/dlext.h>

#include <dlfcn.h>

#include <graphicsenv/GraphicsEnv.h>
@@ -361,9 +362,7 @@ EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) { 


        // Note: CDD requires that devices supporting wide color and/or HDR color also support

        // the EGL_KHR_gl_colorspace extension.

        bool wideColorBoardConfig =

                getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasWideColorDisplay>(

                        false);

        bool wideColorBoardConfig = android::sysprop::has_wide_color_display(false);



        // Add wide-color extensions if device can support wide-color

        if (wideColorBoardConfig && hasColorSpaceSupport) {
@@ -373,8 +372,7 @@ EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) { 
                    "EGL_EXT_gl_colorspace_display_p3_passthrough ");

        }



        bool hasHdrBoardConfig =

                getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>(false);

        bool hasHdrBoardConfig = android::sysprop::has_HDR_display(false);



        if (hasHdrBoardConfig && hasColorSpaceSupport) {

            // hasHDRBoardConfig indicates the system is capable of supporting HDR content.

opengl/tests/EGLTest/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ cc_test { 
        "liblog",

        "libutils",

        "libnativewindow",

        "libSurfaceFlingerProp",

    ],



    include_dirs: [
@@ -34,5 +35,6 @@ cc_test { 


    header_libs: [

        "bionic_libc_platform_headers",

        "libsurfaceflinger_headers",

    ],

}

opengl/tests/EGLTest/EGL_test.cpp

+3 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <gtest/gtest.h>



#include <SurfaceFlingerProperties.h>

#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>



#include <configstore/Utils.h>
@@ -52,11 +53,9 @@ using namespace android::hardware::configstore::V1_0; 


#define METADATA_SCALE(x) (static_cast<EGLint>(x * EGL_METADATA_SCALING_EXT))



static bool hasWideColorDisplay =

        getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasWideColorDisplay>(false);

static bool hasWideColorDisplay = android::sysprop::has_wide_color_display(false);



static bool hasHdrDisplay =

        getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>(false);

static bool hasHdrDisplay = android::sysprop::has_HDR_display(false);



class EGLTest : public ::testing::Test {

public:

services/surfaceflinger/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ cc_library_shared { 
    export_shared_lib_headers: [

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

        "libhidlbase",

        "libui",

    ],

    export_static_lib_headers: [

        "SurfaceFlingerProperties",