i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app_server: Make engine accelerant hooks optional.

Browse Source 
We don't need them here, or anywhere else for that matter, to run.
This commit is contained in:
Augustin Cavalier
2022-07-07 11:52:00 -04:00
parent 6489b77dee
commit 2270ca94f1
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
+9 -9
View File
@@ -107,9 +107,6 @@ AccelerantHWInterface::AccelerantHWInterface()
fSyncToken(), fSyncToken(),
// required hooks // required hooks
fAccAcquireEngine(NULL),
fAccReleaseEngine(NULL),
fAccSyncToToken(NULL),
fAccGetModeCount(NULL), fAccGetModeCount(NULL),
fAccGetModeList(NULL), fAccGetModeList(NULL),
fAccGetFrameBufferConfig(NULL), fAccGetFrameBufferConfig(NULL),
@@ -118,6 +115,9 @@ AccelerantHWInterface::AccelerantHWInterface()
fAccGetPixelClockLimits(NULL), fAccGetPixelClockLimits(NULL),
// optional accelerant hooks // optional accelerant hooks
fAccAcquireEngine(NULL),
fAccReleaseEngine(NULL),
fAccSyncToToken(NULL),
fAccGetTimingConstraints(NULL), fAccGetTimingConstraints(NULL),
fAccProposeDisplayMode(NULL), fAccProposeDisplayMode(NULL),
fAccFillRect(NULL), fAccFillRect(NULL),
@@ -353,9 +353,6 @@ status_t
AccelerantHWInterface::_SetupDefaultHooks() AccelerantHWInterface::_SetupDefaultHooks()
{ {
// required // required
fAccAcquireEngine = (acquire_engine)fAccelerantHook(B_ACQUIRE_ENGINE, NULL);
fAccReleaseEngine = (release_engine)fAccelerantHook(B_RELEASE_ENGINE, NULL);
fAccSyncToToken = (sync_to_token)fAccelerantHook(B_SYNC_TO_TOKEN, NULL);
fAccGetModeCount fAccGetModeCount
= (accelerant_mode_count)fAccelerantHook(B_ACCELERANT_MODE_COUNT, NULL); = (accelerant_mode_count)fAccelerantHook(B_ACCELERANT_MODE_COUNT, NULL);
fAccGetModeList = (get_mode_list)fAccelerantHook(B_GET_MODE_LIST, NULL); fAccGetModeList = (get_mode_list)fAccelerantHook(B_GET_MODE_LIST, NULL);
@@ -368,13 +365,16 @@ AccelerantHWInterface::_SetupDefaultHooks()
fAccGetPixelClockLimits = (get_pixel_clock_limits)fAccelerantHook( fAccGetPixelClockLimits = (get_pixel_clock_limits)fAccelerantHook(
B_GET_PIXEL_CLOCK_LIMITS, NULL); B_GET_PIXEL_CLOCK_LIMITS, NULL);
if (!fAccAcquireEngine || !fAccReleaseEngine || !fAccGetFrameBufferConfig if (!fAccGetFrameBufferConfig || !fAccGetModeCount || !fAccGetModeList
|| !fAccGetModeCount || !fAccGetModeList || !fAccSetDisplayMode || !fAccSetDisplayMode || !fAccGetDisplayMode || !fAccGetPixelClockLimits) {
|| !fAccGetDisplayMode || !fAccGetPixelClockLimits) {
return B_ERROR; return B_ERROR;
} }
// optional // optional
fAccAcquireEngine = (acquire_engine)fAccelerantHook(B_ACQUIRE_ENGINE, NULL);
fAccReleaseEngine = (release_engine)fAccelerantHook(B_RELEASE_ENGINE, NULL);
fAccSyncToToken = (sync_to_token)fAccelerantHook(B_SYNC_TO_TOKEN, NULL);
fAccGetTimingConstraints = (get_timing_constraints)fAccelerantHook( fAccGetTimingConstraints = (get_timing_constraints)fAccelerantHook(
B_GET_TIMING_CONSTRAINTS, NULL); B_GET_TIMING_CONSTRAINTS, NULL);
fAccProposeDisplayMode = (propose_display_mode)fAccelerantHook( fAccProposeDisplayMode = (propose_display_mode)fAccelerantHook(
src/servers/app/drawing/interface/local/AccelerantHWInterface.h
+3 -3
View File
@@ -134,9 +134,6 @@ private:
sync_token fSyncToken; sync_token fSyncToken;
// required hooks - guaranteed to be valid // required hooks - guaranteed to be valid
acquire_engine fAccAcquireEngine;
release_engine fAccReleaseEngine;
sync_to_token fAccSyncToToken;
accelerant_mode_count fAccGetModeCount; accelerant_mode_count fAccGetModeCount;
get_mode_list fAccGetModeList; get_mode_list fAccGetModeList;
get_frame_buffer_config fAccGetFrameBufferConfig; get_frame_buffer_config fAccGetFrameBufferConfig;
@@ -145,6 +142,9 @@ private:
get_pixel_clock_limits fAccGetPixelClockLimits; get_pixel_clock_limits fAccGetPixelClockLimits;
// optional accelerant hooks // optional accelerant hooks
acquire_engine fAccAcquireEngine;
release_engine fAccReleaseEngine;
sync_to_token fAccSyncToToken;
get_timing_constraints fAccGetTimingConstraints; get_timing_constraints fAccGetTimingConstraints;
propose_display_mode fAccProposeDisplayMode; propose_display_mode fAccProposeDisplayMode;
get_preferred_display_mode fAccGetPreferredDisplayMode; get_preferred_display_mode fAccGetPreferredDisplayMode;