diff options
| author | Gurchetan Singh <gurchetansingh@google.com> | 2023-04-17 19:39:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-17 19:39:41 +0000 |
| commit | 13275df9cc82bfa19633eae0e9aa5aa835e1a62c (patch) | |
| tree | 10bd559146cf8af0a5a7712b10489cf01f0e6400 | |
| parent | 8d3f9cc21381c4eaf386617cca636037d015984b (diff) | |
| parent | 0c3d0c73135e15376a8ca33427422421de129288 (diff) | |
| download | vulkan-cereal-13275df9cc82bfa19633eae0e9aa5aa835e1a62c.tar.gz | |
virtio-gpu-gfxstream-renderer.h: move virgl_hw.h am: d88da7dfa3 am: 68eadcc324 am: 0c3d0c7313
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2537072
Change-Id: I921714227e0c403ffa0e6fb51a02ec99e87c68fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | stream-servers/gfxstream_unittest.cpp | 8 | ||||
| -rw-r--r-- | stream-servers/virtio-gpu-gfxstream-renderer.cpp | 1 | ||||
| -rw-r--r-- | stream-servers/virtio-gpu-gfxstream-renderer.h | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/stream-servers/gfxstream_unittest.cpp b/stream-servers/gfxstream_unittest.cpp index 0e66d5f2..fd741624 100644 --- a/stream-servers/gfxstream_unittest.cpp +++ b/stream-servers/gfxstream_unittest.cpp @@ -13,12 +13,14 @@ // limitations under the License. #include <gtest/gtest.h> + #include <vector> -#include "virtio-gpu-gfxstream-renderer.h" -#include "host-common/testing/MockGraphicsAgentFactory.h" #include "OSWindow.h" #include "aemu/base/system/System.h" +#include "host-common/testing/MockGraphicsAgentFactory.h" +#include "virgl_hw.h" +#include "virtio-gpu-gfxstream-renderer.h" using android::base::sleepMs; @@ -216,4 +218,4 @@ TEST_F(GfxStreamBackendTest, MissingRequiredParameter) { // Initialize once more for the teardown function. int initResult = stream_renderer_init(streamRendererParams.data(), streamRendererParams.size()); EXPECT_EQ(initResult, 0); -}
\ No newline at end of file +} diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp index 5c9d500e..4f8f8f21 100644 --- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp +++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp @@ -40,6 +40,7 @@ #include "host-common/opengles.h" #include "host-common/refcount-pipe.h" #include "host-common/vm_operations.h" +#include "virgl_hw.h" #include "virtgpu_gfxstream_protocol.h" #include "vk_util.h" diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.h b/stream-servers/virtio-gpu-gfxstream-renderer.h index 2afc0448..f4d82d4a 100644 --- a/stream-servers/virtio-gpu-gfxstream-renderer.h +++ b/stream-servers/virtio-gpu-gfxstream-renderer.h @@ -7,7 +7,6 @@ #include <stddef.h> -#include "virgl_hw.h" #include "virglrenderer.h" #ifdef __cplusplus |