From e3056a7effb0bfaeac5b62cc378ae087a61d0c94 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 7 Jul 2022 11:52:51 -0400 Subject: [PATCH] vesa & framebuffer accelerants: Drop engine hook stubs. We don't need to provide them after the previous commit. --- src/add-ons/accelerants/framebuffer/Jamfile | 1 - .../accelerants/framebuffer/accelerant.h | 6 +- .../framebuffer/accelerant_protos.h | 9 --- .../accelerants/framebuffer/engine.cpp | 59 ------------------- src/add-ons/accelerants/framebuffer/hooks.cpp | 14 ----- src/add-ons/accelerants/vesa/Jamfile | 1 - .../accelerants/vesa/accelerant_protos.h | 9 --- src/add-ons/accelerants/vesa/engine.cpp | 59 ------------------- src/add-ons/accelerants/vesa/hooks.cpp | 14 ----- 9 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 src/add-ons/accelerants/framebuffer/engine.cpp delete mode 100644 src/add-ons/accelerants/vesa/engine.cpp diff --git a/src/add-ons/accelerants/framebuffer/Jamfile b/src/add-ons/accelerants/framebuffer/Jamfile index 3af0baa6e9..c4412af4bb 100644 --- a/src/add-ons/accelerants/framebuffer/Jamfile +++ b/src/add-ons/accelerants/framebuffer/Jamfile @@ -7,7 +7,6 @@ UsePrivateHeaders shared ; Addon framebuffer.accelerant : accelerant.cpp - engine.cpp hooks.cpp mode.cpp : libaccelerantscommon.a diff --git a/src/add-ons/accelerants/framebuffer/accelerant.h b/src/add-ons/accelerants/framebuffer/accelerant.h index f49c88a3db..ac5f035958 100644 --- a/src/add-ons/accelerants/framebuffer/accelerant.h +++ b/src/add-ons/accelerants/framebuffer/accelerant.h @@ -3,8 +3,8 @@ * Copyright 2016, Jessica Hamilton, jessica.l.hamilton@gmail.com. * Distributed under the terms of the MIT License. */ -#ifndef VESA_ACCELERANT_H -#define VESA_ACCELERANT_H +#ifndef FRAMEBUFFER_ACCELERANT_H +#define FRAMEBUFFER_ACCELERANT_H #include "vesa_info.h" @@ -27,4 +27,4 @@ extern accelerant_info *gInfo; extern status_t create_mode_list(void); -#endif /* VESA_ACCELERANT_H */ +#endif /* FRAMEBUFFER_ACCELERANT_H */ diff --git a/src/add-ons/accelerants/framebuffer/accelerant_protos.h b/src/add-ons/accelerants/framebuffer/accelerant_protos.h index 5382891037..b29724022e 100644 --- a/src/add-ons/accelerants/framebuffer/accelerant_protos.h +++ b/src/add-ons/accelerants/framebuffer/accelerant_protos.h @@ -33,15 +33,6 @@ status_t framebuffer_get_frame_buffer_config(frame_buffer_config *config); status_t framebuffer_get_pixel_clock_limits(display_mode *dm, uint32 *low, uint32 *high); -// accelerant engine -uint32 framebuffer_accelerant_engine_count(void); -status_t framebuffer_acquire_engine(uint32 capabilities, uint32 maxWait, - sync_token *st, engine_token **et); -status_t framebuffer_release_engine(engine_token *et, sync_token *st); -void framebuffer_wait_engine_idle(void); -status_t framebuffer_get_sync_token(engine_token *et, sync_token *st); -status_t framebuffer_sync_to_token(sync_token *st); - #ifdef __cplusplus } #endif diff --git a/src/add-ons/accelerants/framebuffer/engine.cpp b/src/add-ons/accelerants/framebuffer/engine.cpp deleted file mode 100644 index 988640bba4..0000000000 --- a/src/add-ons/accelerants/framebuffer/engine.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. - * Distributed under the terms of the MIT License. - */ - - -#include "accelerant_protos.h" -#include "vesa_info.h" - - -static engine_token sEngineToken = {1, 0 /*B_2D_ACCELERATION*/, NULL}; - - -uint32 -framebuffer_accelerant_engine_count(void) -{ - return 1; -} - - -status_t -framebuffer_acquire_engine(uint32 capabilities, uint32 max_wait, sync_token *syncToken, - engine_token **_engineToken) -{ - *_engineToken = &sEngineToken; - - return B_OK; -} - - -status_t -framebuffer_release_engine(engine_token *engineToken, sync_token *syncToken) -{ - if (syncToken != NULL) - syncToken->engine_id = engineToken->engine_id; - - return B_OK; -} - - -void -framebuffer_wait_engine_idle(void) -{ -} - - -status_t -framebuffer_get_sync_token(engine_token *engineToken, sync_token *syncToken) -{ - return B_OK; -} - - -status_t -framebuffer_sync_to_token(sync_token *syncToken) -{ - return B_OK; -} - diff --git a/src/add-ons/accelerants/framebuffer/hooks.cpp b/src/add-ons/accelerants/framebuffer/hooks.cpp index 65477fc611..c0363868ea 100644 --- a/src/add-ons/accelerants/framebuffer/hooks.cpp +++ b/src/add-ons/accelerants/framebuffer/hooks.cpp @@ -44,20 +44,6 @@ get_accelerant_hook(uint32 feature, void* data) return (void*)framebuffer_get_frame_buffer_config; case B_GET_PIXEL_CLOCK_LIMITS: return (void*)framebuffer_get_pixel_clock_limits; - - /* engine/synchronization */ - case B_ACCELERANT_ENGINE_COUNT: - return (void*)framebuffer_accelerant_engine_count; - case B_ACQUIRE_ENGINE: - return (void*)framebuffer_acquire_engine; - case B_RELEASE_ENGINE: - return (void*)framebuffer_release_engine; - case B_WAIT_ENGINE_IDLE: - return (void*)framebuffer_wait_engine_idle; - case B_GET_SYNC_TOKEN: - return (void*)framebuffer_get_sync_token; - case B_SYNC_TO_TOKEN: - return (void*)framebuffer_sync_to_token; } return NULL; diff --git a/src/add-ons/accelerants/vesa/Jamfile b/src/add-ons/accelerants/vesa/Jamfile index 5818056f80..a7f27a906c 100644 --- a/src/add-ons/accelerants/vesa/Jamfile +++ b/src/add-ons/accelerants/vesa/Jamfile @@ -10,7 +10,6 @@ UsePrivateHeaders shared ; Addon vesa.accelerant : accelerant.cpp dpms.cpp - engine.cpp hooks.cpp mode.cpp : libaccelerantscommon.a diff --git a/src/add-ons/accelerants/vesa/accelerant_protos.h b/src/add-ons/accelerants/vesa/accelerant_protos.h index 788c5cc7bd..b41ae745c7 100644 --- a/src/add-ons/accelerants/vesa/accelerant_protos.h +++ b/src/add-ons/accelerants/vesa/accelerant_protos.h @@ -53,15 +53,6 @@ status_t vesa_set_cursor_bitmap(uint16 width, uint16 height, uint16 hotX, void vesa_move_cursor(uint16 x, uint16 y); void vesa_show_cursor(bool is_visible); -// accelerant engine -uint32 vesa_accelerant_engine_count(void); -status_t vesa_acquire_engine(uint32 capabilities, uint32 maxWait, - sync_token *st, engine_token **et); -status_t vesa_release_engine(engine_token *et, sync_token *st); -void vesa_wait_engine_idle(void); -status_t vesa_get_sync_token(engine_token *et, sync_token *st); -status_t vesa_sync_to_token(sync_token *st); - // 2D acceleration void vesa_screen_to_screen_blit(engine_token *et, blit_params *list, uint32 count); diff --git a/src/add-ons/accelerants/vesa/engine.cpp b/src/add-ons/accelerants/vesa/engine.cpp deleted file mode 100644 index d1965f5743..0000000000 --- a/src/add-ons/accelerants/vesa/engine.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. - * Distributed under the terms of the MIT License. - */ - - -#include "accelerant_protos.h" -#include "vesa_info.h" - - -static engine_token sEngineToken = {1, 0 /*B_2D_ACCELERATION*/, NULL}; - - -uint32 -vesa_accelerant_engine_count(void) -{ - return 1; -} - - -status_t -vesa_acquire_engine(uint32 capabilities, uint32 max_wait, sync_token *syncToken, - engine_token **_engineToken) -{ - *_engineToken = &sEngineToken; - - return B_OK; -} - - -status_t -vesa_release_engine(engine_token *engineToken, sync_token *syncToken) -{ - if (syncToken != NULL) - syncToken->engine_id = engineToken->engine_id; - - return B_OK; -} - - -void -vesa_wait_engine_idle(void) -{ -} - - -status_t -vesa_get_sync_token(engine_token *engineToken, sync_token *syncToken) -{ - return B_OK; -} - - -status_t -vesa_sync_to_token(sync_token *syncToken) -{ - return B_OK; -} - diff --git a/src/add-ons/accelerants/vesa/hooks.cpp b/src/add-ons/accelerants/vesa/hooks.cpp index 5563119fc0..8e280f2e3d 100644 --- a/src/add-ons/accelerants/vesa/hooks.cpp +++ b/src/add-ons/accelerants/vesa/hooks.cpp @@ -256,20 +256,6 @@ get_accelerant_hook(uint32 feature, void* data) return (void*)vesa_set_cursor_bitmap; #endif - /* engine/synchronization */ - case B_ACCELERANT_ENGINE_COUNT: - return (void*)vesa_accelerant_engine_count; - case B_ACQUIRE_ENGINE: - return (void*)vesa_acquire_engine; - case B_RELEASE_ENGINE: - return (void*)vesa_release_engine; - case B_WAIT_ENGINE_IDLE: - return (void*)vesa_wait_engine_idle; - case B_GET_SYNC_TOKEN: - return (void*)vesa_get_sync_token; - case B_SYNC_TO_TOKEN: - return (void*)vesa_sync_to_token; - #if FAKE_OVERLAY_SUPPORT // overlay case B_OVERLAY_COUNT: