diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-20 15:01:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-25 13:18:01 +0100 |
| commit | 5c663ce8442bd3b69c96e29061c57cc565fca91d (patch) | |
| tree | 56f02802179a75e8d94a83c47ebeff9e48bb1168 /src/xvmc | |
| parent | 797d173a9af12055ba2609293182b616dd673ef4 (diff) | |
Rename common infrastructure to the intel namespace.
After splitting out the i810 driver into its own legacy directory, we
can identify the common routines not as i830 but as intel. This
clarifies the code which *is* i830 specific.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/xvmc')
| -rw-r--r-- | src/xvmc/i915_xvmc.h | 2 | ||||
| -rw-r--r-- | src/xvmc/i965_xvmc.c | 2 | ||||
| -rw-r--r-- | src/xvmc/intel_xvmc.h | 2 | ||||
| -rw-r--r-- | src/xvmc/xvmc_vld.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/xvmc/i915_xvmc.h b/src/xvmc/i915_xvmc.h index 96dd3ce8..852e3eab 100644 --- a/src/xvmc/i915_xvmc.h +++ b/src/xvmc/i915_xvmc.h @@ -29,7 +29,7 @@ #define _I915XVMC_H #include "intel_xvmc.h" -#include "i830_hwmc.h" +#include "intel_hwmc.h" #define I915_SUBPIC_PALETTE_SIZE 16 #define MAX_SUBCONTEXT_LEN 1024 diff --git a/src/xvmc/i965_xvmc.c b/src/xvmc/i965_xvmc.c index 76cd289b..210cf731 100644 --- a/src/xvmc/i965_xvmc.c +++ b/src/xvmc/i965_xvmc.c @@ -30,7 +30,7 @@ #include "brw_defines.h" #include "brw_structs.h" #include "intel_batchbuffer.h" -#include "i830_hwmc.h" +#include "intel_hwmc.h" #define BATCH_STRUCT(x) intelBatchbufferData(&x, sizeof(x), 0) #define URB_SIZE 256 /* XXX */ diff --git a/src/xvmc/intel_xvmc.h b/src/xvmc/intel_xvmc.h index d67065ed..7fdfd062 100644 --- a/src/xvmc/intel_xvmc.h +++ b/src/xvmc/intel_xvmc.h @@ -41,7 +41,7 @@ #include <stdint.h> #include <xf86drm.h> -#include "i830_hwmc.h" +#include "intel_hwmc.h" #include <X11/X.h> #include <X11/Xlibint.h> #include <X11/Xutil.h> diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c index 0eb2e2f9..addc7c98 100644 --- a/src/xvmc/xvmc_vld.c +++ b/src/xvmc/xvmc_vld.c @@ -24,7 +24,7 @@ * Zou Nan hai <nanhai.zou@intel.com> */ #include "intel_xvmc.h" -#include "i830_hwmc.h" +#include "intel_hwmc.h" #include "i830_reg.h" #include "i965_reg.h" #include "brw_defines.h" |