aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie2007-09-25 01:16:14 -0500
committerDave Airlie2007-09-25 01:17:17 -0500
commit03c47f1420bf17a1e0f2b86be500656ae5a4c95b (patch)
tree42c13818e666aaf7fba1f223c73725a6bb063bce /libdrm/xf86mm.h
parentbb5516f4f47d16d5d59797fa170abd50d35377a7 (diff)
downloadlibdrm-03c47f1420bf17a1e0f2b86be500656ae5a4c95b.tar.gz
libdrm-03c47f1420bf17a1e0f2b86be500656ae5a4c95b.tar.xz
libdrm-03c47f1420bf17a1e0f2b86be500656ae5a4c95b.zip
drm: use fence_class as name instead of class
Diffstat (limited to 'libdrm/xf86mm.h')
-rw-r--r--libdrm/xf86mm.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/libdrm/xf86mm.h b/libdrm/xf86mm.h
index d86644ca..cacd13af 100644
--- a/libdrm/xf86mm.h
+++ b/libdrm/xf86mm.h
@@ -96,10 +96,11 @@ typedef struct _drmMMListHead
96typedef struct _drmFence 96typedef struct _drmFence
97{ 97{
98 unsigned handle; 98 unsigned handle;
99 int class; 99 int fence_class;
100 unsigned type; 100 unsigned type;
101 unsigned flags; 101 unsigned flags;
102 unsigned signaled; 102 unsigned signaled;
103 uint32_t sequence;
103 unsigned pad[4]; /* for future expansion */ 104 unsigned pad[4]; /* for future expansion */
104} drmFence; 105} drmFence;
105 106
@@ -148,7 +149,7 @@ typedef struct _drmBOList {
148 * Fence functions. 149 * Fence functions.
149 */ 150 */
150 151
151extern int drmFenceCreate(int fd, unsigned flags, int class, 152extern int drmFenceCreate(int fd, unsigned flags, int fence_class,
152 unsigned type, drmFence *fence); 153 unsigned type, drmFence *fence);
153extern int drmFenceDestroy(int fd, const drmFence *fence); 154extern int drmFenceDestroy(int fd, const drmFence *fence);
154extern int drmFenceReference(int fd, unsigned handle, drmFence *fence); 155extern int drmFenceReference(int fd, unsigned handle, drmFence *fence);
@@ -160,7 +161,7 @@ extern int drmFenceWait(int fd, unsigned flags, drmFence *fence,
160 unsigned flush_type); 161 unsigned flush_type);
161extern int drmFenceEmit(int fd, unsigned flags, drmFence *fence, 162extern int drmFenceEmit(int fd, unsigned flags, drmFence *fence,
162 unsigned emit_type); 163 unsigned emit_type);
163extern int drmFenceBuffers(int fd, unsigned flags, drmFence *fence); 164extern int drmFenceBuffers(int fd, unsigned flags, uint32_t fence_class, drmFence *fence);
164 165
165 166
166/* 167/*
@@ -188,7 +189,7 @@ extern int drmBOUnReference(int fd, drmBO *buf);
188extern int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint, 189extern int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint,
189 void **address); 190 void **address);
190extern int drmBOUnmap(int fd, drmBO *buf); 191extern int drmBOUnmap(int fd, drmBO *buf);
191extern int drmBOValidate(int fd, drmBO *buf, uint64_t flags, 192extern int drmBOValidate(int fd, drmBO *buf, uint32_t fence_class, uint64_t flags,
192 uint64_t mask, unsigned hint); 193 uint64_t mask, unsigned hint);
193 194
194extern int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle); 195extern int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle);