Commit 68b4274b authored by Austin Yuan's avatar Austin Yuan

Remove IN_LIBVA defines, Thanks for the patch from Gwenole

Signed-off-by: default avatarAustin Yuan <shengquan.yuan@gmail.com>
parent 03d63fe6
......@@ -22,7 +22,7 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src test
SUBDIRS = va test
if BUILD_DUMMY_DRIVER
SUBDIRS += dummy_drv_video
endif
......
......@@ -116,9 +116,9 @@ AC_SUBST([libvabackendlib])
AC_OUTPUT([
Makefile
src/Makefile
src/va_version.h
src/x11/Makefile
va/Makefile
va/va_version.h
va/x11/Makefile
dummy_drv_video/Makefile
i965_drv_video/Makefile
i965_drv_video/shaders/Makefile
......
......@@ -23,10 +23,10 @@
dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
dummy_drv_video_la_LIBADD = $(top_srcdir)/src/$(libvabackendlib)
dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
dummy_drv_video_la_LIBADD = $(top_srcdir)/va/$(libvabackendlib)
dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/va/$(libvabackendlib)
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA
AM_CFLAGS = -I$(top_srcdir)/va -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
......@@ -22,7 +22,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "va_backend.h"
#include <va/va_backend.h>
#include "dummy_drv_video.h"
......
......@@ -25,7 +25,7 @@
#ifndef _DUMMY_DRV_VIDEO_H_
#define _DUMMY_DRV_VIDEO_H_
#include "va.h"
#include <va/va.h>
#include "object_heap.h"
#define DUMMY_MAX_PROFILES 11
......
......@@ -22,12 +22,12 @@
SUBDIRS = shaders
AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 @DRM_CFLAGS@ -DIN_LIBVA
AM_CFLAGS = -Wall -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 @DRM_CFLAGS@
i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@
i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel
i965_drv_video_la_LIBADD = ../src/libva-x11.la -lpthread
i965_drv_video_la_LIBADD = ../va/libva-x11.la -lpthread
i965_drv_video_la_SOURCES = \
object_heap.c \
......
......@@ -30,8 +30,7 @@
#include <string.h>
#include <assert.h>
#include "va_backend.h"
#include "va_dricommon.h"
#include "va/x11/va_dricommon.h"
#include "intel_driver.h"
#include "intel_memman.h"
......
......@@ -30,7 +30,9 @@
#ifndef _I965_DRV_VIDEO_H_
#define _I965_DRV_VIDEO_H_
#include "va.h"
#include <va/va.h>
#include <va/va_backend.h>
#include "object_heap.h"
#include "intel_driver.h"
......
......@@ -31,7 +31,7 @@
#include <string.h>
#include <assert.h>
#include "va_backend.h"
#include <va/va_backend.h>
#include "intel_batchbuffer.h"
#include "intel_driver.h"
......
......@@ -31,7 +31,7 @@
#include <string.h>
#include <assert.h>
#include "va_backend.h"
#include <va/va_backend.h>
#include "intel_batchbuffer.h"
#include "intel_driver.h"
......
......@@ -35,8 +35,8 @@
#include <string.h>
#include <assert.h>
#include "va_backend.h"
#include "va_dricommon.h"
#include <va/va_backend.h>
#include "va/x11/va_dricommon.h"
#include "intel_batchbuffer.h"
#include "intel_driver.h"
......
......@@ -28,7 +28,7 @@
#include <string.h>
#include <assert.h>
#include "va_backend.h"
#include <va/va_backend.h>
#include "intel_batchbuffer.h"
......
......@@ -9,7 +9,7 @@
#include <i915_drm.h>
#include <intel_bufmgr.h>
#include "va_backend.h"
#include <va/va_backend.h>
#if defined(__GNUC__)
#define INLINE __inline__
......
......@@ -23,11 +23,11 @@
bin_PROGRAMS = vainfo
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
vainfo_LDADD = $(top_srcdir)/va/$(libvabackendlib)
vainfo_DEPENDENCIES = $(top_srcdir)/va/$(libvabackendlib)
vainfo_SOURCES = vainfo.c
SUBDIRS = basic decode encode putsurface
......
......@@ -23,9 +23,9 @@
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 -I$(top_srcdir)/src/x11 -DIN_LIBVA
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
test_01_LDADD = $(TEST_LIBS)
test_01_SOURCES = test_01.c
......
......@@ -22,11 +22,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifdef IN_LIBVA
#include <va_x11.h>
#else
#include <va/va_x11.h>
#endif
#include "assert.h"
#include <stdarg.h>
......
......@@ -22,11 +22,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifdef IN_LIBVA
#include <va_x11.h>
#else
#include <va/va_x11.h>
#endif
#include "assert.h"
#include <stdarg.h>
......
......@@ -22,9 +22,9 @@
bin_PROGRAMS = mpeg2vldemo
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
mpeg2vldemo_LDADD = $(TEST_LIBS)
mpeg2vldemo_SOURCES = mpeg2vldemo.c
......
......@@ -47,8 +47,8 @@
#include <assert.h>
#include "va.h"
#include "va_x11.h"
#include <va/va.h>
#include <va/va_x11.h>
#define CHECK_VASTATUS(va_status,func) \
if (va_status != VA_STATUS_SUCCESS) { \
......
......@@ -22,9 +22,9 @@
bin_PROGRAMS = h264encode
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
h264encode_LDADD = $(TEST_LIBS)
h264encode_SOURCES = h264encode.c
......
......@@ -26,7 +26,7 @@
* it is a real program to show how VAAPI encoding work,
* It does H264 element stream level encoding on auto-generated YUV data
*
* gcc -o h264encode h264encode -lva -lva-x11 -I/usr/include/va
* gcc -o h264encode h264encode -lva -lva-x11
* ./h264encode -w <width> -h <height> -n <frame_num>
*
*/
......@@ -44,9 +44,8 @@
#include <assert.h>
#include "va.h"
#include "va_x11.h"
#include <va/va.h>
#include <va/va_x11.h>
#define CHECK_VASTATUS(va_status,func) \
if (va_status != VA_STATUS_SUCCESS) { \
......
......@@ -22,9 +22,9 @@
bin_PROGRAMS = putsurface
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) -lpthread
TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib) -lpthread
putsurface_LDADD = $(TEST_LIBS)
putsurface_SOURCES = putsurface.c
......
......@@ -23,7 +23,7 @@
*/
/* gcc -o putsurface putsurface.c -lva -lva-x11 -I/usr/include/va */
/* gcc -o putsurface putsurface.c -lva -lva-x11 */
#include <stdio.h>
#include <string.h>
......@@ -39,8 +39,8 @@
#include <sys/stat.h>
#include <fcntl.h>
#include "va.h"
#include "va_x11.h"
#include <va/va.h>
#include <va/va_x11.h>
#include <assert.h>
......
......@@ -22,11 +22,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifdef IN_LIBVA
#include <va_x11.h>
#else
#include <va/va_x11.h>
#endif
#include <stdarg.h>
#include <stdio.h>
......
......@@ -21,8 +21,7 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
INCLUDES = \
$(LIBVA_CFLAGS) -I$(top_srcdir)/src/x11 \
-DIN_LIBVA \
$(LIBVA_CFLAGS) -I$(top_srcdir)/va/x11 \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
LDADD = \
......@@ -46,7 +45,7 @@ SUBDIRS = x11
libva_la_SOURCES = va.c
libvaincludedir = ${includedir}/va
libvainclude_HEADERS = va.h va_backend.h va_version.h
libvainclude_HEADERS = va.h va_x11.h va_backend.h va_version.h
DISTCLEANFILES = \
va_version.h
......
......@@ -23,21 +23,18 @@
*/
#define _GNU_SOURCE 1
#include "va.h"
#include "va_backend.h"
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <dlfcn.h>
#include <unistd.h>
#include <linux/videodev2.h>
#include "va_dri.h"
#include "va_dri2.h"
#include "va_dricommon.h"
#define DRIVER_INIT_FUNC "__vaDriverInit_0_31"
......
......@@ -65,11 +65,7 @@
#ifndef _VA_H_
#define _VA_H_
#ifdef IN_LIBVA
#include "va_version.h"
#else
#include <va/va_version.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -29,15 +29,10 @@
#ifndef _VA_BACKEND_H_
#define _VA_BACKEND_H_
#ifdef IN_LIBVA
#include "va.h"
#include "x11/va_x11.h"
#else
#include <va/va.h>
#include <va/va_x11.h>
#endif
#include <stdlib.h>
#include <X11/Xlib.h>
#include <linux/videodev2.h>
......
File moved
#ifndef _VA_X11_H_
#define _VA_X11_H_
#ifdef IN_LIBVA
#include "va.h"
#else
#include <va/va.h>
#endif
#include <X11/Xlib.h>
#ifdef __cplusplus
......
......@@ -18,12 +18,12 @@
# 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 $(DRM_CFLAGS)
AM_CFLAGS = -DLINUX -I$(top_srcdir)/va $(DRM_CFLAGS)
noinst_LTLIBRARIES = libva_x11.la
libva_x11includedir = ${includedir}/va
libva_x11include_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h
libva_x11include_HEADERS = va_dri.h va_dri2.h va_dricommon.h
libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c
......
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
......@@ -7,7 +7,7 @@
#include <drm.h>
#include <drm_sarea.h>
#include "va_backend.h"
#include <va/va_backend.h>
enum
{
......
File moved
File moved
File moved
......@@ -32,6 +32,7 @@
#include "va_dricommon.h"
#include "va_nvctrl.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <unistd.h>
......
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