From d4c31885aa3582c70386f96aeec430cc21d04712 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 27 Sep 2004 08:32:47 +0000 Subject: [PATCH] Renamed sync() to card_sync() to avoid name clashing with the "sync()" function in the new unistd.h. Commented out transparent_blit() to suppress a compiler warning, and added a comment to it. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9069 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/game/WindowScreen.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/kits/game/WindowScreen.cpp b/src/kits/game/WindowScreen.cpp index e2da553432..76db7174e6 100644 --- a/src/kits/game/WindowScreen.cpp +++ b/src/kits/game/WindowScreen.cpp @@ -60,7 +60,7 @@ release_engine release_engine_global; // Helper methods which translates the pre r5 graphics methods to r5 ones static int32 -sync() +card_sync() { wait_idle_global(); return 0; @@ -84,7 +84,9 @@ blit(int32 sx, int32 sy, int32 dx, int32 dy, int32 width, int32 height) return 0; } - +// TODO: This function seems not to be exported through CardHookAt(). +// At least, nothing I've tried uses it. +/* static int32 transparent_blit(int32 sx, int32 sy, int32 dx, int32 dy, int32 width, int32 height, uint32 transparent_color) @@ -102,7 +104,7 @@ transparent_blit(int32 sx, int32 sy, int32 dx, int32 dy, release_engine_global(et_global, 0); return 0; } - +*/ static int32 scaled_filtered_blit(int32 sx, int32 sy, int32 sw, int32 sh, int32 dx, int32 dy, int32 dw, int32 dh) @@ -606,7 +608,7 @@ BWindowScreen::CardHookAt(int32 index) hook = (graphics_card_hook)scaled_filtered_blit; break; case 10: // sync aka wait for graphics card idle - hook = (graphics_card_hook)sync; + hook = (graphics_card_hook)card_sync; break; case 13: // 16 bit fill rect hook = (graphics_card_hook)m_gah(B_FILL_RECTANGLE, 0);