gallium/i915: remove some redundant code

diff --git a/src/gallium/drivers/i915simple/i915_context.h b/src/gallium/drivers/i915simple/i915_context.h
index 9fb85c122d1dd2b77ebaed448c3a705503b4ba15..6401112f83515a7286ae868c99c3d8e2fbb7961d 100644 (file)
--- 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 5630440a5ac385df47129e97a33159bae00b4ece..f44ff43c99414354c651c5b6803f72c959ce3d35 100644 (file)
--- 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 ee62bb2e5de56d3e3525e4625fe0c1446c0f63e5..14da3bcd7268e6e066ab0e2b66e0ee782a1326c7 100644 (file)
--- 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;
-}