From 938c307e4526298d2703818d5fa848a31b076905 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 10 Aug 2007 10:02:34 +0100
Subject: Add printf handlers, pass pci id and move texlayout code to driver.

---
 src/mesa/pipe/i915simple/Makefile       | 1 +
 src/mesa/pipe/i915simple/i915_context.c | 7 +++++++
 2 files changed, 8 insertions(+)

(limited to 'src/mesa/pipe/i915simple')

diff --git a/src/mesa/pipe/i915simple/Makefile b/src/mesa/pipe/i915simple/Makefile
index 96e16a948f8..5b919e3bed6 100644
--- a/src/mesa/pipe/i915simple/Makefile
+++ b/src/mesa/pipe/i915simple/Makefile
@@ -21,6 +21,7 @@ DRIVER_SOURCES = \
 	i915_state_emit.c \
 	i915_state_fragprog.c \
 	i915_prim_emit.c \
+	i915_tex_layout.c \
 	i915_surface.c 
 
 C_SOURCES = \
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index a15d3505d77..d8e54f02ee8 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -29,6 +29,7 @@
 #include "i915_context.h"
 #include "i915_winsys.h"
 #include "i915_state.h"
+#include "i915_tex_layout.h"
 
 #include "pipe/draw/draw_context.h"
 #include "pipe/p_defines.h"
@@ -207,6 +208,12 @@ struct pipe_context *i915_create( struct i915_winsys *winsys,
    i915_init_flush_functions(i915);
 
 
+   if (i915->flags.is_i945)
+      i915->pipe.mipmap_tree_layout = i945_miptree_layout;
+   else
+      i915->pipe.mipmap_tree_layout = i945_miptree_layout;
+
+
    i915->dirty = ~0;
    i915->hardware_dirty = ~0;
 
-- 
cgit v1.2.3