head 1.3; access; symbols trunk-20040613:1.3 mach64-last-merge:1.3 driinterface-0-0-3-20040303-merge:1.3 driinterface-0-0-3-20040303-premerge:1.3 driinterface-0-0-3-20040303:1.3 driinterface-0-0-3-branch:1.3.0.38 mach64-0-0-7-branch:1.3.0.36 driinterface-0-0-2-branch:1.3.0.34 newmesa-0-0-1-20031209-merge:1.3 trunk-20031209:1.3 newmesa-0-0-1-20031209:1.3 newmesa-0-0-1-branch:1.3.0.32 driinterface-0-0-1-branch:1.3.0.30 savage-2-0-0-branch:1.3.0.28 savage-2-0-0-fork:1.3 config-0-0-1-20031005-freeze:1.3 savage-1_0_0-20031002-trunk-premerge:1.3 cle266-0-0-1-branch:1.3.0.26 i865-agp-0-1-20030929:1.3 trunk-20030916:1.3 XFree86-4_3_99_12-merge:1.3 trunk-20030912:1.3 i865-agp-0-1-20030905:1.3 i865-agp-0-1-20030728:1.3 i865-agp-0-1-20030707:1.3 savage-1_0_0-branch:1.3.0.24 newdrm-0-0-1-branch:1.3.0.22 i865-agp-0-1-branch:1.3.0.20 config-0-0-1-branch:1.3.0.18 texmem-0-0-1-20030429-merge:1.3 texmem-0-0-1-20030429-premerge:1.3 texmem-0-0-1-20030407:1.3.4.1 trident-0-0-2-branch:1.3.0.16 mach64-0-0-6-20030330:1.3 mach64-0-0-6-20030329-freeze:1.3 texmem-0-0-1-20030328-freeze:1.3.4.1 X_4_3_0-20030324-merge:1.1.1.3 X_4_3_0-20020324-preimport:1.3 drm-filp-0-1-branch:1.3.0.14 mesa-4-0-4-20030222:1.3 bsd-4-0-0-20030221-merge:1.3 bsd-4-0-0-20030220:1.3 bsd-4-0-0-20030220-freeze:1.3 mesa-4-0-4-20030216:1.3 mach64-0-0-6-branch:1.3.0.12 mesa-4-0-4-20030208:1.3 texmem-0-0-1-20030204-trunk-merge:1.3.4.1 texmem-0-0-1-20030204-trunk-premerge:1.3.4.1 mesa-4-0-4-20030203:1.3 mesa-4-0-4-20030129:1.3 texmem-0-0-1-20030125-trunk-merge:1.3.4.1 texmem-0-0-1-20030123-trunk-premerge:1.3.4.1 mesa-4-0-4-20030114:1.3 agpgart_2_0_branch:1.3.0.10 mesa-4-0-4-20021220:1.3 mesa-4-0-4-20021216:1.3 mesa-4-0-4-20021215:1.3 mesa-4-0-4-20021214:1.3 mesa-4-0-4-branch:1.3.0.8 texmem-0-0-1-20021127-mesa-4-1-merge:1.3.4.1 trunk-20021125:1.3 mesa-4-1-branch:1.3.0.6 texmem-0-0-1:1.3.0.4 bsd-4-0-0-branch:1.3.0.2 X_4_1_99_1-20010822-merge:1.1.1.2 X_4_1_99_1:1.1.1.2 X_4_1_99_1-20010822-preimport:1.1.1.1 multihead-1-0-0-20010730:1.1.1.1 multihead-1-0-0-20010730-merge:1.1.1.1 multihead-1-0-0-20010727-freeze:1.1.1.1 X_4_1_0-20010615-merge:1.1.1.1 X_4_1_0:1.1.1.1 X_4_1_0-20010614-preimport:1.1.1.1 multihead-1-0-0-branch:1.1.1.1.0.4 X_4_0_99_3-20010502-merge:1.1.1.1 X_4_0_99_3:1.1.1.1 X_4_0_99_3-20010501-preimport:1.1.1.1 bsd-2-0-0-branch:1.1.1.1.0.2 X_4_0_99_2-20010410-merge:1.1.1.1 X_4_0_99_2:1.1.1.1 XFree:1.1.1; locks; strict; comment @ * @; 1.3 date 2002.10.30.10.08.51; author alanh; state Exp; branches 1.3.4.1 1.3.6.1; next 1.2; 1.2 date 2001.08.23.21.35.17; author dawes; state dead; branches; next 1.1; 1.1 date 2001.04.09.16.27.15; author dawes; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.04.09.16.27.15; author dawes; state Exp; branches 1.1.1.1.2.1; next 1.1.1.2; 1.1.1.2 date 2001.08.22.18.00.20; author dawes; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2003.03.25.00.09.32; author alanh; state Exp; branches; next ; 1.1.1.1.2.1 date 2001.08.29.17.24.57; author alanh; state dead; branches; next ; 1.3.4.1 date 2002.11.11.23.32.03; author idr; state Exp; branches; next ; 1.3.6.1 date 2002.11.15.01.58.23; author brianp; state Exp; branches; next ; desc @@ 1.3 log @re-import the XvMC libraries from 4.2.0 build the XvMC library by default as it uses the DRM (for build testing) Fix up XvMC to use the drmCommand interface @ text @/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.5 2002/10/16 00:37:33 dawes Exp $ */ #ifndef _XVMCLIBINT_H #define _XVMCLIBINT_H #define NEED_REPLIES #include #include #include #include #define XvMCCheckExtension(dpy, i, val) \ XextCheckExtension(dpy, i, xvmc_extension_name, val) #if !defined(UNIXCPP) #define XvMCGetReq(name, req) \ WORD64ALIGN\ if ((dpy->bufptr + sizeof(xvmc##name##Req)) > dpy->bufmax)\ _XFlush(dpy);\ req = (xvmc##name##Req *)(dpy->last_req = dpy->bufptr);\ req->reqType = info->codes->major_opcode;\ req->xvmcReqType = xvmc_##name; \ req->length = sizeof(xvmc##name##Req)>>2;\ dpy->bufptr += sizeof(xvmc##name##Req);\ dpy->request++ #else #define XvMCGetReq(name, req) \ WORD64ALIGN\ if ((dpy->bufptr + sizeof(xvmc/**/name/**/Req)) > dpy->bufmax)\ _XFlush(dpy);\ req = (xvmc/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\ req->reqType = info->codes->major_opcode;\ req->xvmcReqType = xvmc_/**/name;\ req->length = sizeof(xvmc/**/name/**/Req)>>2;\ dpy->bufptr += sizeof(xvmc/**/name/**/Req);\ dpy->request++ #endif #endif /* XVMCLIBINT_H */ @ 1.3.6.1 log @merge from trunk @ text @@ 1.3.4.1 log @Massive merge from trunk. @ text @@ 1.2 log @Remove client-side libraries not needed for the DRI components. @ text @d1 1 a1 1 /* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.3 2001/04/01 14:00:02 tsi Exp $ */ d7 4 a10 4 #include "Xlibint.h" #include "Xvproto.h" #include "XvMCproto.h" #include "XvMClib.h" d16 1 a16 1 #if defined(__STDC__) && !defined(UNIXCPP) @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import -f XFree86 4.0.99.2 @ text @@ 1.1.1.1.2.1 log @merge from trunk. @ text @@ 1.1.1.2 log @Import of XFree86 4.1.99.1 @ text @d1 1 a1 1 /* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.4 2001/07/25 15:04:54 dawes Exp $ */ d16 1 a16 1 #if !defined(UNIXCPP) @ 1.1.1.3 log @XFree86 4.3.0 merge @ text @d1 1 a1 1 /* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.5 2002/10/16 00:37:33 dawes Exp $ */ d7 4 a10 4 #include #include #include #include @