Module: wine Branch: master Commit: b52214a2888a7e4b9372dfae55387b70ab8575cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52214a2888a7e4b9372dfae55...
Author: Stefan Dösinger stefan@codeweavers.com Date: Tue Aug 26 10:35:47 2014 +0200
wined3d: Move volume flags to volume.c.
---
dlls/wined3d/volume.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 4618b7b..f98ea68 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,6 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
+#define WINED3D_VFLAG_ALLOCATED 0x00000001 +#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 +#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000004 + static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) { if (volume->resource.heap_memory) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77f7b13..e99a7b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2170,10 +2170,6 @@ void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
-#define WINED3D_VFLAG_ALLOCATED 0x00000001 -#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 -#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000004 - #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 #define WINED3D_LOCATION_USER_MEMORY 0x00000004