fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gallium/i915: remove some redundant code

Browse source
This commit is contained in:
Brian 2008-02-27 09:46:10 -07:00
parent 31358282d4
commit ef6c82b0c1
3 changed files with 1 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/i915simple/i915_context.h
View file

@ -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);

1
src/gallium/drivers/i915simple/i915_screen.c
View file

@ -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;

55
src/gallium/drivers/i915simple/i915_strings.c
View file

@ -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;
}