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

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.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9069 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2004-09-27 08:32:47 +00:00
parent b397f1b53b
commit d4c31885aa
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/game/WindowScreen.cpp
+6 -4
View File
@@ -60,7 +60,7 @@ release_engine release_engine_global;
// Helper methods which translates the pre r5 graphics methods to r5 ones // Helper methods which translates the pre r5 graphics methods to r5 ones
static int32 static int32
sync() card_sync()
{ {
wait_idle_global(); wait_idle_global();
return 0; return 0;
@@ -84,7 +84,9 @@ blit(int32 sx, int32 sy, int32 dx, int32 dy, int32 width, int32 height)
return 0; return 0;
} }
// TODO: This function seems not to be exported through CardHookAt().
// At least, nothing I've tried uses it.
/*
static int32 static int32
transparent_blit(int32 sx, int32 sy, int32 dx, int32 dy, transparent_blit(int32 sx, int32 sy, int32 dx, int32 dy,
int32 width, int32 height, uint32 transparent_color) 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); release_engine_global(et_global, 0);
return 0; return 0;
} }
*/
static int32 static int32
scaled_filtered_blit(int32 sx, int32 sy, int32 sw, int32 sh, int32 dx, int32 dy, int32 dw, int32 dh) 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; hook = (graphics_card_hook)scaled_filtered_blit;
break; break;
case 10: // sync aka wait for graphics card idle case 10: // sync aka wait for graphics card idle
hook = (graphics_card_hook)sync; hook = (graphics_card_hook)card_sync;
break; break;
case 13: // 16 bit fill rect case 13: // 16 bit fill rect
hook = (graphics_card_hook)m_gah(B_FILL_RECTANGLE, 0); hook = (graphics_card_hook)m_gah(B_FILL_RECTANGLE, 0);