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

Commit 89366b4e authored by Tim Van Patten's avatar Tim Van Patten Committed by Android (Google) Code Review
Browse files

Merge "Move flag feature_overrides to namespace "gpu"" into main

parents 6d5046f0 473ebe72

libs/graphicsenv/GraphicsEnv.cpp

+2 −2
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ const std::vector<std::string>& GraphicsEnv::getAngleEglFeatures() { 
// List of ANGLE features to override (enabled or disable).

// The list of overrides is loaded and parsed by GpuService.

void GraphicsEnv::updateAngleFeatureOverrides() {

    if (!graphicsenv_flags::feature_overrides()) {

    if (!graphicsenv_flags::angle_feature_overrides()) {

        return;

    }
@@ -654,7 +654,7 @@ void GraphicsEnv::updateAngleFeatureOverrides() { 


void GraphicsEnv::getAngleFeatureOverrides(std::vector<const char*>& enabled,

                                           std::vector<const char*>& disabled) {

    if (!graphicsenv_flags::feature_overrides()) {

    if (!graphicsenv_flags::angle_feature_overrides()) {

        return;

    }

libs/graphicsenv/graphicsenv_flags.aconfig

+3 −3
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ package: "com.android.graphics.graphicsenv.flags" 
container: "system"



flag {

  name: "feature_overrides"

  namespace: "core_graphics"

  description: "This flag controls the Feature Overrides in GraphicsEnv."

  name: "angle_feature_overrides"

  namespace: "gpu"

  description: "This flag controls the ANGLE Feature Overrides in GraphicsEnv."

  bug: "372694741"

}

opengl/libs/EGL/egl_display.cpp

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static EGLDisplay getPlatformDisplayAngle(EGLNativeDisplayType display, egl_conn 
            }

        }



        if (graphicsenv_flags::feature_overrides()) {

        if (graphicsenv_flags::angle_feature_overrides()) {

            // Get the list of ANGLE features to enable from Global.Settings.

            const auto& eglFeatures = GraphicsEnv::getInstance().getAngleEglFeatures();

            for (const std::string& eglFeature : eglFeatures) {

services/gpuservice/GpuService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void GpuService::toggleAngleAsSystemDriver(bool enabled) { 
}



FeatureOverrides GpuService::getFeatureOverrides() {

    if (!graphicsenv_flags::feature_overrides()) {

    if (!graphicsenv_flags::angle_feature_overrides()) {

        FeatureOverrides featureOverrides;

        return featureOverrides;

    }
@@ -183,7 +183,7 @@ status_t GpuService::shellCommand(int /*in*/, int out, int err, std::vector<Stri 
        ALOGV("  arg[%zu]: '%s'", i, String8(args[i]).c_str());



    if (!args.empty()) {

        if (graphicsenv_flags::feature_overrides()) {

        if (graphicsenv_flags::angle_feature_overrides()) {

            if (args[0] == String16("featureOverrides"))

                return cmdFeatureOverrides(out, err);

        }
@@ -267,7 +267,7 @@ status_t cmdHelp(int out) { 
            "GPU Service commands:\n"

            "  vkjson      dump Vulkan properties as JSON\n"

            "  vkprofiles  print support for select Vulkan profiles\n");

    if (graphicsenv_flags::feature_overrides()) {

    if (graphicsenv_flags::angle_feature_overrides()) {

        fprintf(outs,

                "  featureOverrides  update and output gpuservice's feature overrides\n");

    }