summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/drivers/i915simple/i915_context.h1
-rw-r--r--src/gallium/drivers/i915simple/i915_screen.c1
-rw-r--r--src/gallium/drivers/i915simple/i915_strings.c55
3 files changed, 1 insertions, 56 deletions
diff --git a/src/gallium/drivers/i915simple/i915_context.h b/src/gallium/drivers/i915simple/i915_context.h
index 9fb85c122d..6401112f83 100644
--- a/src/gallium/drivers/i915simple/i915_context.h
+++ b/src/gallium/drivers/i915simple/i915_context.h
@@ -317,7 +317,6 @@ void i915_init_surface_functions( struct i915_context *i915 );
void i915_init_state_functions( struct i915_context *i915 );
void i915_init_flush_functions( struct i915_context *i915 );
void i915_init_string_functions( struct i915_context *i915 );
-void i915_init_screen_string_functions(struct pipe_screen *screen);
diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915simple/i915_screen.c
index 5630440a5a..f44ff43c99 100644
--- a/src/gallium/drivers/i915simple/i915_screen.c
+++ b/src/gallium/drivers/i915simple/i915_screen.c
@@ -133,7 +133,6 @@ i915_create_screen(struct pipe_winsys *winsys, uint pci_id)
i915screen->screen.get_name = i915_get_name;
i915screen->screen.get_vendor = i915_get_vendor;
- i915_init_screen_string_functions(&i915screen->screen);
i915_init_screen_texture_functions(&i915screen->screen);
return &i915screen->screen;
diff --git a/src/gallium/drivers/i915simple/i915_strings.c b/src/gallium/drivers/i915simple/i915_strings.c
index ee62bb2e5d..14da3bcd72 100644
--- a/src/gallium/drivers/i915simple/i915_strings.c
+++ b/src/gallium/drivers/i915simple/i915_strings.c
@@ -33,55 +33,9 @@
/** XXX temporary screen/pipe duplication here */
-static const char *i915_get_vendor_screen( struct pipe_screen *screen )
-{
- return "Tungsten Graphics, Inc.";
-}
-
static const char *i915_get_vendor( struct pipe_context *pipe )
{
- return "Tungsten Graphics, Inc.";
-}
-
-
-static const char *i915_get_name_screen( struct pipe_screen *screen )
-{
- struct i915_screen *i915screen = i915_screen(screen);
- static char buffer[128];
- const char *chipset;
-
- switch (i915screen->pci_id) {
- case PCI_CHIP_I915_G:
- chipset = "915G";
- break;
- case PCI_CHIP_I915_GM:
- chipset = "915GM";
- break;
- case PCI_CHIP_I945_G:
- chipset = "945G";
- break;
- case PCI_CHIP_I945_GM:
- chipset = "945GM";
- break;
- case PCI_CHIP_I945_GME:
- chipset = "945GME";
- break;
- case PCI_CHIP_G33_G:
- chipset = "G33";
- break;
- case PCI_CHIP_Q35_G:
- chipset = "Q35";
- break;
- case PCI_CHIP_Q33_G:
- chipset = "Q33";
- break;
- default:
- chipset = "unknown";
- break;
- }
-
- sprintf(buffer, "i915 (chipset: %s)", chipset);
- return buffer;
+ return pipe->screen->get_vendor(pipe->screen);
}
@@ -97,10 +51,3 @@ i915_init_string_functions(struct i915_context *i915)
i915->pipe.get_name = i915_get_name;
i915->pipe.get_vendor = i915_get_vendor;
}
-
-void
-i915_init_screen_string_functions(struct pipe_screen *screen)
-{
- screen->get_name = i915_get_name_screen;
- screen->get_vendor = i915_get_vendor_screen;
-}