mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 07:57:22 +00:00
wined3d: Move struct wined3d_fence to wined3d_gl.h.
This commit is contained in:
parent
a9cd6112dc
commit
0f1679f379
|
@ -436,4 +436,33 @@ static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo)
|
||||||
return bo ? wined3d_bo_gl(bo)->id : 0;
|
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 */
|
#endif /* __WINE_WINED3D_GL */
|
||||||
|
|
|
@ -1611,8 +1611,6 @@ struct wined3d_bo
|
||||||
bool coherent;
|
bool coherent;
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "wined3d_gl.h"
|
|
||||||
|
|
||||||
struct wined3d_bo_user
|
struct wined3d_bo_user
|
||||||
{
|
{
|
||||||
struct list entry;
|
struct list entry;
|
||||||
|
@ -1845,35 +1843,7 @@ enum fogsource {
|
||||||
FOGSOURCE_COORD,
|
FOGSOURCE_COORD,
|
||||||
};
|
};
|
||||||
|
|
||||||
union wined3d_gl_fence_object
|
#include "wined3d_gl.h"
|
||||||
{
|
|
||||||
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;
|
|
||||||
|
|
||||||
/* Direct3D terminology with little modifications. We do not have an issued
|
/* 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
|
* state because only the driver knows about it, but we have a created state
|
||||||
|
|
Loading…
Reference in a new issue