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.6
	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.5
	X_4_1_99_1:1.1.1.5
	X_4_1_99_1-20010822-preimport:1.1.1.4
	multihead-1-0-0-20010730:1.1.1.4
	multihead-1-0-0-20010730-merge:1.1.1.4
	multihead-1-0-0-20010727-freeze:1.1.1.4
	X_4_1_0-20010615-merge:1.1.1.4
	mesa-3-5-20010621-freeze:1.1.1.4
	X_4_1_0:1.1.1.4
	X_4_1_0-20010614-preimport:1.1.1.4
	multihead-1-0-0-branch:1.1.1.4.0.34
	X_4_0_99_3-20010502-merge:1.1.1.4
	X_4_0_99_3:1.1.1.4
	X_4_0_99_3-20010501-preimport:1.1.1.4
	bsd-2-0-0-branch:1.1.1.4.0.32
	X_4_0_99_2-20010410-merge:1.1.1.4
	X_4_0_99_2:1.1.1.4
	X_4_0_99_2-20010409-preimport:1.1.1.4
	ati-pcigart-1-0-0-20010405-merge:1.1.1.4
	ati-pcigart-1-0-0-20010405:1.1.1.4
	ati-pcigart-1-0-0-20010405-freeze:1.1.1.4
	ati-pcigart-1-0-0-branch:1.1.1.4.0.30
	mesa-3-5-20010323-freeze:1.1.1.4
	X_4_0_99_1-20010321-merge:1.1.1.4
	X_4_0_99_1:1.1.1.4
	X_4_0_99_1-20010319-preimport:1.1.1.4
	full-1-0-0-20010315-head:1.1.1.4
	sarea-1-0-0-20010314-merge:1.1.1.4
	sarea-1-0-0-20010314:1.1.1.4
	full-1-0-0-branch:1.1.1.4
	sarea-1-0-0-20010307:1.1.1.4
	sarea-1-0-0-20010307-freeze:1.1.1.4
	tdfx-3-1-0-20010306-merge:1.1.1.4
	tdfx-3-1-0-20010306-freeze:1.1.1.4
	tdfx-3-1-0-20010306:1.1.1.4
	tdfx-3-1-0-20010305-merge:1.1.1.4
	tdfx-3-1-0-20010305-freeze2:1.1.1.4
	tdfx-3-1-0-20010305-freeze:1.1.1.4
	tdfx-3-1-0-20010301-freeze:1.1.1.4
	ati-pcigart-0-0-1-branch-02282001-freeze:1.1.1.4
	ati-5-0-1-20010220-head:1.1.1.4
	ati-5-0-1-branch:1.1.1.4.0.28
	sarea-1-0-0-branch:1.1.1.4.0.26
	mga-1-0-0-20010215-merge:1.1.1.4
	mga-1-0-0-20010215-freeze:1.1.1.4
	tdfx-3-1-0-branch:1.1.1.4.0.24
	tdfx-3-0-1-branch:1.1.1.4
	ati-pcigart-0-0-1-branch:1.1.1.4.0.22
	mesa-3-5-branch:1.1.1.4.0.20
	tdfx-3-0-0-20010109-merge:1.1.1.4
	tdfx-3-0-0-20010108:1.1.1.4
	ati-5-0-0-20010105-merge:1.1.1.4
	ati-5-0-0-20010105:1.1.1.4
	ati-5-0-0-20000104-freeze:1.1.1.4
	tdfx-3-0-0-20010104-freeze:1.1.1.4
	ati-5-0-0-20001223-merge:1.1.1.4
	ati-5-0-0-20001223-freeze:1.1.1.4
	X_4_0_2-20001221-merge:1.1.1.4
	X_4_0_2:1.1.1.4
	mga-1-0-0-branch:1.1.1.4.0.18
	X_4_0_1h-20001207-merge:1.1.1.4
	X_4_0_1h-20001205-merge:1.1.1.4
	X_4_0_1h:1.1.1.4
	ati-4-1-1-20001202-merge-trunk:1.1.1.4
	sse-1-0-1-branch:1.1.1.4.0.16
	ati-4-1-1-20001202-merge:1.1.1.2
	tdfx-3-0-0-20001201:1.1.1.4
	ati-4-1-1-20001201-freeze:1.1.1.2
	tdfx-3-0-0-20001201-freeze:1.1.1.4
	X_4_0_1g-20001130-merge:1.1.1.4
	X_4_0_1g:1.1.1.4
	X_4_0_1f-20001130-merge:1.1.1.4
	X_4_0_1f:1.1.1.4
	ati-4-1-1-20001125-freeze:1.1.1.2
	mach64-0-0-1-branch:1.1.1.4.0.14
	ati-5-0-0-branch:1.1.1.4.0.12
	X_4_0_1e-20001107-merge:1.1.1.4
	X_4_0_1e:1.1.1.4
	X_4_0_1d-20001107-merge:1.1.1.4
	X_4_0_1d:1.1.1.4
	ppc-1-0-1-branch:1.1.1.4.0.10
	radeon-1-0-0-20001017:1.1.1.2
	full-0-0-2-branch:1.1.1.4.0.8
	full-0-0-1-branch:1.1.1.4.0.6
	ati-4-1-1-20001009-freeze:1.1.1.2
	mga-readpix-0-0-1-branch:1.1.1.4.0.4
	tdfx-3-0-0-branch:1.1.1.4.0.2
	X_4_0_1d-pre:1.1.1.4
	ati-4-1-1-20000919-stable:1.1.1.2
	radeon-1-0-0-branch:1.1.1.2.0.20
	ppc-1-0-0-20000912:1.1.1.2
	mga-lock-debug-0-2-0-branch:1.1.1.2.0.18
	sse-1-0-0-branch:1.1.1.2.0.16
	mga-lock-debug-0-0-1-branch:1.1.1.2.0.14
	gamma-2-0-0-branch:1.1.1.2.0.12
	tdfx-2-1-20000907-merge:1.1.1.2
	tdfx-2-1-20000906:1.1.1.1.46.1
	tdfx-2-1-20000905-freeze:1.1.1.1.46.1
	ppc-1-0-0-2000-09-01-freeze:1.1.1.2
	m3-0-0-1-branch:1.1.1.2.0.10
	mach64-0-0-0-branch:1.1.1.2.0.8
	ati-4-1-1-branch:1.1.1.2.0.6
	X_4_0_1b-20000816-merge:1.1.1.2
	X_4_0_1b:1.1.1.2
	ati-4-0-2-branch:1.1.1.2.0.4
	ppc-1-0-0-branch:1.1.1.2.0.2
	tdfx-2-1-20000711:1.1.1.1.46.1
	tdfx-2-1-20000711-freeze:1.1.1.1
	X_4_0_1:1.1.1.2
	tdfx-2-1-branch:1.1.1.1.0.46
	pre401-20000613-freeze:1.1.1.1
	bsd-1-0-1-20000613-merge:1.1.1.1
	bsd-1-0-1-20000613:1.1.1.1
	bsd-1-0-1-20000612-freeze:1.1.1.1
	tdfx-2-0-20000612-merge:1.1.1.1
	ati-4-1-0-20000613-merge:1.1.1.1
	ati-4-1-0-20000613:1.1.1.1
	tdfx-2-0-20000608-merge:1.1.1.1
	tdfx-2-0-20000608-freeze:1.1.1.1
	ati-4-1-0-branch:1.1.1.1.0.44
	glxmisc-3-0-0-20000608-merge:1.1.1.1
	glxmisc-3-0-0-20000607:1.1.1.1
	glxmisc-3-0-0-20000606-freeze:1.1.1.1
	bsd-1-0-1-branch:1.1.1.1.0.42
	bsd-1-0-0-20000531-merge:1.1.1.1
	bsd-1-0-0-20000530-merge:1.1.1.1
	bsd-1-0-0-20000530-freeze:1.1.1.1
	tdfx-2-0-20000222-merge:1.1.1.1
	tdfx-2-0-20000222-freeze:1.1.1.1
	ati-4-0-1-20000518-merge:1.1.1.1
	ati-4-0-1-20000518:1.1.1.1
	video-1-0-0-branch:1.1.1.1.0.40
	gamma-1-0-0-branch:1.1.1.1.0.38
	mgadh-0-0-3-branch:1.1.1.1.0.36
	glxmisc-3-0-0-branch:1.1.1.1.0.34
	glxmisc-2-0-0-20000503-merge:1.1.1.1
	bsd-1-0-0-branch:1.1.1.1.0.32
	glxmisc-2-0-0-20000503:1.1.1.1
	glxmisc-2-0-0-branch:1.1.1.1.0.30
	tdfx-2-0-branch:1.1.1.1.0.28
	tdfx-2-0-trunk:1.1.1.1
	glxmisc-1-0-0-20000420-merge:1.1.1.1
	glxmisc-1-0-0-20000420:1.1.1.1
	ati-4-0-1-beta:1.1.1.1
	glxmisc-1-0-0-branch:1.1.1.1.0.26
	mga-0-0-3-branch:1.1.1.1.0.24
	mga-0-0-2-20000404-merge:1.1.1.1
	ati-4-0-1-alpha:1.1.1.1
	ati-4-0-1-20000319-base:1.1.1.1
	ati-4-0-1-branch:1.1.1.1.0.22
	ati-4-0-0-20000319:1.1.1.1
	X_4_0-20000315-merge:1.1.1.1
	X_4_0:1.1.1.1
	freeze-20000226:1.1.1.1
	dispatch-0-0-3-20000225-merge:1.1.1.1
	dispatch-0-0-3-20000225:1.1.1.1
	mga-0-0-1-20000225-merge:1.1.1.1
	mga-0-0-2-branch:1.1.1.1.0.20
	smt-0-0-2-branch:1.1.1.1.0.18
	smt-0-0-1-20000222-freeze:1.1.1.1
	X_3_9_18-20000222-merge:1.1.1.1
	X_3_9_18:1.1.1.1
	smt-0-0-1-stage2c:1.1.1.1
	smt-0-0-1-stage2b:1.1.1.1.0.16
	dispatch-0-0-3-branch:1.1.1.1.0.14
	i810-20000214-beta2:1.1.1.1
	dispatch-0-0-2-20000212:1.1.1.1
	dispatch-0-0-2-branch:1.1.1.1.0.12
	i810-20000201-beta1:1.1.1.1
	dispatch-0-0-1-20000129-merge:1.1.1.1
	dispatch-0-0-1-20000128:1.1.1.1
	smt-0-0-1-20000112-base:1.1.1.1
	smt-0-0-1-branch:1.1.1.1.0.6
	dispatch-0-0-1-branch:1.1.1.1.0.10
	tdfx-1-1:1.1.1.1.0.4
	X_3_9_17:1.1.1.1
	ati-4-0-0-branch:1.1.1.1.0.8
	mga-0-0-1-branch:1.1.1.1.0.2
	X_3_9_16: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	99.12.05.00.59.38;	author daryll;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.12.05.00.59.38;	author daryll;	state Exp;
branches
	1.1.1.1.46.1;
next	1.1.1.2;

1.1.1.2
date	2000.07.10.21.00.51;	author alanh;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.09.22.17.24.58;	author alanh;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2000.09.23.20.56.44;	author alanh;	state Exp;
branches
	1.1.1.4.32.1;
next	1.1.1.5;

1.1.1.5
date	2001.08.22.18.00.22;	author dawes;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2003.03.25.00.09.31;	author alanh;	state Exp;
branches;
next	;

1.1.1.4.32.1
date	2001.08.29.17.24.57;	author alanh;	state dead;
branches;
next	;

1.1.1.1.46.1
date	2000.07.11.19.36.24;	author daryll;	state Exp;
branches;
next	;

1.3.4.1
date	2002.11.11.23.32.02;	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
@/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.

                        All Rights Reserved

Permission to use, copy, modify, and distribute this software and its 
documentation for any purpose and without fee is hereby granted, 
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in 
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.  

DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.

******************************************************************/
/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.6 2002/10/16 00:37:33 dawes Exp $ */

#ifndef XVLIBINT_H
#define XVLIBINT_H
/*
** File: 
**
**   Xvlibint.h --- Xv library internal header file
**
** Author: 
**
**   David Carver (Digital Workstation Engineering/Project Athena)
**
** Revisions:
**
**   01.24.91 Carver
**     - version 1.4 upgrade
**
*/

#define NEED_REPLIES

#include <X11/Xlibint.h>
#include <X11/extensions/Xvproto.h>
#include <X11/extensions/Xvlib.h>

#if !defined(UNIXCPP)
#define XvGetReq(name, req) \
        WORD64ALIGN\
	if ((dpy->bufptr + SIZEOF(xv##name##Req)) > dpy->bufmax)\
		_XFlush(dpy);\
	req = (xv##name##Req *)(dpy->last_req = dpy->bufptr);\
	req->reqType = info->codes->major_opcode;\
        req->xvReqType = xv_##name; \
        req->length = (SIZEOF(xv##name##Req))>>2;\
	dpy->bufptr += SIZEOF(xv##name##Req);\
	dpy->request++

#else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
#define XvGetReq(name, req) \
        WORD64ALIGN\
	if ((dpy->bufptr + SIZEOF(xv/**/name/**/Req)) > dpy->bufmax)\
		_XFlush(dpy);\
	req = (xv/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
	req->reqType = info->codes->major_opcode;\
	req->xvReqType = xv_/**/name;\
	req->length = (SIZEOF(xv/**/name/**/Req))>>2;\
	dpy->bufptr += SIZEOF(xv/**/name/**/Req);\
	dpy->request++
#endif


#endif /* XVLIBINT_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
@d24 2
d46 3
a48 3
#include "Xlibint.h"
#include "Xvproto.h"
#include "Xvlib.h"
d50 1
a50 1
#if defined(__STDC__) && !defined(UNIXCPP)
d56 1
a56 1
	req->reqType = _XvCodes->major_opcode;\
d68 1
a68 1
	req->reqType = _XvCodes->major_opcode;\
a71 25
	dpy->request++
#endif


#if defined(__STDC__) && !defined(UNIXCPP)
#define XvGetReqExtra(name, n, req) \
        WORD64ALIGN\
	if ((dpy->bufptr + SIZEOF(xv##name##Req) + n) > dpy->bufmax)\
		_XFlush(dpy);\
	req = (xv##name##Req *)(dpy->last_req = dpy->bufptr);\
	req->reqType = _XvCodes->major_opcode;\
	req->xvReqType = xv_##name;\
	req->length = (SIZEOF(xv##name##Req) + n)>>2;\
	dpy->bufptr += SIZEOF(xv##name##Req) + n;\
	dpy->request++
#else
#define XvGetReqExtra(name, n, req) \
        WORD64ALIGN\
	if ((dpy->bufptr + SIZEOF(xv/**/name/**/Req) + n) > dpy->bufmax)\
		_XFlush(dpy);\
	req = (xv/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
	req->reqType = _XvCodes->major_opcode;\
	req->xvReqType = xv_/**/name;\
	req->length = (SIZEOF(xv/**/name/**/Req) + n)>>2;\
	dpy->bufptr += SIZEOF(xv/**/name/**/Req) + n;\
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import XFree 3.9.16
@
text
@@


1.1.1.1.46.1
log
@
Merge the trunk onto the tdfx-2-1 branch. Now up to date with 4.0.1.
@
text
@a23 2
/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.4 2000/06/07 22:02:57 tsi Exp $ */

d54 1
a54 1
	req->reqType = info->codes->major_opcode;\
d66 1
a66 1
	req->reqType = info->codes->major_opcode;\
d70 25
@


1.1.1.2
log
@Import of XFree86 4.0.1
@
text
@a23 2
/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.4 2000/06/07 22:02:57 tsi Exp $ */

d54 1
a54 1
	req->reqType = info->codes->major_opcode;\
d66 1
a66 1
	req->reqType = info->codes->major_opcode;\
d70 25
@


1.1.1.3
log
@Import of XFree86 4.0.1d-pre
@
text
@d24 1
a24 1
/* $XFree86$ */
@


1.1.1.4
log
@Import of XFree86 4.0.1d-pre (2)
@
text
@d24 1
a24 1
/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.4 2000/06/07 22:02:57 tsi Exp $ */
@


1.1.1.4.32.1
log
@merge from trunk.
@
text
@@


1.1.1.5
log
@Import of XFree86 4.1.99.1
@
text
@d24 1
a24 1
/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.5 2001/07/25 15:04:53 dawes Exp $ */
d50 1
a50 1
#if !defined(UNIXCPP)
@


1.1.1.6
log
@XFree86 4.3.0 merge
@
text
@d24 1
a24 1
/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.6 2002/10/16 00:37:33 dawes Exp $ */
d46 3
a48 3
#include <X11/Xlibint.h>
#include <X11/extensions/Xvproto.h>
#include <X11/extensions/Xvlib.h>
@