summaryrefslogtreecommitdiff
path: root/src/gallium/targets/xorg-i965
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2010-06-18 19:07:26 +0200
committerJakob Bornecrantz <jakob@vmware.com>2010-06-23 03:43:48 +0200
commit41e0f6bc2f943a05766872d419e4398ddd37b42a (patch)
treef8c6cfeb5761803a9e83305dafb480aebb087508 /src/gallium/targets/xorg-i965
parent0106be903a08635fa752c65a94e7e244db3d1aff (diff)
i965g: Move bootstrap code to targets
Diffstat (limited to 'src/gallium/targets/xorg-i965')
-rw-r--r--src/gallium/targets/xorg-i965/Makefile3
-rw-r--r--src/gallium/targets/xorg-i965/intel_target.c27
2 files changed, 27 insertions, 3 deletions
diff --git a/src/gallium/targets/xorg-i965/Makefile b/src/gallium/targets/xorg-i965/Makefile
index b23a2deab99..eede9f23254 100644
--- a/src/gallium/targets/xorg-i965/Makefile
+++ b/src/gallium/targets/xorg-i965/Makefile
@@ -8,7 +8,7 @@ C_SOURCES = \
intel_xorg.c
DRIVER_DEFINES = \
- -DHAVE_CONFIG_H
+ -DHAVE_CONFIG_H -DGALLIUM_SOFTPIPE
DRIVER_LINKS = \
$(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
@@ -16,6 +16,7 @@ DRIVER_LINKS = \
$(TOP)/src/gallium/drivers/i965/libi965.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/rbug/librbug.a \
+ $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(GALLIUM_AUXILIARIES) \
$(shell pkg-config --libs libdrm libdrm_intel)
diff --git a/src/gallium/targets/xorg-i965/intel_target.c b/src/gallium/targets/xorg-i965/intel_target.c
index 2b0f5458771..36424c60a11 100644
--- a/src/gallium/targets/xorg-i965/intel_target.c
+++ b/src/gallium/targets/xorg-i965/intel_target.c
@@ -1,4 +1,27 @@
-#include "target-helpers/drm_api_compat.h"
+#include "target-helpers/inline_wrapper_sw_helper.h"
+#include "state_tracker/drm_driver.h"
+#include "i965/drm/i965_drm_public.h"
+#include "i965/brw_public.h"
-DRM_API_COMPAT_STRUCT("i965g", "i915")
+static struct pipe_screen *
+create_screen(int fd)
+{
+ struct brw_winsys_screen *bws;
+ struct pipe_screen *screen;
+
+ bws = i965_drm_winsys_screen_create(fd);
+ if (!bws)
+ return NULL;
+
+ screen = brw_screen_create(bws);
+ if (!screen)
+ return NULL;
+
+ if (debug_get_bool_option("BRW_SOFTPIPE", FALSE))
+ screen = sw_screen_wrap(screen);
+
+ return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("i915", "i965", create_screen)