diff options
| author | Keith Whitwell <[email protected]> | 2009-12-22 09:40:39 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-12-22 09:40:39 +0000 |
| commit | aa02683e45f1eaf61bba2ba7eeda7686efeed2ca (patch) | |
| tree | 63e0ef2fa85e5d7ebd6ffc6ae9043ce0819251a2 /configs | |
| parent | ebbc73d1aed283c9bc4aa2b37bed4374bbaec5b5 (diff) | |
| parent | 0fc4dd3819af252c028ed43bbd668b4f34104e32 (diff) | |
Merge branch 'i965g-restart'
Conflicts:
configure.ac
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/default | 2 | ||||
| -rw-r--r-- | configs/linux-dri | 2 | ||||
| -rw-r--r-- | configs/linux-i965 | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/configs/default b/configs/default index eb6123d1e0a..8a975982a8b 100644 --- a/configs/default +++ b/configs/default @@ -96,7 +96,7 @@ EGL_DRIVERS_DIRS = demo GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARY_DIRS = rbug draw translate cso_cache pipebuffer tgsi sct rtasm util indices vl GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) -GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 trace identity +GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 trace identity GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = xlib egl_xlib GALLIUM_WINSYS_DRM_DIRS = diff --git a/configs/linux-dri b/configs/linux-dri index 0802543347a..cf1f4e19833 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -60,7 +60,7 @@ EGL_DRIVERS_DIRS = demo glx DRIVER_DIRS = dri WINDOW_SYSTEM = dri GALLIUM_WINSYS_DIRS = drm -GALLIUM_WINSYS_DRM_DIRS = vmware intel +GALLIUM_WINSYS_DRM_DIRS = vmware intel i965 GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \ diff --git a/configs/linux-i965 b/configs/linux-i965 new file mode 100644 index 00000000000..e66abc347bb --- /dev/null +++ b/configs/linux-i965 @@ -0,0 +1,8 @@ +# Configuration for standalone mode i965 debug + +include $(TOP)/configs/linux-debug + +CONFIG_NAME = linux-i965 + +GALLIUM_DRIVER_DIRS = i965 +GALLIUM_WINSYS_DIRS = drm/i965/xlib |