commit 29691a11b28457f6610d6337dbba5f9d2bf05dc1 Author: gb Date: Fri Mar 5 07:56:41 2010 +0100 Drop IN_LIBVA ifdefs from system headers. diff --git a/src/dummy_drv_video/Makefile.am b/src/dummy_drv_video/Makefile.am index 24bf998..04dd266 100644 --- a/src/dummy_drv_video/Makefile.am +++ b/src/dummy_drv_video/Makefile.am @@ -26,7 +26,7 @@ dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undef dummy_drv_video_la_LIBADD = $(top_srcdir)/src/va/$(libvabackendlib) dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/va/$(libvabackendlib) -AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c noinst_HEADERS = dummy_drv_video.h object_heap.h diff --git a/src/dummy_drv_video/dummy_drv_video.c b/src/dummy_drv_video/dummy_drv_video.c index f617018..98561a9 100644 --- a/src/dummy_drv_video/dummy_drv_video.c +++ b/src/dummy_drv_video/dummy_drv_video.c @@ -22,12 +22,13 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "va_backend.h" +#include #include "dummy_drv_video.h" #include "assert.h" #include +#include #include #include diff --git a/src/dummy_drv_video/dummy_drv_video.h b/src/dummy_drv_video/dummy_drv_video.h index 3ebd60b..cd849c5 100644 --- a/src/dummy_drv_video/dummy_drv_video.h +++ b/src/dummy_drv_video/dummy_drv_video.h @@ -25,7 +25,7 @@ #ifndef _DUMMY_DRV_VIDEO_H_ #define _DUMMY_DRV_VIDEO_H_ -#include "va.h" +#include #include "object_heap.h" #define DUMMY_MAX_PROFILES 11 diff --git a/src/i965_drv_video/Makefile.am b/src/i965_drv_video/Makefile.am index d9baf58..95e514e 100644 --- a/src/i965_drv_video/Makefile.am +++ b/src/i965_drv_video/Makefile.am @@ -22,7 +22,7 @@ SUBDIRS = shaders -AM_CFLAGS = -Wall -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 @DRM_CFLAGS@ -DIN_LIBVA +AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/va/x11 @DRM_CFLAGS@ i965_drv_video_la_LTLIBRARIES = i965_drv_video.la i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@ diff --git a/src/i965_drv_video/i965_drv_video.c b/src/i965_drv_video/i965_drv_video.c index 8f4bfc1..6a60ecc 100644 --- a/src/i965_drv_video/i965_drv_video.c +++ b/src/i965_drv_video/i965_drv_video.c @@ -27,11 +27,11 @@ * */ +#include #include #include -#include "va_backend.h" -#include "va_dricommon.h" +#include "va/x11/va_dricommon.h" #include "intel_driver.h" #include "intel_memman.h" diff --git a/src/i965_drv_video/i965_drv_video.h b/src/i965_drv_video/i965_drv_video.h index c95c799..168d01d 100644 --- a/src/i965_drv_video/i965_drv_video.h +++ b/src/i965_drv_video/i965_drv_video.h @@ -30,7 +30,8 @@ #ifndef _I965_DRV_VIDEO_H_ #define _I965_DRV_VIDEO_H_ -#include "va.h" +#include +#include #include "object_heap.h" #include "intel_driver.h" diff --git a/src/i965_drv_video/i965_media.c b/src/i965_drv_video/i965_media.c index f7d5846..54d6657 100644 --- a/src/i965_drv_video/i965_media.c +++ b/src/i965_drv_video/i965_media.c @@ -31,8 +31,6 @@ #include #include -#include "va_backend.h" - #include "intel_batchbuffer.h" #include "intel_driver.h" diff --git a/src/i965_drv_video/i965_media_mpeg2.c b/src/i965_drv_video/i965_media_mpeg2.c index 6a14e9e..fff4928 100644 --- a/src/i965_drv_video/i965_media_mpeg2.c +++ b/src/i965_drv_video/i965_media_mpeg2.c @@ -31,8 +31,6 @@ #include #include -#include "va_backend.h" - #include "intel_batchbuffer.h" #include "intel_driver.h" diff --git a/src/i965_drv_video/i965_render.c b/src/i965_drv_video/i965_render.c index f3e89c2..8057082 100644 --- a/src/i965_drv_video/i965_render.c +++ b/src/i965_drv_video/i965_render.c @@ -32,12 +32,10 @@ */ #include +#include #include #include -#include "va_backend.h" -#include "va_dricommon.h" - #include "intel_batchbuffer.h" #include "intel_driver.h" diff --git a/src/i965_drv_video/intel_batchbuffer.c b/src/i965_drv_video/intel_batchbuffer.c index 46c9496..9fabf6a 100644 --- a/src/i965_drv_video/intel_batchbuffer.c +++ b/src/i965_drv_video/intel_batchbuffer.c @@ -25,10 +25,11 @@ * **************************************************************************/ +#include #include #include -#include "va_backend.h" +#include #include "intel_batchbuffer.h" diff --git a/src/i965_drv_video/intel_driver.h b/src/i965_drv_video/intel_driver.h index 84df0aa..9ab95b7 100644 --- a/src/i965_drv_video/intel_driver.h +++ b/src/i965_drv_video/intel_driver.h @@ -9,7 +9,7 @@ #include #include -#include "va_backend.h" +#include #if defined(__GNUC__) #define INLINE __inline__ diff --git a/src/va/Makefile.am b/src/va/Makefile.am index 3741250..f9a21a4 100644 --- a/src/va/Makefile.am +++ b/src/va/Makefile.am @@ -21,8 +21,7 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. INCLUDES = \ - $(LIBVA_CFLAGS) -I$(top_srcdir)/src/va/x11 \ - -DIN_LIBVA \ + $(LIBVA_CFLAGS) -I$(top_srcdir)/src \ -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" LDADD = \ diff --git a/src/va/va.c b/src/va/va.c index bc469a0..7aea1e4 100644 --- a/src/va/va.c +++ b/src/va/va.c @@ -29,15 +29,11 @@ #include #include #include +#include #include #include #include -#include -#include "va_dri.h" -#include "va_dri2.h" -#include "va_dricommon.h" - #define DRIVER_INIT_FUNC "__vaDriverInit_0_31" diff --git a/src/va/va.h b/src/va/va.h index 0d4c853..02be829 100755 --- a/src/va/va.h +++ b/src/va/va.h @@ -65,11 +65,7 @@ #ifndef _VA_H_ #define _VA_H_ -#ifdef IN_LIBVA -#include "va_version.h" -#else #include -#endif #ifdef __cplusplus extern "C" { diff --git a/src/va/va_backend.h b/src/va/va_backend.h index d514ba0..ff86744 100644 --- a/src/va/va_backend.h +++ b/src/va/va_backend.h @@ -29,15 +29,8 @@ #ifndef _VA_BACKEND_H_ #define _VA_BACKEND_H_ -#ifdef IN_LIBVA -#include "va.h" -#include "x11/va_x11.h" -#else #include -#include -#endif - -#include +#include #include diff --git a/src/va/x11/Makefile.am b/src/va/x11/Makefile.am index f612205..196663e 100644 --- a/src/va/x11/Makefile.am +++ b/src/va/x11/Makefile.am @@ -18,7 +18,7 @@ # otherwise. Any license under such intellectual property rights must be # express and approved by Intel in writing. -AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src/va $(DRM_CFLAGS) +AM_CFLAGS = -DLINUX -I$(top_srcdir)/src -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 $(DRM_CFLAGS) noinst_LTLIBRARIES = libva_x11.la diff --git a/src/va/x11/va_dricommon.h b/src/va/x11/va_dricommon.h index a2a51a6..b762bd0 100644 --- a/src/va/x11/va_dricommon.h +++ b/src/va/x11/va_dricommon.h @@ -7,7 +7,7 @@ #include #include -#include "va_backend.h" +#include enum { diff --git a/src/va/x11/va_x11.c b/src/va/x11/va_x11.c index 3e85ba3..29e81c8 100644 --- a/src/va/x11/va_x11.c +++ b/src/va/x11/va_x11.c @@ -32,6 +32,7 @@ #include "va_dricommon.h" #include "va_nvctrl.h" #include +#include #include #include #include diff --git a/src/va/x11/va_x11.h b/src/va/x11/va_x11.h index 2171ac6..3f0a1d6 100644 --- a/src/va/x11/va_x11.h +++ b/src/va/x11/va_x11.h @@ -1,11 +1,7 @@ #ifndef _VA_X11_H_ #define _VA_X11_H_ -#ifdef IN_LIBVA -#include "va.h" -#else #include -#endif #include #ifdef __cplusplus diff --git a/test/Makefile.am b/test/Makefile.am index 29ff5d2..f087736 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = vainfo -AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/va/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/va/x11 -DIN_LIBVA vainfo_LDADD = $(top_srcdir)/src/va/$(libvabackendlib) diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am index ca4bd48..26ffa0f 100644 --- a/test/basic/Makefile.am +++ b/test/basic/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ test_07 test_08 test_09 test_10 test_11 -AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/va/x11 -DIN_LIBVA TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am index 41500a9..53cf0a3 100644 --- a/test/decode/Makefile.am +++ b/test/decode/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = mpeg2vldemo -AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/va/x11 -DIN_LIBVA TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) diff --git a/test/decode/mpeg2vldemo.c b/test/decode/mpeg2vldemo.c index d62f1c2..3982251 100644 --- a/test/decode/mpeg2vldemo.c +++ b/test/decode/mpeg2vldemo.c @@ -47,8 +47,11 @@ #include -#include "va.h" +#ifdef IN_LIBVA #include "va_x11.h" +#else +#include +#endif #define CHECK_VASTATUS(va_status,func) \ if (va_status != VA_STATUS_SUCCESS) { \ diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index 31f9ce0..46a72a1 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = h264encode -AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/va/x11 -DIN_LIBVA TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) diff --git a/test/encode/h264encode.c b/test/encode/h264encode.c index ca9f532..6cf055f 100644 --- a/test/encode/h264encode.c +++ b/test/encode/h264encode.c @@ -44,8 +44,11 @@ #include -#include "va.h" +#ifdef IN_LIBVA #include "va_x11.h" +#else +#include +#endif #define CHECK_VASTATUS(va_status,func) \ diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am index af9ceae..97f602d 100644 --- a/test/putsurface/Makefile.am +++ b/test/putsurface/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = putsurface -AM_CFLAGS = -I$(top_srcdir)/src/va -I$(top_srcdir)/src/va/x11 -DIN_LIBVA +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/va/x11 -DIN_LIBVA TEST_LIBS = $(top_srcdir)/src/va/$(libvabackendlib) -lpthread diff --git a/test/putsurface/putsurface.c b/test/putsurface/putsurface.c index 335368a..3c96593 100644 --- a/test/putsurface/putsurface.c +++ b/test/putsurface/putsurface.c @@ -39,8 +39,11 @@ #include #include -#include "va.h" +#ifdef IN_LIBVA #include "va_x11.h" +#else +#include +#endif #include