Skip to content

N
nx-libs
Commit 7c1bd6f5 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

NX{mitrap,picture}.c: mark NX changes

parent 66f0a85e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
View file @ 7c1bd6f5
...@@ -215,7 +215,9 @@ AllocatePicture (ScreenPtr pScreen) ...@@ -215,7 +215,9 @@ AllocatePicture (ScreenPtr pScreen)
ppriv->ptr = (void *)NULL; ppriv->ptr = (void *)NULL;
} }
#ifdef NXAGENT_SERVER
nxagentPicturePriv(pPicture) -> picture = 0; nxagentPicturePriv(pPicture) -> picture = 0;
#endif
return pPicture; return pPicture;
} }
...@@ -245,13 +247,14 @@ CreatePicture (Picture pid, ...@@ -245,13 +247,14 @@ CreatePicture (Picture pid,
pPicture->format = pFormat->format | (pDrawable->bitsPerPixel << 24); pPicture->format = pFormat->format | (pDrawable->bitsPerPixel << 24);
if (pDrawable->type == DRAWABLE_PIXMAP) if (pDrawable->type == DRAWABLE_PIXMAP)
{ {
#ifdef NXAGENT_SERVER
/* /*
* Let picture always point to the virtual pixmap. * Let picture always point to the virtual pixmap.
* For sure this is not the best way to deal with * For sure this is not the best way to deal with
* the virtual frame-buffer. * the virtual frame-buffer.
*/ */
pPicture->pDrawable = nxagentVirtualDrawable(pDrawable); pPicture->pDrawable = nxagentVirtualDrawable(pDrawable);
#endif
++((PixmapPtr)pDrawable)->refcnt; ++((PixmapPtr)pDrawable)->refcnt;
pPicture->pNext = 0; pPicture->pNext = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment