[PATCH 3/5] wined3d: Move struct wined3d_fence to wined3d_gl.h.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/wined3d_gl.h      | 29 +++++++++++++++++++++++++++++
 dlls/wined3d/wined3d_private.h | 32 +-------------------------------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 390e3164ea5..8bc3e9eb6a3 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -436,4 +436,33 @@ static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo)
     return bo ? wined3d_bo_gl(bo)->id : 0;
 }

+union wined3d_gl_fence_object
+{
+    GLuint id;
+    GLsync sync;
+};
+
+enum wined3d_fence_result
+{
+    WINED3D_FENCE_OK,
+    WINED3D_FENCE_WAITING,
+    WINED3D_FENCE_NOT_STARTED,
+    WINED3D_FENCE_WRONG_THREAD,
+    WINED3D_FENCE_ERROR,
+};
+
+struct wined3d_fence
+{
+    struct list entry;
+    union wined3d_gl_fence_object object;
+    struct wined3d_context_gl *context_gl;
+};
+
+HRESULT wined3d_fence_create(struct wined3d_device *device, struct wined3d_fence **fence);
+void wined3d_fence_destroy(struct wined3d_fence *fence);
+void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device);
+enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, struct wined3d_device *device);
+enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence,
+        struct wined3d_device *device, uint32_t flags);
+
 #endif /* __WINE_WINED3D_GL */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 1a3bccb569b..7596db2a2a5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1611,8 +1611,6 @@ struct wined3d_bo
     bool coherent;
 };

-#include "wined3d_gl.h"
-
 struct wined3d_bo_user
 {
     struct list entry;
@@ -1845,35 +1843,7 @@ enum fogsource {
     FOGSOURCE_COORD,
 };

-union wined3d_gl_fence_object
-{
-    GLuint id;
-    GLsync sync;
-};
-
-enum wined3d_fence_result
-{
-    WINED3D_FENCE_OK,
-    WINED3D_FENCE_WAITING,
-    WINED3D_FENCE_NOT_STARTED,
-    WINED3D_FENCE_WRONG_THREAD,
-    WINED3D_FENCE_ERROR,
-};
-
-struct wined3d_fence
-{
-    struct list entry;
-    union wined3d_gl_fence_object object;
-    struct wined3d_context_gl *context_gl;
-};
-
-HRESULT wined3d_fence_create(struct wined3d_device *device, struct wined3d_fence **fence) DECLSPEC_HIDDEN;
-void wined3d_fence_destroy(struct wined3d_fence *fence) DECLSPEC_HIDDEN;
-void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) DECLSPEC_HIDDEN;
-enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence,
-        struct wined3d_device *device) DECLSPEC_HIDDEN;
-enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence,
-        struct wined3d_device *device, uint32_t flags) DECLSPEC_HIDDEN;
+#include "wined3d_gl.h"

/* Direct3D terminology with little modifications. We do not have an issued
  * state because only the driver knows about it, but we have a created state