diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:01:40 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:01:40 +0200 |
| commit | 4926c5748028d33da4808f8a5473aa7b2f2bdc62 (patch) | |
| tree | cc899247d6a3435ce56535cffd6a4a4190eb98d8 /configure.ac | |
| parent | dbf3a15313eed930a3d8fdde12e457259c43651b (diff) | |
| parent | 97a7cf230a70c64fff300931ae7c00aa00449c97 (diff) | |
| download | external_mesa3d-4926c5748028d33da4808f8a5473aa7b2f2bdc62.zip external_mesa3d-4926c5748028d33da4808f8a5473aa7b2f2bdc62.tar.gz external_mesa3d-4926c5748028d33da4808f8a5473aa7b2f2bdc62.tar.bz2 | |
Merge branch 'pipe-video' of git://anongit.freedesktop.org/~deathsimple/xvmc-r600 into pipe-video
Conflicts:
configure.ac
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 59c2eb1..c9daffb 100644 --- a/configure.ac +++ b/configure.ac @@ -1486,7 +1486,11 @@ dnl dnl Gallium helper functions dnl gallium_check_st() { +<<<<<<< HEAD if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_EGL" = xyes || test "x$HAVE_ST_XORG" = xyes || test "x$HAVE_ST_XVMC" = xyes || test "x$HAVE_ST_VDPAU" = xyes || test "x$HAVE_ST_VA" = xyes; then +======= + if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes || test "x$HAVE_ST_XVMC" = xyes; then +>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1" fi if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then @@ -1495,6 +1499,7 @@ gallium_check_st() { if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3" fi +<<<<<<< HEAD if test "x$HAVE_ST_XORG" = xyes && test "x$4" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $4" fi @@ -1507,6 +1512,11 @@ gallium_check_st() { if test "x$HAVE_ST_VA" = xyes && test "x$7" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7" fi +======= + if test "x$HAVE_ST_XVMC" = xyes && test "x$5" != x; then + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" + fi +>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 } @@ -1593,7 +1603,7 @@ AC_ARG_ENABLE([gallium-r600], if test "x$enable_gallium_r600" = xyes; then if test "x$HAVE_LIBDRM_RADEON" = xyes; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600" - gallium_check_st "r600/drm" "dri-r600" + gallium_check_st "r600/drm" "dri-r600" "xvmc-r600" else AC_MSG_ERROR([libdrm_radeon is missing, cannot build gallium-r600]) fi @@ -1609,7 +1619,11 @@ AC_ARG_ENABLE([gallium-nouveau], [enable_gallium_nouveau=no]) if test "x$enable_gallium_nouveau" = xyes; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50" +<<<<<<< HEAD gallium_check_st "nouveau/drm" "dri-nouveau" "egl-nouveau" "xorg-nouveau" "xvmc-nouveau" +======= + gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "xvmc-nouveau" +>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 fi dnl |