diff options
| author | Gurchetan Singh <gurchetansingh@google.com> | 2023-04-17 19:39:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-17 19:39:42 +0000 |
| commit | 3bdb3ae9252848bb8328d70cb8b84befab627221 (patch) | |
| tree | bcb919eb6f24373e725ec5ec3b61c6ed8cc67dad | |
| parent | 13275df9cc82bfa19633eae0e9aa5aa835e1a62c (diff) | |
| parent | 38bc98d4e0501ed3e9ad61c69b6e516cde7b3d8a (diff) | |
| download | vulkan-cereal-3bdb3ae9252848bb8328d70cb8b84befab627221.tar.gz | |
virtio-gpu-gfxstream-renderer.h: nuke virtio_goldfish_pipe_reset am: dca98a8061 am: a3a3c3a4d4 am: 38bc98d4e0
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2537073
Change-Id: I76ed41fc8043d569b913ab4f27ec3c304c1b9ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | stream-servers/gfxstream_unittest.cpp | 1 | ||||
| -rw-r--r-- | stream-servers/virtio-gpu-gfxstream-renderer.cpp | 4 | ||||
| -rw-r--r-- | stream-servers/virtio-gpu-gfxstream-renderer.h | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/stream-servers/gfxstream_unittest.cpp b/stream-servers/gfxstream_unittest.cpp index fd741624..00f07318 100644 --- a/stream-servers/gfxstream_unittest.cpp +++ b/stream-servers/gfxstream_unittest.cpp @@ -172,7 +172,6 @@ TEST_F(GfxStreamBackendTest, DISABLED_ApiCallLinkTest) { stream_renderer_flush_resource_and_readback(res_id, 0, 0, width, height, fb.get(), width * height); - virtio_goldfish_pipe_reset(0, 0); pipe_virgl_renderer_init(0, 0, 0); pipe_virgl_renderer_poll(); pipe_virgl_renderer_get_cursor_data(0, 0, 0); diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp index 4f8f8f21..f8dcb045 100644 --- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp +++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp @@ -2506,9 +2506,6 @@ struct virgl_renderer_virtio_interface* get_goldfish_pipe_virgl_renderer_virtio_ return &s_virtio_interface; } -void virtio_goldfish_pipe_reset(void* pipe, void* host_pipe) { - sRenderer()->resetPipe((GoldfishHwPipe*)pipe, (GoldfishHostPipe*)host_pipe); -} static_assert(sizeof(struct stream_renderer_device_id) == 32, "stream_renderer_device_id must be 32 bytes"); @@ -2544,5 +2541,4 @@ static_assert(offsetof(struct stream_renderer_param, key) == 0, "stream_renderer_param.key must be at offset 0"); static_assert(offsetof(struct stream_renderer_param, value) == 8, "stream_renderer_param.value must be at offset 8"); - } // extern "C" diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.h b/stream-servers/virtio-gpu-gfxstream-renderer.h index f4d82d4a..f75fdbe4 100644 --- a/stream-servers/virtio-gpu-gfxstream-renderer.h +++ b/stream-servers/virtio-gpu-gfxstream-renderer.h @@ -25,8 +25,6 @@ void virgl_write_fence(void* opaque, uint32_t fence); #define VG_EXPORT __attribute__((visibility("default"))) #endif -VG_EXPORT void virtio_goldfish_pipe_reset(void* hwpipe, void* hostpipe); - #define VIRTIO_GOLDFISH_EXPORT_API #ifdef VIRTIO_GOLDFISH_EXPORT_API |