aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/i915/i915_screen.c9
-rw-r--r--src/gallium/drivers/i915/i915_screen.h1
-rw-r--r--src/gallium/drivers/i915/i915_winsys.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
index 0897a863dbd..62b064ccf81 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;
diff --git a/src/gallium/drivers/i915/i915_screen.h b/src/gallium/drivers/i915/i915_screen.h
index 7f9e02fc0f6..0c4186c68ee 100644
--- a/src/gallium/drivers/i915/i915_screen.h
+++ b/src/gallium/drivers/i915/i915_screen.h
@@ -45,7 +45,6 @@ struct i915_screen
struct i915_winsys *iws;
boolean is_i945;
- uint pci_id;
};
/**
diff --git a/src/gallium/drivers/i915/i915_winsys.h b/src/gallium/drivers/i915/i915_winsys.h
index 8a6f579ad97..3aba19fe6a3 100644
--- a/src/gallium/drivers/i915/i915_winsys.h
+++ b/src/gallium/drivers/i915/i915_winsys.h
@@ -81,6 +81,8 @@ struct i915_winsys_batchbuffer {
struct i915_winsys {
+ unsigned pci_id; /**< PCI ID for the device */
+
/**
* Batchbuffer functions.
*/
@@ -224,7 +226,7 @@ struct i915_winsys {
/**
* Create i915 pipe_screen.
*/
-struct pipe_screen *i915_create_screen(struct i915_winsys *iws, unsigned pci_id);
+struct pipe_screen *i915_screen_create(struct i915_winsys *iws);
#endif