drm: rename libdrm{,_macros}.h

Provide a more meaningful name, considering what it does.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
main
Emil Velikov 2015-04-05 15:51:59 +01:00
parent a814f933bf
commit 42465feb97
33 changed files with 34 additions and 34 deletions

View File

@ -7,7 +7,7 @@ LIBDRM_FILES := \
xf86drmSL.c \ xf86drmSL.c \
xf86drmMode.c \ xf86drmMode.c \
xf86atomic.h \ xf86atomic.h \
libdrm.h \ libdrm_macros.h \
libdrm_lists.h libdrm_lists.h
LIBDRM_H_FILES := \ LIBDRM_H_FILES := \

View File

@ -38,7 +38,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "exynos_drm.h" #include "exynos_drm.h"
#include "exynos_drmif.h" #include "exynos_drmif.h"

View File

@ -24,7 +24,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "exynos_drm.h" #include "exynos_drm.h"
#include "fimg2d_reg.h" #include "fimg2d_reg.h"
#include "exynos_fimg2d.h" #include "exynos_fimg2d.h"

View File

@ -44,7 +44,7 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "xf86drm.h" #include "xf86drm.h"
#include "xf86atomic.h" #include "xf86atomic.h"

View File

@ -37,7 +37,7 @@
#include <drm.h> #include <drm.h>
#include <i915_drm.h> #include <i915_drm.h>
#include <pciaccess.h> #include <pciaccess.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "intel_bufmgr.h" #include "intel_bufmgr.h"
#include "intel_bufmgr_priv.h" #include "intel_bufmgr_priv.h"
#include "xf86drm.h" #include "xf86drm.h"

View File

@ -49,7 +49,7 @@
#include "drm.h" #include "drm.h"
#include "i915_drm.h" #include "i915_drm.h"
#include "mm.h" #include "mm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "libdrm_lists.h" #include "libdrm_lists.h"
/* Support gcc's __FUNCTION__ for people using other compilers */ /* Support gcc's __FUNCTION__ for people using other compilers */

View File

@ -56,7 +56,7 @@
#ifndef ETIME #ifndef ETIME
#define ETIME ETIMEDOUT #define ETIME ETIMEDOUT
#endif #endif
#include "libdrm.h" #include "libdrm_macros.h"
#include "libdrm_lists.h" #include "libdrm_lists.h"
#include "intel_bufmgr.h" #include "intel_bufmgr.h"
#include "intel_bufmgr_priv.h" #include "intel_bufmgr_priv.h"

View File

@ -33,7 +33,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "xf86drm.h" #include "xf86drm.h"
#include "intel_chipset.h" #include "intel_chipset.h"
#include "intel_bufmgr.h" #include "intel_bufmgr.h"

View File

@ -30,7 +30,7 @@
#include <assert.h> #include <assert.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "mm.h" #include "mm.h"
drm_private void mmDumpMemInfo(const struct mem_block *heap) drm_private void mmDumpMemInfo(const struct mem_block *heap)

View File

@ -33,7 +33,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "libdrm.h" #include "libdrm_macros.h"
struct mem_block { struct mem_block {
struct mem_block *next, *prev; struct mem_block *next, *prev;

View File

@ -34,7 +34,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <err.h> #include <err.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "intel_bufmgr.h" #include "intel_bufmgr.h"
#include "intel_chipset.h" #include "intel_chipset.h"

View File

@ -34,7 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "internal.h" #include "internal.h"
int kms_create(int fd, struct kms_driver **out) int kms_create(int fd, struct kms_driver **out)

View File

@ -38,7 +38,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
struct dumb_bo struct dumb_bo
{ {

View File

@ -25,7 +25,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "exynos_drm.h" #include "exynos_drm.h"
struct exynos_bo struct exynos_bo

View File

@ -38,7 +38,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "i915_drm.h" #include "i915_drm.h"

View File

@ -33,7 +33,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "libdrm.h" #include "libdrm_macros.h"
#include "libkms.h" #include "libkms.h"
struct kms_driver struct kms_driver

View File

@ -41,7 +41,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "internal.h" #include "internal.h"
#define PATH_SIZE 512 #define PATH_SIZE 512

View File

@ -38,7 +38,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "nouveau_drm.h" #include "nouveau_drm.h"

View File

@ -38,7 +38,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "radeon_drm.h" #include "radeon_drm.h"

View File

@ -36,7 +36,7 @@
#include "internal.h" #include "internal.h"
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "vmwgfx_drm.h" #include "vmwgfx_drm.h"
struct vmwgfx_bo struct vmwgfx_bo

View File

@ -37,7 +37,7 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86atomic.h> #include <xf86atomic.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "libdrm_lists.h" #include "libdrm_lists.h"
#include "nouveau_drm.h" #include "nouveau_drm.h"

View File

@ -1,7 +1,7 @@
#ifndef __NOUVEAU_LIBDRM_PRIVATE_H__ #ifndef __NOUVEAU_LIBDRM_PRIVATE_H__
#define __NOUVEAU_LIBDRM_PRIVATE_H__ #define __NOUVEAU_LIBDRM_PRIVATE_H__
#include <libdrm.h> #include <libdrm_macros.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86atomic.h> #include <xf86atomic.h>
#include <pthread.h> #include <pthread.h>

View File

@ -39,7 +39,7 @@
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include <libdrm.h> #include <libdrm_macros.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86atomic.h> #include <xf86atomic.h>

View File

@ -32,7 +32,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <libdrm.h> #include <libdrm_macros.h>
#include <radeon_bo.h> #include <radeon_bo.h>
#include <radeon_bo_int.h> #include <radeon_bo_int.h>

View File

@ -37,7 +37,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "xf86drm.h" #include "xf86drm.h"
#include "xf86atomic.h" #include "xf86atomic.h"
#include "drm.h" #include "drm.h"

View File

@ -1,7 +1,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include "libdrm.h" #include "libdrm_macros.h"
#include <stdio.h> #include <stdio.h>
#include "radeon_cs.h" #include "radeon_cs.h"
#include "radeon_cs_int.h" #include "radeon_cs_int.h"

View File

@ -44,7 +44,7 @@
#include "radeon_cs_gem.h" #include "radeon_cs_gem.h"
#include "radeon_bo_gem.h" #include "radeon_bo_gem.h"
#include "drm.h" #include "drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "xf86drm.h" #include "xf86drm.h"
#include "xf86atomic.h" #include "xf86atomic.h"
#include "radeon_drm.h" #include "radeon_drm.h"

View File

@ -31,7 +31,7 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include "libdrm.h" #include "libdrm_macros.h"
#include "radeon_cs.h" #include "radeon_cs.h"
#include "radeon_bo_int.h" #include "radeon_bo_int.h"
#include "radeon_cs_int.h" #include "radeon_cs_int.h"

View File

@ -37,7 +37,7 @@
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "drm.h" #include "drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "xf86drm.h" #include "xf86drm.h"
#include "radeon_drm.h" #include "radeon_drm.h"
#include "radeon_surface.h" #include "radeon_surface.h"
@ -785,7 +785,7 @@ static int eg_surface_init_1d_miptrees(struct radeon_surface_manager *surf_man,
{ {
unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER; unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags; int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
/* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */ /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL]; struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
struct radeon_surface_level *stencil_level = struct radeon_surface_level *stencil_level =
(surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp; (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp;
@ -807,7 +807,7 @@ static int eg_surface_init_2d_miptrees(struct radeon_surface_manager *surf_man,
{ {
unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER; unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags; int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
/* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */ /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL]; struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
struct radeon_surface_level *stencil_level = struct radeon_surface_level *stencil_level =
(surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp; (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp;

View File

@ -28,7 +28,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <libdrm.h> #include <libdrm_macros.h>
#include <xf86atomic.h> #include <xf86atomic.h>
#include "tegra.h" #include "tegra.h"

View File

@ -39,7 +39,7 @@
#include "drm.h" #include "drm.h"
#include "drm_fourcc.h" #include "drm_fourcc.h"
#include "libdrm.h" #include "libdrm_macros.h"
#include "xf86drm.h" #include "xf86drm.h"
#include "buffers.h" #include "buffers.h"

View File

@ -62,7 +62,7 @@
#endif #endif
#include "xf86drm.h" #include "xf86drm.h"
#include "libdrm.h" #include "libdrm_macros.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#define DRM_MAJOR 145 #define DRM_MAJOR 145