diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-20 00:16:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-20 00:16:54 +0000 |
| commit | a9add0b89038d4237206f0767fbeb50f0c750d04 (patch) | |
| tree | 987ccc5aa8bef79e770b16fe776e8b00205e9dd4 | |
| parent | 871ddc27ab9714cc91a2a4c24f068db1dc06c840 (diff) | |
| parent | 80345ad710817f1a2fceac1dcdc92fd23f0819d5 (diff) | |
| download | gfxstream-a9add0b89038d4237206f0767fbeb50f0c750d04.tar.gz | |
Merge "gfxstream: fix meson build" into main
| -rw-r--r-- | host/FrameBuffer.cpp | 5 | ||||
| -rw-r--r-- | host/PostWorkerGl.cpp | 2 | ||||
| -rw-r--r-- | host/vulkan/meson.build | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/host/FrameBuffer.cpp b/host/FrameBuffer.cpp index bd600a8b..5e2854ae 100644 --- a/host/FrameBuffer.cpp +++ b/host/FrameBuffer.cpp @@ -1988,12 +1988,15 @@ static void loadProcOwnedCollection(Stream* stream, Collection* c) { int FrameBuffer::getScreenshot(unsigned int nChannels, unsigned int* width, unsigned int* height, uint8_t* pixels, size_t* cPixels, int displayId, int desiredWidth, int desiredHeight, int desiredRotation, Rect rect) { - if (emugl::shouldSkipDraw()) { +#ifdef CONFIG_AEMU + if (emugl::shouldSkipDraw()) { *width = 0; *height = 0; *cPixels = 0; return -1; } +#endif + AutoLock mutex(m_lock); uint32_t w, h, cb, screenWidth, screenHeight; if (!emugl::get_emugl_multi_display_operations().getMultiDisplay( diff --git a/host/PostWorkerGl.cpp b/host/PostWorkerGl.cpp index 7d25ec47..f44254ee 100644 --- a/host/PostWorkerGl.cpp +++ b/host/PostWorkerGl.cpp @@ -88,11 +88,13 @@ std::shared_future<void> PostWorkerGl::postImpl(ColorBuffer* cb) { const auto& multiDisplay = emugl::get_emugl_multi_display_operations(); const bool pixel_fold = multiDisplay.isPixelFold(); if (pixel_fold) { +#ifdef CONFIG_AEMU if (emugl::shouldSkipDraw()) { post.layers.clear(); } else { post.layers.push_back(postWithOverlay(cb)); } +#endif } else if (multiDisplay.isMultiDisplayEnabled()) { if (multiDisplay.isMultiDisplayWindow()) { diff --git a/host/vulkan/meson.build b/host/vulkan/meson.build index 5ecfaed0..4ffd3308 100644 --- a/host/vulkan/meson.build +++ b/host/vulkan/meson.build @@ -22,6 +22,7 @@ files_lib_vulkan_server = files( 'VkAndroidNativeBuffer.cpp', 'VkCommonOperations.cpp', 'VkDecoder.cpp', + 'VkEmulatedPhysicalDeviceMemory.cpp', 'VkDecoderGlobalState.cpp', 'VkDecoderSnapshot.cpp', 'VkDecoderSnapshotUtils.cpp', |