diff options
| -rw-r--r-- | services/surfaceflinger/common/FlagManager.cpp | 74 | ||||
| -rw-r--r-- | services/surfaceflinger/common/include/common/FlagManager.h | 80 |
2 files changed, 79 insertions, 75 deletions
diff --git a/services/surfaceflinger/common/FlagManager.cpp b/services/surfaceflinger/common/FlagManager.cpp index 7f3936ba8f..e80cd78cbd 100644 --- a/services/surfaceflinger/common/FlagManager.cpp +++ b/services/surfaceflinger/common/FlagManager.cpp @@ -112,61 +112,63 @@ void FlagManager::dump(std::string& result) const { DUMP_LEGACY_SERVER_FLAG(use_skia_tracing); /// Trunk stable server (R/W) flags /// - DUMP_ACONFIG_FLAG(refresh_rate_overlay_on_external_display); DUMP_ACONFIG_FLAG(adpf_gpu_sf); DUMP_ACONFIG_FLAG(adpf_native_session_manager); DUMP_ACONFIG_FLAG(adpf_use_fmq_channel); DUMP_ACONFIG_FLAG(graphite_renderengine_preview_rollout); + DUMP_ACONFIG_FLAG(refresh_rate_overlay_on_external_display); /// Trunk stable readonly flags /// + /// IMPORTANT - please keep alphabetize to reduce merge conflicts + DUMP_ACONFIG_FLAG(add_sf_skipped_frames_to_trace); DUMP_ACONFIG_FLAG(adpf_fmq_sf); + DUMP_ACONFIG_FLAG(allow_n_vsyncs_in_targeter); DUMP_ACONFIG_FLAG(arr_setframerate_gte_enum); - DUMP_ACONFIG_FLAG(connected_display); - DUMP_ACONFIG_FLAG(enable_small_area_detection); - DUMP_ACONFIG_FLAG(stable_edid_ids); - DUMP_ACONFIG_FLAG(frame_rate_category_mrr); - DUMP_ACONFIG_FLAG(misc1); - DUMP_ACONFIG_FLAG(vrr_config); - DUMP_ACONFIG_FLAG(hdcp_level_hal); - DUMP_ACONFIG_FLAG(multithreaded_present); - DUMP_ACONFIG_FLAG(add_sf_skipped_frames_to_trace); - DUMP_ACONFIG_FLAG(use_known_refresh_rate_for_fps_consistency); + DUMP_ACONFIG_FLAG(begone_bright_hlg); DUMP_ACONFIG_FLAG(cache_when_source_crop_layer_only_moved); - DUMP_ACONFIG_FLAG(enable_fro_dependent_features); + DUMP_ACONFIG_FLAG(commit_not_composited); + DUMP_ACONFIG_FLAG(connected_display); + DUMP_ACONFIG_FLAG(connected_display_hdr); + DUMP_ACONFIG_FLAG(correct_dpi_with_display_size); + DUMP_ACONFIG_FLAG(deprecate_frame_tracker); + DUMP_ACONFIG_FLAG(deprecate_vsync_sf); + DUMP_ACONFIG_FLAG(detached_mirror); + DUMP_ACONFIG_FLAG(display_config_error_hal); DUMP_ACONFIG_FLAG(display_protected); + DUMP_ACONFIG_FLAG(dont_skip_on_early_ro); + DUMP_ACONFIG_FLAG(enable_fro_dependent_features); + DUMP_ACONFIG_FLAG(enable_layer_command_batching); + DUMP_ACONFIG_FLAG(enable_small_area_detection); + DUMP_ACONFIG_FLAG(filter_frames_before_trace_starts); + DUMP_ACONFIG_FLAG(flush_buffer_slots_to_uncache); + DUMP_ACONFIG_FLAG(force_compile_graphite_renderengine); DUMP_ACONFIG_FLAG(fp16_client_target); + DUMP_ACONFIG_FLAG(frame_rate_category_mrr); DUMP_ACONFIG_FLAG(game_default_frame_rate); - DUMP_ACONFIG_FLAG(enable_layer_command_batching); - DUMP_ACONFIG_FLAG(vulkan_renderengine); - DUMP_ACONFIG_FLAG(renderable_buffer_usage); - DUMP_ACONFIG_FLAG(vrr_bugfix_24q4); - DUMP_ACONFIG_FLAG(vrr_bugfix_dropped_frame); - DUMP_ACONFIG_FLAG(restore_blur_step); - DUMP_ACONFIG_FLAG(dont_skip_on_early_ro); - DUMP_ACONFIG_FLAG(no_vsyncs_on_screen_off); - DUMP_ACONFIG_FLAG(protected_if_client); - DUMP_ACONFIG_FLAG(idle_screen_refresh_rate_timeout); DUMP_ACONFIG_FLAG(graphite_renderengine); - DUMP_ACONFIG_FLAG(filter_frames_before_trace_starts); + DUMP_ACONFIG_FLAG(hdcp_level_hal); + DUMP_ACONFIG_FLAG(idle_screen_refresh_rate_timeout); DUMP_ACONFIG_FLAG(latch_unsignaled_with_auto_refresh_changed); - DUMP_ACONFIG_FLAG(deprecate_vsync_sf); - DUMP_ACONFIG_FLAG(allow_n_vsyncs_in_targeter); - DUMP_ACONFIG_FLAG(detached_mirror); - DUMP_ACONFIG_FLAG(commit_not_composited); - DUMP_ACONFIG_FLAG(correct_dpi_with_display_size); DUMP_ACONFIG_FLAG(local_tonemap_screenshots); + DUMP_ACONFIG_FLAG(misc1); + DUMP_ACONFIG_FLAG(multithreaded_present); + DUMP_ACONFIG_FLAG(no_vsyncs_on_screen_off); DUMP_ACONFIG_FLAG(override_trusted_overlay); - DUMP_ACONFIG_FLAG(flush_buffer_slots_to_uncache); - DUMP_ACONFIG_FLAG(force_compile_graphite_renderengine); + DUMP_ACONFIG_FLAG(protected_if_client); + DUMP_ACONFIG_FLAG(reject_dupe_layerstacks); + DUMP_ACONFIG_FLAG(renderable_buffer_usage); + DUMP_ACONFIG_FLAG(restore_blur_step); + DUMP_ACONFIG_FLAG(skip_invisible_windows_in_input); + DUMP_ACONFIG_FLAG(stable_edid_ids); DUMP_ACONFIG_FLAG(trace_frame_rate_override); DUMP_ACONFIG_FLAG(true_hdr_screenshots); - DUMP_ACONFIG_FLAG(display_config_error_hal); - DUMP_ACONFIG_FLAG(connected_display_hdr); - DUMP_ACONFIG_FLAG(deprecate_frame_tracker); - DUMP_ACONFIG_FLAG(skip_invisible_windows_in_input); - DUMP_ACONFIG_FLAG(begone_bright_hlg); + DUMP_ACONFIG_FLAG(use_known_refresh_rate_for_fps_consistency); + DUMP_ACONFIG_FLAG(vrr_bugfix_24q4); + DUMP_ACONFIG_FLAG(vrr_bugfix_dropped_frame); + DUMP_ACONFIG_FLAG(vrr_config); + DUMP_ACONFIG_FLAG(vulkan_renderengine); DUMP_ACONFIG_FLAG(window_blur_kawase2); - DUMP_ACONFIG_FLAG(reject_dupe_layerstacks); + /// IMPORTANT - please keep alphabetize to reduce merge conflicts #undef DUMP_ACONFIG_FLAG #undef DUMP_LEGACY_SERVER_FLAG diff --git a/services/surfaceflinger/common/include/common/FlagManager.h b/services/surfaceflinger/common/include/common/FlagManager.h index e42aa68208..c7f97b4008 100644 --- a/services/surfaceflinger/common/include/common/FlagManager.h +++ b/services/surfaceflinger/common/include/common/FlagManager.h @@ -48,63 +48,65 @@ public: bool use_skia_tracing() const; /// Trunk stable server (R/W) flags /// - bool refresh_rate_overlay_on_external_display() const; bool adpf_gpu_sf() const; - bool adpf_use_fmq_channel() const; bool adpf_native_session_manager() const; + bool adpf_use_fmq_channel() const; bool adpf_use_fmq_channel_fixed() const; bool graphite_renderengine_preview_rollout() const; + bool refresh_rate_overlay_on_external_display() const; /// Trunk stable readonly flags /// - bool arr_setframerate_gte_enum() const; - bool adpf_fmq_sf() const; - bool connected_display() const; - bool frame_rate_category_mrr() const; - bool enable_small_area_detection() const; - bool stable_edid_ids() const; - bool misc1() const; - bool vrr_config() const; - bool hdcp_level_hal() const; - bool multithreaded_present() const; + /// IMPORTANT - please keep alphabetize to reduce merge conflicts bool add_sf_skipped_frames_to_trace() const; - bool use_known_refresh_rate_for_fps_consistency() const; + bool adpf_fmq_sf() const; + bool allow_n_vsyncs_in_targeter() const; + bool arr_setframerate_gte_enum() const; + bool begone_bright_hlg() const; bool cache_when_source_crop_layer_only_moved() const; - bool enable_fro_dependent_features() const; + bool commit_not_composited() const; + bool connected_display() const; + bool connected_display_hdr() const; + bool correct_dpi_with_display_size() const; + bool deprecate_frame_tracker() const; + bool deprecate_vsync_sf() const; + bool detached_mirror() const; + bool display_config_error_hal() const; bool display_protected() const; + bool dont_skip_on_early_ro() const; + bool enable_fro_dependent_features() const; + bool enable_layer_command_batching() const; + bool enable_small_area_detection() const; + bool filter_frames_before_trace_starts() const; + bool flush_buffer_slots_to_uncache() const; + bool force_compile_graphite_renderengine() const; bool fp16_client_target() const; + bool frame_rate_category_mrr() const; bool game_default_frame_rate() const; - bool enable_layer_command_batching() const; - bool vulkan_renderengine() const; - bool vrr_bugfix_24q4() const; - bool vrr_bugfix_dropped_frame() const; - bool renderable_buffer_usage() const; - bool restore_blur_step() const; - bool dont_skip_on_early_ro() const; - bool no_vsyncs_on_screen_off() const; - bool protected_if_client() const; - bool idle_screen_refresh_rate_timeout() const; bool graphite_renderengine() const; - bool filter_frames_before_trace_starts() const; + bool hdcp_level_hal() const; + bool idle_screen_refresh_rate_timeout() const; bool latch_unsignaled_with_auto_refresh_changed() const; - bool deprecate_vsync_sf() const; - bool allow_n_vsyncs_in_targeter() const; - bool detached_mirror() const; - bool commit_not_composited() const; - bool correct_dpi_with_display_size() const; bool local_tonemap_screenshots() const; + bool luts_api() const; + bool misc1() const; + bool multithreaded_present() const; + bool no_vsyncs_on_screen_off() const; bool override_trusted_overlay() const; - bool flush_buffer_slots_to_uncache() const; - bool force_compile_graphite_renderengine() const; + bool protected_if_client() const; + bool reject_dupe_layerstacks() const; + bool renderable_buffer_usage() const; + bool restore_blur_step() const; + bool skip_invisible_windows_in_input() const; + bool stable_edid_ids() const; bool trace_frame_rate_override() const; bool true_hdr_screenshots() const; - bool display_config_error_hal() const; - bool connected_display_hdr() const; - bool deprecate_frame_tracker() const; - bool skip_invisible_windows_in_input() const; - bool begone_bright_hlg() const; - bool luts_api() const; + bool use_known_refresh_rate_for_fps_consistency() const; + bool vrr_bugfix_24q4() const; + bool vrr_bugfix_dropped_frame() const; + bool vrr_config() const; + bool vulkan_renderengine() const; bool window_blur_kawase2() const; - bool reject_dupe_layerstacks() const; + /// IMPORTANT - please keep alphabetize to reduce merge conflicts protected: // overridden for unit tests |