diff options
author | Gurchetan Singh <gurchetansingh@google.com> | 2023-04-17 19:38:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-17 19:38:22 +0000 |
commit | 77e2383ece478cfdb20e7d5e73d9e6634a9ec6a2 (patch) | |
tree | 84538a66efc16a0e921b38b28450eaa87c742e45 | |
parent | 31980d6af027c0ca4c93ae2ba209c32e6679cc75 (diff) | |
parent | 6ce719d0df8661ffa6eec89bed178d562bd5a62c (diff) | |
download | vulkan-cereal-77e2383ece478cfdb20e7d5e73d9e6634a9ec6a2.tar.gz |
virtio-gpu-gfxstream-renderer.h: nuke get_pixels(..) am: 6ce719d0df
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2537077
Change-Id: If7ceccf2e920ceab292319eceb4fe3ade3c22f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | stream-servers/virtio-gpu-gfxstream-renderer.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp index 872135e9..bf14b998 100644 --- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp +++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp @@ -1916,14 +1916,6 @@ VG_EXPORT int stream_renderer_vulkan_info(uint32_t res_handle, return sRenderer()->vulkanInfo(res_handle, vulkan_info); } -struct renderer_display_info; -typedef void (*get_pixels_t)(void*, uint32_t, uint32_t); -static get_pixels_t sGetPixelsFunc = 0; -typedef void (*post_callback_t)(void*, uint32_t, int, int, int, int, int, unsigned char*); - -// For reading back rendered contents to display -VG_EXPORT void get_pixels(void* pixels, uint32_t bytes); - static const GoldfishPipeServiceOps goldfish_pipe_service_ops = { // guest_open() [](GoldfishHwPipe* hwPipe) -> GoldfishHostPipe* { @@ -2025,20 +2017,6 @@ static const GoldfishPipeServiceOps goldfish_pipe_service_ops = { [](QEMUFile* file) { (void)file; }, }; -extern const QAndroidVmOperations* const gQAndroidVmOperations; - -static void default_post_callback(void* context, uint32_t displayId, int width, int height, - int ydir, int format, int frame_type, unsigned char* pixels) { - (void)context; - (void)width; - (void)height; - (void)ydir; - (void)format; - (void)frame_type; - (void)pixels; - // no-op -} - VG_EXPORT int stream_renderer_init(struct stream_renderer_param* stream_renderer_params, uint64_t num_params) { // Required parameters. @@ -2380,8 +2358,6 @@ VG_EXPORT int stream_renderer_init(struct stream_renderer_param* stream_renderer android_opengles_pipe_set_recv_mode(2 /* virtio-gpu */); android_init_refcount_pipe(); - sGetPixelsFunc = android_getReadPixelsFunc(); - pipe_virgl_renderer_init(renderer_cookie, renderer_flags, &virglrenderer_callbacks); gfxstream::FrameBuffer::waitUntilInitialized(); @@ -2410,11 +2386,6 @@ VG_EXPORT void gfxstream_backend_set_screen_mask(int width, int height, android_setOpenglesScreenMask(width, height, rgbaData); } -VG_EXPORT void get_pixels(void* pixels, uint32_t bytes) { - // TODO: support display > 0 - sGetPixelsFunc(pixels, bytes, 0); -} - const GoldfishPipeServiceOps* goldfish_pipe_get_service_ops() { return &goldfish_pipe_service_ops; } #define VIRGLRENDERER_API_PIPE_STRUCT_DEF(api) pipe_##api, |