From f3c45caf73a5af03d4ed386ff219848396a83f19 Mon Sep 17 00:00:00 2001 From: Austin Yuan Date: Wed, 3 Jun 2009 14:03:57 -0400 Subject: [PATCH] Added va_dri2tokens.h for DRI2 tokens definition Signed-off-by: Austin Yuan --- src/X11/va_dri2.c | 2 +- src/X11/va_dri2.h | 1 - src/X11/va_dri2tokens.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 src/X11/va_dri2tokens.h diff --git a/src/X11/va_dri2.c b/src/X11/va_dri2.c index 8ca80e2..c602bba 100644 --- a/src/X11/va_dri2.c +++ b/src/X11/va_dri2.c @@ -38,9 +38,9 @@ #include "xf86drm.h" #include "va_dri2.h" #include "va_dri2str.h" +#include "va_dri2tokens.h" #ifndef DRI2DriverDRI -#include "va_dri2tokens.h" #define DRI2DriverDRI 0 #endif diff --git a/src/X11/va_dri2.h b/src/X11/va_dri2.h index 0231649..a26a839 100644 --- a/src/X11/va_dri2.h +++ b/src/X11/va_dri2.h @@ -34,7 +34,6 @@ #define _VA_DRI2_H_ #include -#include #include #include diff --git a/src/X11/va_dri2tokens.h b/src/X11/va_dri2tokens.h new file mode 100644 index 0000000..087159f --- /dev/null +++ b/src/X11/va_dri2tokens.h @@ -0,0 +1,48 @@ +/* + * Copyright © 2008 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Soft- + * ware"), to deal in the Software without restriction, including without + * limitation the rights to use, copy, modify, merge, publish, distribute, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, provided that the above copyright + * notice(s) and this permission notice appear in all copies of the Soft- + * ware and that both the above copyright notice(s) and this permission + * notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- + * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY + * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN + * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE- + * QUENTIAL 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 PERFOR- + * MANCE OF THIS SOFTWARE. + * + * Except as contained in this notice, the name of a copyright holder shall + * not be used in advertising or otherwise to promote the sale, use or + * other dealings in this Software without prior written authorization of + * the copyright holder. + * + * Authors: + * Kristian Høgsberg (krh@redhat.com) + */ + +#ifndef _DRI2_TOKENS_H_ +#define _DRI2_TOKENS_H_ + +#define DRI2BufferFrontLeft 0 +#define DRI2BufferBackLeft 1 +#define DRI2BufferFrontRight 2 +#define DRI2BufferBackRight 3 +#define DRI2BufferDepth 4 +#define DRI2BufferStencil 5 +#define DRI2BufferAccum 6 +#define DRI2BufferFakeFrontLeft 7 +#define DRI2BufferFakeFrontRight 8 + +#define DRI2DriverDRI 0 + +#endif -- 2.7.4