diff options
| author | Joshua Duong <joshuaduong@google.com> | 2023-05-25 19:48:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-25 19:48:21 +0000 |
| commit | e8e21f58c737e024bff51997c93314c4df305f8c (patch) | |
| tree | 750faa741bb0fc333aa93d36263239320a98b663 | |
| parent | f17d4ee120e373135d93046c24da61372f5c46fc (diff) | |
| parent | 9c5919db78d58f27c3d632bf11d15d7b0acc066e (diff) | |
| download | vulkan-cereal-e8e21f58c737e024bff51997c93314c4df305f8c.tar.gz | |
Move virtio-gpu-gfxstream-renderer to include/render-utils. am: f8c2d5dbc8 am: a699c17eff am: ce5e54d301 am: 5a21a54dab am: 9c5919db78
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2583757
Change-Id: I74ff4e0683c79e5ab2cc684ed68253d5a3234bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | host/GfxStreamBackendInitOverride.cpp | 2 | ||||
| -rw-r--r-- | host/VirtioGpuTimelines.h | 2 | ||||
| -rw-r--r-- | host/gfxstream_unittest.cpp | 4 | ||||
| -rw-r--r-- | host/virtio-gpu-gfxstream-renderer.cpp | 4 | ||||
| -rw-r--r-- | include/render-utils/virtio-gpu-gfxstream-renderer-unstable.h (renamed from host/virtio-gpu-gfxstream-renderer-unstable.h) | 2 | ||||
| -rw-r--r-- | include/render-utils/virtio-gpu-gfxstream-renderer.h (renamed from host/virtio-gpu-gfxstream-renderer.h) | 0 |
6 files changed, 7 insertions, 7 deletions
diff --git a/host/GfxStreamBackendInitOverride.cpp b/host/GfxStreamBackendInitOverride.cpp index dfcca142..9d8859d6 100644 --- a/host/GfxStreamBackendInitOverride.cpp +++ b/host/GfxStreamBackendInitOverride.cpp @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "virtio-gpu-gfxstream-renderer.h" +#include "render-utils/virtio-gpu-gfxstream-renderer.h" void gfxstream_backend_init_product_override() {} diff --git a/host/VirtioGpuTimelines.h b/host/VirtioGpuTimelines.h index de255c99..5b67beb9 100644 --- a/host/VirtioGpuTimelines.h +++ b/host/VirtioGpuTimelines.h @@ -24,7 +24,7 @@ #include <variant> #include "aemu/base/synchronization/Lock.h" -#include "virtio-gpu-gfxstream-renderer.h" +#include "render-utils/virtio-gpu-gfxstream-renderer.h" #include "render-utils/virtio_gpu_ops.h" struct VirtioGpuRingGlobal {}; diff --git a/host/gfxstream_unittest.cpp b/host/gfxstream_unittest.cpp index cedca19d..d342debc 100644 --- a/host/gfxstream_unittest.cpp +++ b/host/gfxstream_unittest.cpp @@ -20,8 +20,8 @@ #include "aemu/base/system/System.h" #include "host-common/testing/MockGraphicsAgentFactory.h" #include "virgl_hw.h" -#include "virtio-gpu-gfxstream-renderer-unstable.h" -#include "virtio-gpu-gfxstream-renderer.h" +#include "render-utils/virtio-gpu-gfxstream-renderer-unstable.h" +#include "render-utils/virtio-gpu-gfxstream-renderer.h" using android::base::sleepMs; diff --git a/host/virtio-gpu-gfxstream-renderer.cpp b/host/virtio-gpu-gfxstream-renderer.cpp index f3906b1f..f7a658ef 100644 --- a/host/virtio-gpu-gfxstream-renderer.cpp +++ b/host/virtio-gpu-gfxstream-renderer.cpp @@ -47,8 +47,8 @@ extern "C" { #include "drm_fourcc.h" #include "host-common/goldfish_pipe.h" #include "virgl_hw.h" -#include "virtio-gpu-gfxstream-renderer-unstable.h" -#include "virtio-gpu-gfxstream-renderer.h" +#include "render-utils/virtio-gpu-gfxstream-renderer-unstable.h" +#include "render-utils/virtio-gpu-gfxstream-renderer.h" } // extern "C" #define DEBUG_VIRTIO_GOLDFISH_PIPE 0 diff --git a/host/virtio-gpu-gfxstream-renderer-unstable.h b/include/render-utils/virtio-gpu-gfxstream-renderer-unstable.h index cb32bc8b..d98d5844 100644 --- a/host/virtio-gpu-gfxstream-renderer-unstable.h +++ b/include/render-utils/virtio-gpu-gfxstream-renderer-unstable.h @@ -1,7 +1,7 @@ #ifndef VIRTGPU_GFXSTREAM_RENDERER_UNSTABLE_H #define VIRTGPU_GFXSTREAM_RENDERER_UNSTABLE_H -#include "virtio-gpu-gfxstream-renderer.h" +#include "render-utils/virtio-gpu-gfxstream-renderer.h" #ifdef __cplusplus extern "C" { diff --git a/host/virtio-gpu-gfxstream-renderer.h b/include/render-utils/virtio-gpu-gfxstream-renderer.h index 3201de04..3201de04 100644 --- a/host/virtio-gpu-gfxstream-renderer.h +++ b/include/render-utils/virtio-gpu-gfxstream-renderer.h |