← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to include/pci_ids/pci_id_driver_map.h

  • Committer: Package Import Robot
  • Author(s): Robert Hooker
  • Date: 2012-02-02 12:05:48 UTC
  • mfrom: (1.7.1) (3.3.27 sid)
  • Revision ID: package-import@ubuntu.com-20120202120548-nvkma85jq0h4coix
Tags: 8.0~rc2-0ubuntu4
Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/pci_ids/pci_id_driver_map.h
7
7
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
8
8
#endif
9
9
 
10
 
#if !defined(DRIVER_MAP_DRI2_ONLY) && !defined(DRIVER_MAP_GALLIUM_ONLY)
11
 
static const int i810_chip_ids[] = {
12
 
#define CHIPSET(chip, desc, misc) chip,
13
 
#include "pci_ids/i810_pci_ids.h"
14
 
#undef CHIPSET
15
 
};
16
 
#endif
17
 
 
18
10
static const int i915_chip_ids[] = {
19
11
#define CHIPSET(chip, desc, misc) chip,
20
12
#include "pci_ids/i915_pci_ids.h"
53
45
#undef CHIPSET
54
46
};
55
47
 
 
48
static const int vmwgfx_chip_ids[] = {
 
49
#define CHIPSET(chip, name, family) chip,
 
50
#include "pci_ids/vmwgfx_pci_ids.h"
 
51
#undef CHIPSET
 
52
};
 
53
 
56
54
static const struct {
57
55
   int vendor_id;
58
56
   const char *driver;
59
57
   const int *chip_ids;
60
58
   int num_chips_ids;
61
59
} driver_map[] = {
62
 
#if !defined(DRIVER_MAP_DRI2_ONLY) && !defined(DRIVER_MAP_GALLIUM_ONLY)
63
 
   { 0x8086, "i810", i810_chip_ids, ARRAY_SIZE(i810_chip_ids) },
64
 
#endif
65
60
   { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
66
61
   { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
67
62
#ifndef DRIVER_MAP_GALLIUM_ONLY
71
66
   { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
72
67
   { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
73
68
   { 0x10de, "nouveau", NULL, -1 },
 
69
   { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },
74
70
   { 0x0000, NULL, NULL, 0 },
75
71
};
76
72