i915g: Move pci id to winsys struct

4 files changed, 4 insertions, 8 deletions

diff --git a/src/gallium/winsys/i915/drm/i915_drm_api.c b/src/gallium/winsys/i915/drm/i915_drm_api.c
index b95df40e86c..5a6b45e6c9f 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_api.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_api.c
@@ -65,7 +65,7 @@ i915_drm_create_screen(struct drm_api *api, int drmFD)
    i915_drm_winsys_init_fence_functions(idws);
 
    idws->fd = drmFD;
-   idws->id = deviceID;
+   idws->base.pci_id = deviceID;
    idws->max_batch_size = 16 * 4096;
 
    idws->base.destroy = i915_drm_winsys_destroy;
@@ -75,7 +75,7 @@ i915_drm_create_screen(struct drm_api *api, int drmFD)
 
    idws->dump_cmd = debug_get_bool_option("INTEL_DUMP_CMD", FALSE);
 
-   return i915_create_screen(&idws->base, deviceID);
+   return i915_screen_create(&idws->base);
 }
 
 static struct drm_api i915_drm_api =
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.h b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
index 217c4a7eafb..99667bde4ef 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.h
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
@@ -21,8 +21,6 @@ struct i915_drm_winsys
 
    int fd; /**< Drm file discriptor */
 
-   unsigned id;
-
    size_t max_batch_size;
 
    struct {
diff --git a/src/gallium/winsys/i915/sw/i915_sw_winsys.c b/src/gallium/winsys/i915/sw/i915_sw_winsys.c
index a03875be5b3..bb1c107c056 100644
--- a/src/gallium/winsys/i915/sw/i915_sw_winsys.c
+++ b/src/gallium/winsys/i915/sw/i915_sw_winsys.c
@@ -46,11 +46,11 @@ i915_sw_create_screen()
 
    isws->base.destroy = i915_sw_destroy;
 
-   isws->id = deviceID;
+   isws->base.pci_id = deviceID;
    isws->max_batch_size = 16 * 4096;
 
    isws->dump_cmd = debug_get_bool_option("INTEL_DUMP_CMD", FALSE);
 
    /* XXX so this will leak winsys:es */
-   return i915_create_screen(&isws->base, deviceID);
+   return i915_screen_create(&isws->base);
 }
diff --git a/src/gallium/winsys/i915/sw/i915_sw_winsys.h b/src/gallium/winsys/i915/sw/i915_sw_winsys.h
index 92e7c36fd8c..b8aa9ef4ac5 100644
--- a/src/gallium/winsys/i915/sw/i915_sw_winsys.h
+++ b/src/gallium/winsys/i915/sw/i915_sw_winsys.h
@@ -16,8 +16,6 @@ struct i915_sw_winsys
 
    boolean dump_cmd;
 
-   unsigned id;
-
    size_t max_batch_size;
 };