Snap for 13264465 from 274565fcf5a523410fbe4c6d0e1ed9bee59a0e28 to 25Q2-release
Change-Id: Iec8808efdcd51358f668067ee60aed636e053885
diff --git a/host/features/Features.cpp b/host/features/Features.cpp
index 0e126aa..1249204 100644
--- a/host/features/Features.cpp
+++ b/host/features/Features.cpp
@@ -22,23 +22,6 @@
*this = rhs;
}
-FeatureResult FeatureDependencyHandler::checkAllDependentFeaturesAreEnabled() {
- // Only check for direct dependencies. Since we're verifying all enabled features, this should cover the whole span.
- bool allDependenciesAreEnabled = true;
- std::stringstream ss;
- for (auto const&[feature, dependentFeatures] : VK_FEATURE_DEPENDENCY_MAP) {
- if (feature->enabled && !dependentFeatures.empty()) {
- for (auto const& dep : dependentFeatures) {
- if (!dep->enabled) {
- ss << "Feature: " << feature->name << " requests missing dependency: " << dep->name << "\n";
- allDependenciesAreEnabled = false;
- }
- }
- }
- }
- return {allDependenciesAreEnabled, ss.str()};
-};
-
FeatureSet& FeatureSet::operator=(const FeatureSet& rhs) {
for (const auto& [featureName, featureInfo] : rhs.map) {
*map[featureName] = *featureInfo;
diff --git a/host/features/include/gfxstream/host/Features.h b/host/features/include/gfxstream/host/Features.h
index 2eaa0d2..1b9e6b6 100644
--- a/host/features/include/gfxstream/host/Features.h
+++ b/host/features/include/gfxstream/host/Features.h
@@ -331,18 +331,6 @@
};
};
-struct FeatureDependencyHandler {
- FeatureDependencyHandler(const FeatureSet& set) : featureSetView(set){}
- const FeatureSet& featureSetView;
- const std::map<const FeatureInfo*, std::vector<const FeatureInfo*>> VK_FEATURE_DEPENDENCY_MAP= {
- // List other dependencies here in the shape of:
- // {FEATURE_X, {DEPENDENT_FEATURE_A, DEPENDENT_FEATURE_B}}
- {&featureSetView.VulkanSnapshots, {&featureSetView.VulkanBatchedDescriptorSetUpdate, &featureSetView.Vulkan}},
- };
-
- FeatureResult checkAllDependentFeaturesAreEnabled();
-};
-
#define GFXSTREAM_SET_FEATURE_ON_CONDITION(set, feature, condition) \
do \
{ \
diff --git a/host/gl/gles1_dec/meson.build b/host/gl/gles1_dec/meson.build
index e151213..aa33366 100644
--- a/host/gl/gles1_dec/meson.build
+++ b/host/gl/gles1_dec/meson.build
@@ -11,6 +11,6 @@
'gles1_dec',
files_lib_gles1_dec,
cpp_args: gfxstream_host_args,
- include_directories: [inc_gfxstream_include, inc_include, inc_apigen_codec, inc_gles_translator],
+ include_directories: [inc_gfxstream_include, inc_include, inc_apigen_codec],
dependencies: [aemu_base_dep, aemu_logging_dep]
)
diff --git a/host/gl/gles2_dec/meson.build b/host/gl/gles2_dec/meson.build
index 91f0e16..fe75aad 100644
--- a/host/gl/gles2_dec/meson.build
+++ b/host/gl/gles2_dec/meson.build
@@ -11,7 +11,7 @@
'gles2_dec',
files_lib_gles2_dec,
cpp_args: gfxstream_host_args,
- include_directories: [inc_gfxstream_include, inc_include, inc_apigen_codec, inc_gles_translator,
+ include_directories: [inc_gfxstream_include, inc_include, inc_apigen_codec,
inc_gl_snapshot],
link_with: lib_gl_snapshot,
dependencies: [aemu_base_dep, aemu_logging_dep]
diff --git a/host/gl/glestranslator/EGL/meson.build b/host/gl/glestranslator/EGL/meson.build
index 0758656..513aa3b 100644
--- a/host/gl/glestranslator/EGL/meson.build
+++ b/host/gl/glestranslator/EGL/meson.build
@@ -52,7 +52,7 @@
'egl_translator',
files_lib_egl_translator,
cpp_args: egl_cpp_args + gfxstream_host_args,
- include_directories: [inc_gfxstream_include, inc_include, inc_gles_translator, inc_apigen_codec,
+ include_directories: [inc_gfxstream_include, inc_include, inc_gl_common, inc_apigen_codec,
inc_gl_host_common, inc_stream_servers, inc_etc],
link_with: [lib_gl_common, lib_apigen_codec, lib_gl_host_common],
dependencies: [aemu_base_dep, aemu_common_dep, aemu_snapshot_dep,
diff --git a/host/gl/glestranslator/GLES_CM/meson.build b/host/gl/glestranslator/GLES_CM/meson.build
index b8666b5..dccafd7 100644
--- a/host/gl/glestranslator/GLES_CM/meson.build
+++ b/host/gl/glestranslator/GLES_CM/meson.build
@@ -13,7 +13,7 @@
'glescm_translator',
files_lib_glescm_translator,
cpp_args: gfxstream_host_args,
- include_directories: [inc_gfxstream_include, inc_include, inc_gles_translator, inc_glm,
+ include_directories: [inc_gfxstream_include, inc_include, inc_gl_common, inc_glm,
inc_etc],
dependencies: [aemu_base_dep, aemu_logging_dep, aemu_snapshot_dep]
)
diff --git a/host/gl/glestranslator/GLES_V2/meson.build b/host/gl/glestranslator/GLES_V2/meson.build
index 28137ab..cff02f9 100644
--- a/host/gl/glestranslator/GLES_V2/meson.build
+++ b/host/gl/glestranslator/GLES_V2/meson.build
@@ -17,7 +17,7 @@
'glesv2_translator',
files_lib_glesv2_translator,
cpp_args: gfxstream_host_args,
- include_directories: [inc_gfxstream_include, inc_include, inc_gles_translator, inc_stream_servers,
+ include_directories: [inc_gfxstream_include, inc_include, inc_gl_common, inc_stream_servers,
inc_etc],
dependencies: [aemu_base_dep, aemu_logging_dep, aemu_snapshot_dep]
)
diff --git a/host/gl/glestranslator/GLcommon/meson.build b/host/gl/glestranslator/GLcommon/meson.build
index 686d94b..d1bf29c 100644
--- a/host/gl/glestranslator/GLcommon/meson.build
+++ b/host/gl/glestranslator/GLcommon/meson.build
@@ -27,7 +27,7 @@
'gl_common',
files_lib_gl_common,
cpp_args: gfxstream_host_args,
- include_directories: [inc_etc, inc_gfxstream_include, inc_include, inc_stream_servers, inc_gles_translator],
+ include_directories: [inc_etc, inc_gfxstream_include, inc_include, inc_stream_servers, inc_gl_common],
link_with: [lib_compressed_textures, lib_etc],
dependencies: [aemu_base_dep, aemu_logging_dep, aemu_snapshot_dep]
)
diff --git a/host/gl/meson.build b/host/gl/meson.build
index 11f9732..f3247fa 100644
--- a/host/gl/meson.build
+++ b/host/gl/meson.build
@@ -2,7 +2,6 @@
# SPDX-License-Identifier: MIT
inc_gl_server = include_directories('.')
-inc_gles_translator = include_directories('glestranslator/include')
inc_gl_snapshot = include_directories('glsnapshot')
# snapshot
@@ -43,7 +42,7 @@
files_lib_gl_server,
cpp_args: gfxstream_host_args,
include_directories: [inc_gfxstream_include, inc_include, inc_stream_servers, inc_apigen_codec,
- inc_gl_snapshot, inc_gl_host_common, inc_host_features],
+ inc_gl_snapshot, inc_gl_host_common, inc_host_features, inc_gl_common],
link_with: [lib_gles1_dec, lib_gles2_dec, lib_apigen_codec, lib_gl_dispatch,
lib_apigen_codec, lib_host_features],
dependencies: [aemu_base_dep, aemu_common_dep, aemu_snapshot_dep]
diff --git a/host/meson.build b/host/meson.build
index b13ccef..de30c87 100644
--- a/host/meson.build
+++ b/host/meson.build
@@ -152,6 +152,8 @@
inc_stream_servers = include_directories('.')
inc_host_include = include_directories('include')
+inc_gl_common = include_directories('gl/glestranslator/GLcommon/include')
+
subdir('features')
subdir('tracing')
@@ -208,7 +210,7 @@
files_lib_gfxstream_backend += files('RenderThreadInfoGl.cpp')
files_lib_gfxstream_backend += files('RenderControl.cpp')
- inc_gfxstream_backend += [inc_gl_server, inc_gl_snapshot, inc_gles_translator]
+ inc_gfxstream_backend += [inc_gl_server, inc_gl_snapshot, inc_gl_common]
link_gfxstream_backend += lib_gl_server
endif
