diff options
| author | Jakob Bornecrantz <wallbraker@gmail.com> | 2010-05-29 13:29:44 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <wallbraker@gmail.com> | 2010-05-29 13:30:25 +0200 |
| commit | 835f5a65a11ae9ca9f4b36ceb6656c77041ec901 (patch) | |
| tree | 4b81ca16c858b9e61a70f9a05e2b067ce3d72f60 /src/gallium/drivers/i915/i915_screen.c | |
| parent | bbaaf823fa98c5c978aa10d61000485c10275f5a (diff) | |
i915g: Move pci id to winsys struct
Diffstat (limited to 'src/gallium/drivers/i915/i915_screen.c')
| -rw-r--r-- | src/gallium/drivers/i915/i915_screen.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c index 0897a863db..62b064ccf8 100644 --- a/src/gallium/drivers/i915/i915_screen.c +++ b/src/gallium/drivers/i915/i915_screen.c @@ -55,7 +55,7 @@ i915_get_name(struct pipe_screen *screen) static char buffer[128]; const char *chipset; - switch (i915_screen(screen)->pci_id) { + switch (i915_screen(screen)->iws->pci_id) { case PCI_CHIP_I915_G: chipset = "915G"; break; @@ -271,14 +271,14 @@ i915_destroy_screen(struct pipe_screen *screen) * Create a new i915_screen object */ struct pipe_screen * -i915_create_screen(struct i915_winsys *iws, uint pci_id) +i915_screen_create(struct i915_winsys *iws) { struct i915_screen *is = CALLOC_STRUCT(i915_screen); if (!is) return NULL; - switch (pci_id) { + switch (iws->pci_id) { case PCI_CHIP_I915_G: case PCI_CHIP_I915_GM: is->is_i945 = FALSE; @@ -295,12 +295,11 @@ i915_create_screen(struct i915_winsys *iws, uint pci_id) default: debug_printf("%s: unknown pci id 0x%x, cannot create screen\n", - __FUNCTION__, pci_id); + __FUNCTION__, iws->pci_id); FREE(is); return NULL; } - is->pci_id = pci_id; is->iws = iws; is->base.winsys = NULL; |