The idea is to get rid of the WINED3DFMT_FLAG_DEPTH and
WINED3DFMT_FLAG_STENCIL format flags, and instead introduce a flag similar to
WINED3DFMT_FLAG_RENDERTARGET that indicates whether the format can be used
with WINED3D_BIND_DEPTH_STENCIL.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/wined3d/arb_program_shader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index e6daa88afd5..4724e5c959c 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -7722,7 +7722,7 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine
if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id)
{
- if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))
+ if (dst_format->depth_size || dst_format->stencil_size)
blit_op = WINED3D_BLIT_OP_DEPTH_BLIT;
else
blit_op = WINED3D_BLIT_OP_COLOR_BLIT;
--
2.20.1
This used to protect against accessing the framebuffer state on the no3d
adapter; that's no longer a concern.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/wined3d/device.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 4544e28bc44..2ce3e346ef7 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5493,18 +5493,15 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso
TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type));
- if (device->d3d_initialized)
+ for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i)
{
- for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i)
- {
- if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource)
- ERR("Resource %p is still in use as render target %u.\n", resource, i);
- }
-
- if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource)
- ERR("Resource %p is still in use as depth/stencil buffer.\n", resource);
+ if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource)
+ ERR("Resource %p is still in use as render target %u.\n", resource, i);
}
+ if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource)
+ ERR("Resource %p is still in use as depth/stencil buffer.\n", resource);
+
switch (type)
{
case WINED3D_RTYPE_TEXTURE_1D:
--
2.20.1
When this was introduced in commit 401e99b0c074af848379b2602df37fb1e6c7536b,
it protected against calling the equivalent of context_acquire() on the
equivalent of the no3d adapter. Commit
94d33d3e861d8e01b4edcb940e8ab1aa98359520 removed the call in question.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
dlls/wined3d/context.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 7959199e1f4..3a263e1f6bd 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -36,9 +36,6 @@ void context_resource_released(const struct wined3d_device *device, struct wined
{
unsigned int i;
- if (!device->d3d_initialized)
- return;
-
for (i = 0; i < device->context_count; ++i)
{
struct wined3d_context *context = device->contexts[i];
--
2.20.1
From: Daniel Lehman <dlehman25(a)gmail.com>
Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
---
v2:
- changed condition to be similar with cxx_local_unwind in msvcrt
dlls/vcruntime140_1/except_x86_64.c | 2 ++
1 file changed, 2 insertions(+)