diff options
| author | Keith Whitwell <[email protected]> | 2007-08-10 16:42:26 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2007-08-10 16:44:07 +0100 |
| commit | 39407fd85467141fceafbedf52d9e55e008eb011 (patch) | |
| tree | c3580533e9e37c1d410eb6bb8f24fd192f27dbcc /src/mesa/pipe/i915simple/i915_context.c | |
| parent | 1c8bcc733d695732ca704565b3a10ac5f4172ea3 (diff) | |
Move string functions to state_tracker, add queries to pipe, winsys.
Diffstat (limited to 'src/mesa/pipe/i915simple/i915_context.c')
| -rw-r--r-- | src/mesa/pipe/i915simple/i915_context.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c index d9fbada1ff6..199352cd704 100644 --- a/src/mesa/pipe/i915simple/i915_context.c +++ b/src/mesa/pipe/i915simple/i915_context.c @@ -31,20 +31,12 @@ #include "i915_state.h" #include "i915_batch.h" #include "i915_tex_layout.h" +#include "i915_reg.h" #include "pipe/draw/draw_context.h" #include "pipe/p_defines.h" #include "pipe/p_winsys.h" -#define PCI_CHIP_I915_G 0x2582 -#define PCI_CHIP_I915_GM 0x2592 -#define PCI_CHIP_I945_G 0x2772 -#define PCI_CHIP_I945_GM 0x27A2 -#define PCI_CHIP_I945_GME 0x27AE -#define PCI_CHIP_G33_G 0x29C2 -#define PCI_CHIP_Q35_G 0x29B2 -#define PCI_CHIP_Q33_G 0x29D2 - /** * Return list of supported surface/texture formats. @@ -190,8 +182,6 @@ struct pipe_context *i915_create( struct pipe_winsys *pipe_winsys, struct i915_context *i915; unsigned is_i945 = 0; - /* TODO: Push this down into the pipe driver: - */ switch (pci_id) { case PCI_CHIP_I915_G: case PCI_CHIP_I915_GM: @@ -241,7 +231,10 @@ struct pipe_context *i915_create( struct pipe_winsys *pipe_winsys, i915_init_surface_functions(i915); i915_init_state_functions(i915); i915_init_flush_functions(i915); + i915_init_string_functions(i915); + i915->pci_id = pci_id; + i915->flags.is_i945 = is_i945; if (i915->flags.is_i945) i915->pipe.mipmap_tree_layout = i945_miptree_layout; |