frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Xephyr] various X86_64 build cleanups

This commit is contained in:
Dodji Seketeli 2008-07-23 01:07:29 +02:00
parent 5de1867fbb
commit 92fdd01d8e
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/ephyr/ephyr.c
View File

@ -91,7 +91,7 @@ Bool
ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv) ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv)
{ {
int width = 640, height = 480; int width = 640, height = 480;
unsigned long redMask, greenMask, blueMask; CARD32 redMask, greenMask, blueMask;
if (hostx_want_screen_size(screen, &width, &height) if (hostx_want_screen_size(screen, &width, &height)
|| !screen->width || !screen->height) || !screen->width || !screen->height)

2
hw/kdrive/ephyr/ephyrdri.c
View File

@ -143,7 +143,7 @@ ephyrDRIGetClientDriverName (int a_screen,
Bool Bool
ephyrDRICreateContext (int a_screen, ephyrDRICreateContext (int a_screen,
int a_visual_id, int a_visual_id,
unsigned long int *a_returned_ctxt_id, XID *a_returned_ctxt_id,
drm_context_t *a_hw_ctxt) drm_context_t *a_hw_ctxt)
{ {
Display *dpy = hostx_get_display () ; Display *dpy = hostx_get_display () ;

2
hw/kdrive/ephyr/ephyrdri.h
View File

@ -42,7 +42,7 @@ Bool ephyrDRIGetClientDriverName (int a_screen,
char ** a_client_driver_name) ; char ** a_client_driver_name) ;
Bool ephyrDRICreateContext (int a_screen, Bool ephyrDRICreateContext (int a_screen,
int a_visual_id, int a_visual_id,
unsigned long int *a_returned_ctx_id, XID *a_returned_ctx_id,
drm_context_t *a_hw_ctx) ; drm_context_t *a_hw_ctx) ;
Bool ephyrDRIDestroyContext (int a_screen, Bool ephyrDRIDestroyContext (int a_screen,
int a_context_id) ; int a_context_id) ;

27
hw/kdrive/ephyr/ephyrdriext.c
View File

@ -219,8 +219,7 @@ ephyrDRICreateWindow (WindowPtr a_win)
&& screen_priv->CreateWindow, && screen_priv->CreateWindow,
FALSE) ; FALSE) ;
EPHYR_LOG ("enter. win:%#x\n", EPHYR_LOG ("enter. win:%p\n", a_win) ;
(unsigned int)a_win) ;
screen->CreateWindow = screen_priv->CreateWindow ; screen->CreateWindow = screen_priv->CreateWindow ;
is_ok = (*screen->CreateWindow) (a_win) ; is_ok = (*screen->CreateWindow) (a_win) ;
@ -294,7 +293,7 @@ ephyrDRIMoveWindow (WindowPtr a_win,
} }
screen->MoveWindow = ephyrDRIMoveWindow ; screen->MoveWindow = ephyrDRIMoveWindow ;
EPHYR_LOG ("window: %#x\n", (unsigned int)a_win) ; EPHYR_LOG ("window: %p\n", a_win) ;
if (!a_win->parent) { if (!a_win->parent) {
EPHYR_LOG ("cannot move root window\n") ; EPHYR_LOG ("cannot move root window\n") ;
is_ok = TRUE ; is_ok = TRUE ;
@ -354,7 +353,7 @@ ephyrDRIPositionWindow (WindowPtr a_win,
} }
screen->PositionWindow = ephyrDRIPositionWindow ; screen->PositionWindow = ephyrDRIPositionWindow ;
EPHYR_LOG ("window: %#x\n", (unsigned int)a_win) ; EPHYR_LOG ("window: %p\n", a_win) ;
win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ; win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ;
if (!win_priv) { if (!win_priv) {
EPHYR_LOG ("not a DRI peered window\n") ; EPHYR_LOG ("not a DRI peered window\n") ;
@ -406,7 +405,7 @@ ephyrDRIClipNotify (WindowPtr a_win,
} }
screen->ClipNotify = ephyrDRIClipNotify ; screen->ClipNotify = ephyrDRIClipNotify ;
EPHYR_LOG ("window: %#x\n", (unsigned int)a_win) ; EPHYR_LOG ("window: %p\n", a_win) ;
win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ; win_priv = GET_EPHYR_DRI_WINDOW_PRIV (a_win) ;
if (!win_priv) { if (!win_priv) {
EPHYR_LOG ("not a DRI peered window\n") ; EPHYR_LOG ("not a DRI peered window\n") ;
@ -912,7 +911,7 @@ appendWindowPairToList (WindowPtr a_local,
EPHYR_RETURN_VAL_IF_FAIL (a_local, FALSE) ; EPHYR_RETURN_VAL_IF_FAIL (a_local, FALSE) ;
EPHYR_LOG ("(local,remote):(%#x, %d)\n", (unsigned int)a_local, a_remote) ; EPHYR_LOG ("(local,remote):(%p, %d)\n", a_local, a_remote) ;
for (i=0; i < NUM_WINDOW_PAIRS; i++) { for (i=0; i < NUM_WINDOW_PAIRS; i++) {
if (window_pairs[i].local == NULL) { if (window_pairs[i].local == NULL) {
@ -935,8 +934,8 @@ findWindowPairFromLocal (WindowPtr a_local,
for (i=0; i < NUM_WINDOW_PAIRS; i++) { for (i=0; i < NUM_WINDOW_PAIRS; i++) {
if (window_pairs[i].local == a_local) { if (window_pairs[i].local == a_local) {
*a_pair = &window_pairs[i] ; *a_pair = &window_pairs[i] ;
EPHYR_LOG ("found (%#x, %d)\n", EPHYR_LOG ("found (%p, %d)\n",
(unsigned int)(*a_pair)->local, (*a_pair)->local,
(*a_pair)->remote) ; (*a_pair)->remote) ;
return TRUE ; return TRUE ;
} }
@ -976,7 +975,7 @@ createHostPeerWindow (const WindowPtr a_win,
EPHYR_RETURN_VAL_IF_FAIL (a_win->drawable.pScreen, EPHYR_RETURN_VAL_IF_FAIL (a_win->drawable.pScreen,
FALSE) ; FALSE) ;
EPHYR_LOG ("enter. a_win '%#x'\n", (unsigned int)a_win) ; EPHYR_LOG ("enter. a_win '%p'\n", a_win) ;
if (!getWindowVisual (a_win, &visual)) { if (!getWindowVisual (a_win, &visual)) {
EPHYR_LOG_ERROR ("failed to get window visual\n") ; EPHYR_LOG_ERROR ("failed to get window visual\n") ;
goto out ; goto out ;
@ -1056,12 +1055,12 @@ ProcXF86DRICreateDrawable (ClientPtr client)
EPHYR_LOG_ERROR ("non drawable windows are not yet supported\n") ; EPHYR_LOG_ERROR ("non drawable windows are not yet supported\n") ;
return BadImplementation ; return BadImplementation ;
} }
EPHYR_LOG ("lookedup drawable %#x\n", (unsigned int)drawable) ; EPHYR_LOG ("lookedup drawable %p\n", drawable) ;
window = (WindowPtr)drawable; window = (WindowPtr)drawable;
if (findWindowPairFromLocal (window, &pair) && pair) { if (findWindowPairFromLocal (window, &pair) && pair) {
remote_win = pair->remote ; remote_win = pair->remote ;
EPHYR_LOG ("found window '%#x' paire with remote '%d'\n", EPHYR_LOG ("found window '%p' paire with remote '%d'\n",
(unsigned int)window, remote_win) ; window, remote_win) ;
} else if (!createHostPeerWindow (window, &remote_win)) { } else if (!createHostPeerWindow (window, &remote_win)) {
EPHYR_LOG_ERROR ("failed to create host peer window\n") ; EPHYR_LOG_ERROR ("failed to create host peer window\n") ;
return BadAlloc ; return BadAlloc ;
@ -1082,8 +1081,8 @@ ProcXF86DRICreateDrawable (ClientPtr client)
return BadAlloc ; return BadAlloc ;
} }
dixSetPrivate(&window->devPrivates, ephyrDRIWindowKey, win_priv); dixSetPrivate(&window->devPrivates, ephyrDRIWindowKey, win_priv);
EPHYR_LOG ("paired window '%#x' with remote '%d'\n", EPHYR_LOG ("paired window '%p' with remote '%d'\n",
(unsigned int)window, remote_win) ; window, remote_win) ;
} }
WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep); WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep);

4
hw/kdrive/ephyr/ephyrvideo.c
View File

@ -1259,8 +1259,8 @@ ephyrQueryImageAttributes (KdScreenInfo *a_info,
EPHYR_RETURN_VAL_IF_FAIL (a_w && a_h, FALSE) ; EPHYR_RETURN_VAL_IF_FAIL (a_w && a_h, FALSE) ;
EPHYR_LOG ("enter: dim (%dx%d), pitches: %#x, offsets: %#x\n", EPHYR_LOG ("enter: dim (%dx%d), pitches: %p, offsets: %p\n",
*a_w, *a_h, (unsigned int)a_pitches, (unsigned int)a_offsets) ; *a_w, *a_h, a_pitches, a_offsets) ;
if (!ephyrHostXVQueryImageAttributes (s_base_port_id, if (!ephyrHostXVQueryImageAttributes (s_base_port_id,
a_id, a_id,