From: Zebediah Figura zfigura@codeweavers.com
The entire rest of state.c is concerned with the GL fixed-function pipeline.
device.c seems the most fitting place for these, since they're associated with the device and stored in the device. device.c is also one of the few files that contains client-side code, which these functions are. --- dlls/wined3d/device.c | 228 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 226 ----------------------------------------- 2 files changed, 228 insertions(+), 226 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4aeade1d2de..1d6a6c78dca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -8,6 +8,8 @@ * Copyright 2006-2008 Henri Verbeet * Copyright 2007 Andrew Riedi * Copyright 2009-2011 Henri Verbeet for CodeWeavers + * Copyright 2016, 2018 Józef Kucia for CodeWeavers + * Copyright 2020 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -270,6 +272,232 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) return refcount; }
+ULONG CDECL wined3d_blend_state_incref(struct wined3d_blend_state *state) +{ + unsigned int refcount = InterlockedIncrement(&state->refcount); + + TRACE("%p increasing refcount to %u.\n", state, refcount); + + return refcount; +} + +static void wined3d_blend_state_destroy_object(void *object) +{ + TRACE("object %p.\n", object); + + heap_free(object); +} + +ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) +{ + unsigned int refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); + struct wined3d_device *device = state->device; + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + state->parent_ops->wined3d_object_destroyed(state->parent); + wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); + wined3d_mutex_unlock(); + } + + return refcount; +} + +void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *state) +{ + TRACE("state %p.\n", state); + + return state->parent; +} + +static bool is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + +HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, + const struct wined3d_blend_state_desc *desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) +{ + struct wined3d_blend_state *object; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, state %p.\n", + device, desc, parent, parent_ops, state); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->refcount = 1; + object->desc = *desc; + object->parent = parent; + object->parent_ops = parent_ops; + object->device = device; + + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + + TRACE("Created blend state %p.\n", object); + *state = object; + + return WINED3D_OK; +} + +ULONG CDECL wined3d_depth_stencil_state_incref(struct wined3d_depth_stencil_state *state) +{ + unsigned int refcount = InterlockedIncrement(&state->refcount); + + TRACE("%p increasing refcount to %u.\n", state, refcount); + + return refcount; +} + +static void wined3d_depth_stencil_state_destroy_object(void *object) +{ + TRACE("object %p.\n", object); + + heap_free(object); +} + +ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_state *state) +{ + unsigned int refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); + struct wined3d_device *device = state->device; + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + state->parent_ops->wined3d_object_destroyed(state->parent); + wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); + wined3d_mutex_unlock(); + } + + return refcount; +} + +void * CDECL wined3d_depth_stencil_state_get_parent(const struct wined3d_depth_stencil_state *state) +{ + TRACE("state %p.\n", state); + + return state->parent; +} + +static bool stencil_op_writes_ds(const struct wined3d_stencil_op_desc *desc) +{ + return desc->fail_op != WINED3D_STENCIL_OP_KEEP + || desc->depth_fail_op != WINED3D_STENCIL_OP_KEEP + || desc->pass_op != WINED3D_STENCIL_OP_KEEP; +} + +static bool depth_stencil_state_desc_writes_ds(const struct wined3d_depth_stencil_state_desc *desc) +{ + if (desc->depth && desc->depth_write) + return true; + + if (desc->stencil && desc->stencil_write_mask) + { + if (stencil_op_writes_ds(&desc->front) || stencil_op_writes_ds(&desc->back)) + return true; + } + + return false; +} + +HRESULT CDECL wined3d_depth_stencil_state_create(struct wined3d_device *device, + const struct wined3d_depth_stencil_state_desc *desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_depth_stencil_state **state) +{ + struct wined3d_depth_stencil_state *object; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, state %p.\n", + device, desc, parent, parent_ops, state); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->refcount = 1; + object->desc = *desc; + object->parent = parent; + object->parent_ops = parent_ops; + object->device = device; + + object->writes_ds = depth_stencil_state_desc_writes_ds(desc); + + TRACE("Created depth/stencil state %p.\n", object); + *state = object; + + return WINED3D_OK; +} + +ULONG CDECL wined3d_rasterizer_state_incref(struct wined3d_rasterizer_state *state) +{ + unsigned int refcount = InterlockedIncrement(&state->refcount); + + TRACE("%p increasing refcount to %u.\n", state, refcount); + + return refcount; +} + +static void wined3d_rasterizer_state_destroy_object(void *object) +{ + TRACE("object %p.\n", object); + + heap_free(object); +} + +ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *state) +{ + unsigned int refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); + struct wined3d_device *device = state->device; + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + state->parent_ops->wined3d_object_destroyed(state->parent); + wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); + wined3d_mutex_unlock(); + } + + return refcount; +} + +void * CDECL wined3d_rasterizer_state_get_parent(const struct wined3d_rasterizer_state *state) +{ + TRACE("rasterizer_state %p.\n", state); + + return state->parent; +} + +HRESULT CDECL wined3d_rasterizer_state_create(struct wined3d_device *device, + const struct wined3d_rasterizer_state_desc *desc, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_rasterizer_state **state) +{ + struct wined3d_rasterizer_state *object; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, state %p.\n", + device, desc, parent, parent_ops, state); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->refcount = 1; + object->desc = *desc; + object->parent = parent; + object->parent_ops = parent_ops; + object->device = device; + + TRACE("Created rasterizer state %p.\n", object); + *state = object; + + return WINED3D_OK; +} + UINT CDECL wined3d_device_get_swapchain_count(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2fb75785daf..4183de6e638 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -32,232 +32,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
-ULONG CDECL wined3d_blend_state_incref(struct wined3d_blend_state *state) -{ - unsigned int refcount = InterlockedIncrement(&state->refcount); - - TRACE("%p increasing refcount to %u.\n", state, refcount); - - return refcount; -} - -static void wined3d_blend_state_destroy_object(void *object) -{ - TRACE("object %p.\n", object); - - heap_free(object); -} - -ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) -{ - unsigned int refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); - struct wined3d_device *device = state->device; - - TRACE("%p decreasing refcount to %u.\n", state, refcount); - - if (!refcount) - { - state->parent_ops->wined3d_object_destroyed(state->parent); - wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); - wined3d_mutex_unlock(); - } - - return refcount; -} - -void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *state) -{ - TRACE("state %p.\n", state); - - return state->parent; -} - -static BOOL is_dual_source(enum wined3d_blend state) -{ - return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; -} - -HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, - const struct wined3d_blend_state_desc *desc, void *parent, - const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) -{ - struct wined3d_blend_state *object; - - TRACE("device %p, desc %p, parent %p, parent_ops %p, state %p.\n", - device, desc, parent, parent_ops, state); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - object->refcount = 1; - object->desc = *desc; - object->parent = parent; - object->parent_ops = parent_ops; - object->device = device; - - object->dual_source = desc->rt[0].enable - && (is_dual_source(desc->rt[0].src) - || is_dual_source(desc->rt[0].dst) - || is_dual_source(desc->rt[0].src_alpha) - || is_dual_source(desc->rt[0].dst_alpha)); - - TRACE("Created blend state %p.\n", object); - *state = object; - - return WINED3D_OK; -} - -ULONG CDECL wined3d_depth_stencil_state_incref(struct wined3d_depth_stencil_state *state) -{ - unsigned int refcount = InterlockedIncrement(&state->refcount); - - TRACE("%p increasing refcount to %u.\n", state, refcount); - - return refcount; -} - -static void wined3d_depth_stencil_state_destroy_object(void *object) -{ - TRACE("object %p.\n", object); - - heap_free(object); -} - -ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_state *state) -{ - unsigned int refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); - struct wined3d_device *device = state->device; - - TRACE("%p decreasing refcount to %u.\n", state, refcount); - - if (!refcount) - { - state->parent_ops->wined3d_object_destroyed(state->parent); - wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); - wined3d_mutex_unlock(); - } - - return refcount; -} - -void * CDECL wined3d_depth_stencil_state_get_parent(const struct wined3d_depth_stencil_state *state) -{ - TRACE("state %p.\n", state); - - return state->parent; -} - -static bool stencil_op_writes_ds(const struct wined3d_stencil_op_desc *desc) -{ - return desc->fail_op != WINED3D_STENCIL_OP_KEEP - || desc->depth_fail_op != WINED3D_STENCIL_OP_KEEP - || desc->pass_op != WINED3D_STENCIL_OP_KEEP; -} - -static bool depth_stencil_state_desc_writes_ds(const struct wined3d_depth_stencil_state_desc *desc) -{ - if (desc->depth && desc->depth_write) - return true; - - if (desc->stencil && desc->stencil_write_mask) - { - if (stencil_op_writes_ds(&desc->front) || stencil_op_writes_ds(&desc->back)) - return true; - } - - return false; -} - -HRESULT CDECL wined3d_depth_stencil_state_create(struct wined3d_device *device, - const struct wined3d_depth_stencil_state_desc *desc, void *parent, - const struct wined3d_parent_ops *parent_ops, struct wined3d_depth_stencil_state **state) -{ - struct wined3d_depth_stencil_state *object; - - TRACE("device %p, desc %p, parent %p, parent_ops %p, state %p.\n", - device, desc, parent, parent_ops, state); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - object->refcount = 1; - object->desc = *desc; - object->parent = parent; - object->parent_ops = parent_ops; - object->device = device; - - object->writes_ds = depth_stencil_state_desc_writes_ds(desc); - - TRACE("Created depth/stencil state %p.\n", object); - *state = object; - - return WINED3D_OK; -} - -ULONG CDECL wined3d_rasterizer_state_incref(struct wined3d_rasterizer_state *state) -{ - unsigned int refcount = InterlockedIncrement(&state->refcount); - - TRACE("%p increasing refcount to %u.\n", state, refcount); - - return refcount; -} - -static void wined3d_rasterizer_state_destroy_object(void *object) -{ - TRACE("object %p.\n", object); - - heap_free(object); -} - -ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *state) -{ - unsigned int refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); - struct wined3d_device *device = state->device; - - TRACE("%p decreasing refcount to %u.\n", state, refcount); - - if (!refcount) - { - state->parent_ops->wined3d_object_destroyed(state->parent); - wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); - wined3d_mutex_unlock(); - } - - return refcount; -} - -void * CDECL wined3d_rasterizer_state_get_parent(const struct wined3d_rasterizer_state *state) -{ - TRACE("rasterizer_state %p.\n", state); - - return state->parent; -} - -HRESULT CDECL wined3d_rasterizer_state_create(struct wined3d_device *device, - const struct wined3d_rasterizer_state_desc *desc, void *parent, - const struct wined3d_parent_ops *parent_ops, struct wined3d_rasterizer_state **state) -{ - struct wined3d_rasterizer_state *object; - - TRACE("device %p, desc %p, parent %p, parent_ops %p, state %p.\n", - device, desc, parent, parent_ops, state); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - object->refcount = 1; - object->desc = *desc; - object->parent = parent; - object->parent_ops = parent_ops; - object->device = device; - - TRACE("Created rasterizer state %p.\n", object); - *state = object; - - return WINED3D_OK; -} - /* Context activation for state handler is done by the caller. */
static void state_undefined(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)