aboutsummaryrefslogtreecommitdiffstats
path: root/radeon
diff options
context:
space:
mode:
authorEmil Velikov2015-04-05 09:51:59 -0500
committerEmil Velikov2015-04-28 05:19:15 -0500
commit42465feb9759ef5a6d79d7e628510cd0a081f913 (patch)
tree723eef6fd35213dd1766df5ac6eaa2e1e7a73042 /radeon
parenta814f933bf9fb25cf7b3cf82c69ba07ed2a686d0 (diff)
downloadexternal-libdrm-42465feb9759ef5a6d79d7e628510cd0a081f913.tar.gz
external-libdrm-42465feb9759ef5a6d79d7e628510cd0a081f913.tar.xz
external-libdrm-42465feb9759ef5a6d79d7e628510cd0a081f913.zip
drm: rename libdrm{,_macros}.h
Provide a more meaningful name, considering what it does. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'radeon')
-rw-r--r--radeon/radeon_bo.c2
-rw-r--r--radeon/radeon_bo_gem.c2
-rw-r--r--radeon/radeon_cs.c2
-rw-r--r--radeon/radeon_cs_gem.c2
-rw-r--r--radeon/radeon_cs_space.c2
-rw-r--r--radeon/radeon_surface.c6
6 files changed, 8 insertions, 8 deletions
diff --git a/radeon/radeon_bo.c b/radeon/radeon_bo.c
index 865e3f7e..02a2d83d 100644
--- a/radeon/radeon_bo.c
+++ b/radeon/radeon_bo.c
@@ -32,7 +32,7 @@
32#ifdef HAVE_CONFIG_H 32#ifdef HAVE_CONFIG_H
33#include <config.h> 33#include <config.h>
34#endif 34#endif
35#include <libdrm.h> 35#include <libdrm_macros.h>
36#include <radeon_bo.h> 36#include <radeon_bo.h>
37#include <radeon_bo_int.h> 37#include <radeon_bo_int.h>
38 38
diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index e78303a7..b48cf540 100644
--- a/radeon/radeon_bo_gem.c
+++ b/radeon/radeon_bo_gem.c
@@ -37,7 +37,7 @@
37#include <stdlib.h> 37#include <stdlib.h>
38#include <string.h> 38#include <string.h>
39#include <errno.h> 39#include <errno.h>
40#include "libdrm.h" 40#include "libdrm_macros.h"
41#include "xf86drm.h" 41#include "xf86drm.h"
42#include "xf86atomic.h" 42#include "xf86atomic.h"
43#include "drm.h" 43#include "drm.h"
diff --git a/radeon/radeon_cs.c b/radeon/radeon_cs.c
index fe5bbcec..142b71f7 100644
--- a/radeon/radeon_cs.c
+++ b/radeon/radeon_cs.c
@@ -1,7 +1,7 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2#include <config.h> 2#include <config.h>
3#endif 3#endif
4#include "libdrm.h" 4#include "libdrm_macros.h"
5#include <stdio.h> 5#include <stdio.h>
6#include "radeon_cs.h" 6#include "radeon_cs.h"
7#include "radeon_cs_int.h" 7#include "radeon_cs_int.h"
diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 81b31846..cff2415d 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -44,7 +44,7 @@
44#include "radeon_cs_gem.h" 44#include "radeon_cs_gem.h"
45#include "radeon_bo_gem.h" 45#include "radeon_bo_gem.h"
46#include "drm.h" 46#include "drm.h"
47#include "libdrm.h" 47#include "libdrm_macros.h"
48#include "xf86drm.h" 48#include "xf86drm.h"
49#include "xf86atomic.h" 49#include "xf86atomic.h"
50#include "radeon_drm.h" 50#include "radeon_drm.h"
diff --git a/radeon/radeon_cs_space.c b/radeon/radeon_cs_space.c
index cca650bf..1a6ea28e 100644
--- a/radeon/radeon_cs_space.c
+++ b/radeon/radeon_cs_space.c
@@ -31,7 +31,7 @@
31#include <assert.h> 31#include <assert.h>
32#include <errno.h> 32#include <errno.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include "libdrm.h" 34#include "libdrm_macros.h"
35#include "radeon_cs.h" 35#include "radeon_cs.h"
36#include "radeon_bo_int.h" 36#include "radeon_bo_int.h"
37#include "radeon_cs_int.h" 37#include "radeon_cs_int.h"
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index bd9ee6d1..fd75b16a 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -37,7 +37,7 @@
37#include <string.h> 37#include <string.h>
38#include <sys/ioctl.h> 38#include <sys/ioctl.h>
39#include "drm.h" 39#include "drm.h"
40#include "libdrm.h" 40#include "libdrm_macros.h"
41#include "xf86drm.h" 41#include "xf86drm.h"
42#include "radeon_drm.h" 42#include "radeon_drm.h"
43#include "radeon_surface.h" 43#include "radeon_surface.h"
@@ -785,7 +785,7 @@ static int eg_surface_init_1d_miptrees(struct radeon_surface_manager *surf_man,
785{ 785{
786 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER; 786 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
787 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags; 787 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
788 /* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */ 788 /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
789 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL]; 789 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
790 struct radeon_surface_level *stencil_level = 790 struct radeon_surface_level *stencil_level =
791 (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp; 791 (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,
807{ 807{
808 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER; 808 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
809 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags; 809 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
810 /* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */ 810 /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
811 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL]; 811 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
812 struct radeon_surface_level *stencil_level = 812 struct radeon_surface_level *stencil_level =
813 (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp; 813 (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp;