diff options
author | Christian König <[email protected]> | 2011-07-11 11:28:23 +0200 |
---|---|---|
committer | Christian König <[email protected]> | 2011-07-11 11:28:23 +0200 |
commit | d6eb1f82570659b7b5a562faa06d804e63a0fc64 (patch) | |
tree | 3ccab9bcc8f0bb39e538c52a563d168c109d0502 /configs | |
parent | e45d8958244919ccfccd72527cdf7e96e996c781 (diff) |
pipe-video: merge fixes
Diffstat (limited to 'configs')
-rw-r--r-- | configs/linux-dri | 5 | ||||
-rw-r--r-- | configs/linux-dri-x86-64 | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index e88d3f0ca72..c4132f47271 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -59,10 +59,9 @@ SRC_DIRS := glx egl $(SRC_DIRS) EGL_DRIVERS_DIRS = glx DRIVER_DIRS = dri - GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 -GALLIUM_TARGET_DIRS = egl-swrast -GALLIUM_STATE_TRACKERS_DIRS = egl vdpau +GALLIUM_TARGET_DIRS = +GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \ savage sis tdfx unichrome swrast diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index 90e6c215adb..656cf6140d7 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64 # the new interface. i810 are missing because there is no x86-64 # system where they could *ever* be used. # -DRI_DIRS = swrast +DRI_DIRS = i915 i965 mach64 mga r128 r200 r300 radeon savage tdfx unichrome |