diff options
| -rw-r--r-- | libs/graphicsenv/GraphicsEnv.cpp | 4 | ||||
| -rw-r--r-- | libs/graphicsenv/graphicsenv_flags.aconfig | 6 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 2 | ||||
| -rw-r--r-- | services/gpuservice/GpuService.cpp | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp index 626581cc2a..03e6456ea6 100644 --- a/libs/graphicsenv/GraphicsEnv.cpp +++ b/libs/graphicsenv/GraphicsEnv.cpp @@ -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; } diff --git a/libs/graphicsenv/graphicsenv_flags.aconfig b/libs/graphicsenv/graphicsenv_flags.aconfig index ac66362242..efa4bca892 100644 --- a/libs/graphicsenv/graphicsenv_flags.aconfig +++ b/libs/graphicsenv/graphicsenv_flags.aconfig @@ -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" } diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index 0dd9f198e5..efc34f6aa8 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -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) { diff --git a/services/gpuservice/GpuService.cpp b/services/gpuservice/GpuService.cpp index 25ee21fb12..46327dfbe7 100644 --- a/services/gpuservice/GpuService.cpp +++ b/services/gpuservice/GpuService.cpp @@ -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"); } |