summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-01-20 01:49:34 -0800
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-02-01 23:30:24 -0800
commit502ddfcd57ff7ed1f2dac9171f51c45893ea3d92 (patch)
tree794ab4d3c88643efa517721088e26ae078ab79b3 /src/gallium/drivers/r300
parent43f20357c8db2c90ae1f8360dbc2c71762a0478e (diff)
r300: Add path for pci_id in winsys.
Needs to be hooked up to the getparam from the kernel.
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r--src/gallium/drivers/r300/r300_context.c2
-rw-r--r--src/gallium/drivers/r300/r300_context.h1
-rw-r--r--src/gallium/drivers/r300/r300_winsys.h3
3 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 798d6bdc6f..467594ec9b 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -43,7 +43,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
r300->winsys = r300_winsys;
r300->context.winsys = winsys;
- r300->context.screen = r300_create_screen(winsys, 0x0);
+ r300->context.screen = r300_create_screen(winsys, r300_winsys->pci_id);
r300->context.destroy = r300_destroy_context;
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index be6214b7ae..f4d801480a 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -28,6 +28,7 @@
#include "util/u_memory.h"
#include "r300_screen.h"
+#include "r300_winsys.h"
struct r300_blend_state {
uint32_t blend_control; /* R300_RB3D_CBLEND: 0x4e04 */
diff --git a/src/gallium/drivers/r300/r300_winsys.h b/src/gallium/drivers/r300/r300_winsys.h
index 7711dc792d..319152c853 100644
--- a/src/gallium/drivers/r300/r300_winsys.h
+++ b/src/gallium/drivers/r300/r300_winsys.h
@@ -38,6 +38,9 @@ struct radeon_cs;
struct r300_winsys {
+ /* PCI ID */
+ uint32_t pci_id;
+
/* CS object. This is very much like Intel's batchbuffer.
* Fill it full of dwords and relocs and then submit.
* Repeat as needed. */