[PATCH 1/5] wined3d: Move the buffer flags to buffer.c.
Henri Verbeet
hverbeet at codeweavers.com
Fri Aug 30 01:42:44 CDT 2013
---
dlls/wined3d/buffer.c | 8 ++++++++
dlls/wined3d/wined3d_private.h | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index ba54e93..921111c 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -29,6 +29,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
+#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */
+#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */
+#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */
+#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */
+#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */
+#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */
+#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */
+
#define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */
#define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */
#define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 17c0a0a..05a6250 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2491,14 +2491,6 @@ struct wined3d_map_range
UINT size;
};
-#define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */
-#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */
-#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */
-#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */
-#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */
-#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */
-#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */
-
struct wined3d_buffer
{
struct wined3d_resource resource;
--
1.8.1.5
More information about the wine-patches
mailing list