wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Józef Kucia : wined3d: Replace presentation interval flags with enum.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: e318f8c825719ceb68bcc0b83142256bec3b8346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e318f8c825719ceb68bcc0b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:48 2018 +0100 wined3d: Replace presentation interval flags with enum. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d9/device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/dxgi/factory.c | 2 +- dlls/wined3d/swapchain.c | 27 +++------------------------ include/wine/wined3d.h | 21 ++++++++++++--------- 5 files changed, 108 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e318f8c825719ceb68bc…

1 0

Józef Kucia : wined3d: Remove PresentationIntervals from WINED3DCAPS.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 0554d1761184906c7fdaf3c8764fcaaddbc49e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0554d1761184906c7fdaf3c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 12 13:53:47 2018 +0100 wined3d: Remove PresentationIntervals from WINED3DCAPS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/directx.c | 3 --- include/wine/wined3d.h | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9f92d3c..63a99b4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -294,7 +294,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; - caps->PresentationIntervals = wined3d_caps->PresentationIntervals; + caps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE | D3DPRESENT_INTERVAL_ONE; caps->CursorCaps = wined3d_caps->CursorCaps; caps->DevCaps = wined3d_caps->DevCaps; caps->PrimitiveMiscCaps = wined3d_caps->PrimitiveMiscCaps; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aac0961..f3c24c9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -330,7 +330,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; - caps->PresentationIntervals = wined3d_caps->PresentationIntervals; + caps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE | D3DPRESENT_INTERVAL_ONE; caps->CursorCaps = wined3d_caps->CursorCaps; caps->DevCaps = wined3d_caps->DevCaps; caps->PrimitiveMiscCaps = wined3d_caps->PrimitiveMiscCaps; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd738f2..f18c4ac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5643,9 +5643,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DCAPS3_COPY_TO_VIDMEM | WINED3DCAPS3_COPY_TO_SYSTEMMEM; - caps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE | - WINED3DPRESENT_INTERVAL_ONE; - caps->CursorCaps = WINED3DCURSORCAPS_COLOR | WINED3DCURSORCAPS_LOWRES; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b6a2ec3..f0c8ae3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1863,7 +1863,6 @@ typedef struct _WINED3DCAPS DWORD Caps; DWORD Caps2; DWORD Caps3; - DWORD PresentationIntervals; DWORD CursorCaps; DWORD DevCaps;

1 0

Matteo Bruni : wined3d: Pass a wined3d_context structure to texture2d_depth_blt_fbo().
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 23b4b3cd4ca20aa2a5da4d8ed510f886ba6d1e95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b4b3cd4ca20aa2a5da4d8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 12 12:54:51 2018 +0330 wined3d: Pass a wined3d_context structure to texture2d_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58f39d0..2c55b17 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -259,13 +259,12 @@ static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsign return TRUE; } -static void texture2d_depth_blt_fbo(const struct wined3d_device *device, +static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + const struct wined3d_gl_info *gl_info = context->gl_info; DWORD src_mask, dst_mask; GLbitfield gl_mask; @@ -298,14 +297,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, if (src_mask & WINED3DFMT_FLAG_STENCIL) gl_mask |= GL_STENCIL_BUFFER_BIT; - context = context_acquire(device, NULL, 0); - if (!context->valid) - { - context_release(context); - WARN("Invalid context, skipping blit.\n"); - return; - } - /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); @@ -314,8 +305,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); - gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, 0, &src_texture->resource, src_sub_resource_idx, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); @@ -351,8 +340,6 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, if (wined3d_settings.strict_draw_ordering) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); } static BOOL is_multisample_location(const struct wined3d_texture *texture, DWORD location) @@ -2422,7 +2409,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_DEPTH_BLIT) { TRACE("Depth/stencil blit.\n"); - texture2d_depth_blt_fbo(device, src_surface->container, surface_get_sub_resource_idx(src_surface), + texture2d_depth_blt_fbo(device, context, src_surface->container, surface_get_sub_resource_idx(src_surface), src_location, src_rect, dst_surface->container, surface_get_sub_resource_idx(dst_surface), dst_location, dst_rect); return dst_location;

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to context_apply_fbo_state_blit().
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 9a00e032b7a64d698b4579491488db9a6196ebd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a00e032b7a64d698b457949… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 12:54:49 2018 +0330 wined3d: Pass a texture and sub-resource index to context_apply_fbo_state_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/context.c | 20 ++++++++++---------- dlls/wined3d/surface.c | 17 +++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 23f4d04..0a9b078 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7865,7 +7865,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl TRACE("Destination surface %p is offscreen.\n", dst_surface); buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + &dst_texture->resource, surface_get_sub_resource_idx(dst_surface), NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9558fed..3ba8068 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -774,22 +774,23 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ /* Context activation is done by the caller. */ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, - struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) + struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) { struct wined3d_rendertarget_info ds_info = {{0}}; memset(context->blit_targets, 0, sizeof(context->blit_targets)); - if (render_target) + if (rt) { - context->blit_targets[0].resource = &render_target->container->resource; - context->blit_targets[0].sub_resource_idx = surface_get_sub_resource_idx(render_target); + context->blit_targets[0].resource = rt; + context->blit_targets[0].sub_resource_idx = rt_sub_resource_idx; context->blit_targets[0].layer_count = 1; } - if (depth_stencil) + if (ds) { - ds_info.resource = &depth_stencil->container->resource; - ds_info.sub_resource_idx = surface_get_sub_resource_idx(depth_stencil); + ds_info.resource = ds; + ds_info.sub_resource_idx = ds_sub_resource_idx; ds_info.layer_count = 1; } @@ -2954,7 +2955,6 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *conte void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { struct wined3d_texture *rt = context->current_rt.texture; - struct wined3d_surface *surface; DWORD rt_mask, *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2963,8 +2963,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine { wined3d_texture_load(rt, context, FALSE); - surface = rt->sub_resources[context->current_rt.sub_resource_idx].u.surface; - context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, surface, NULL, rt->resource.draw_binding); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, &rt->resource, + context->current_rt.sub_resource_idx, NULL, 0, rt->resource.draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) rt_mask = 1; else diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b830447..58f39d0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -316,12 +316,12 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, - src_texture->sub_resources[src_sub_resource_idx].u.surface, src_location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, 0, + &src_texture->resource, src_sub_resource_idx, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, - dst_texture->sub_resources[dst_sub_resource_idx].u.surface, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, 0, + &dst_texture->resource, dst_sub_resource_idx, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -464,7 +464,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 } context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, - src_texture->sub_resources[src_sub_resource_idx].u.surface, NULL, src_location); + &src_texture->resource, src_sub_resource_idx, NULL, 0, src_location); gl_info->gl_ops.gl.p_glReadBuffer(buffer); checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); @@ -484,7 +484,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 } context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, - dst_texture->sub_resources[dst_sub_resource_idx].u.surface, NULL, dst_location); + &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -1376,7 +1376,7 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns if (src_location != texture->resource.draw_binding) { context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, - texture->sub_resources[sub_resource_idx].u.surface, NULL, src_location); + &texture->resource, sub_resource_idx, NULL, 0, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } @@ -2807,7 +2807,8 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit TRACE("Destination surface %p is offscreen.\n", dst_surface); buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + dst_resource, surface_get_sub_resource_idx(dst_surface), NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e961ddf..1e9806a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2135,7 +2135,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, - struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass the depth/ stencil view as wined3d_rendertarget_info structure to context_apply_fbo_state ().
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 72de747c6a6cdd0be84a24932a4452f453861dbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=72de747c6a6cdd0be84a2493… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 12:54:48 2018 +0330 wined3d: Pass the depth/stencil view as wined3d_rendertarget_info structure to context_apply_fbo_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 58 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6c635f5..9558fed 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -743,8 +743,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Context activation is done by the caller. */ static void context_apply_fbo_state(struct wined3d_context *context, GLenum target, - struct wined3d_rendertarget_info *render_targets, struct wined3d_surface *depth_stencil, - DWORD color_location, DWORD ds_location) + const struct wined3d_rendertarget_info *render_targets, + const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { struct fbo_entry *entry, *entry2; @@ -766,16 +766,8 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } else { - struct wined3d_rendertarget_info ds = {{0}}; - - if (depth_stencil) - { - ds.resource = &depth_stencil->container->resource; - ds.sub_resource_idx = surface_get_sub_resource_idx(depth_stencil); - ds.layer_count = 1; - } context->current_fbo = context_find_fbo_entry(context, target, - render_targets, &ds, color_location, ds_location); + render_targets, depth_stencil, color_location, ds_location); context_apply_fbo_entry(context, target, context->current_fbo); } } @@ -784,6 +776,8 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) { + struct wined3d_rendertarget_info ds_info = {{0}}; + memset(context->blit_targets, 0, sizeof(context->blit_targets)); if (render_target) { @@ -791,7 +785,15 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target context->blit_targets[0].sub_resource_idx = surface_get_sub_resource_idx(render_target); context->blit_targets[0].layer_count = 1; } - context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location, location); + + if (depth_stencil) + { + ds_info.resource = &depth_stencil->container->resource; + ds_info.sub_resource_idx = surface_get_sub_resource_idx(depth_stencil); + ds_info.layer_count = 1; + } + + context_apply_fbo_state(context, target, context->blit_targets, &ds_info, location, location); } /* Context activation is done by the caller. */ @@ -3035,6 +3037,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + struct wined3d_rendertarget_info ds_info = {{0}}; + context_validate_onscreen_formats(context, dsv); if (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource)) @@ -3052,14 +3056,22 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) rt_mask |= (1u << i); } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, - wined3d_rendertarget_view_get_surface(dsv), + + if (dsv) + { + ds_info.gl_view = dsv->gl_view; + ds_info.resource = dsv->resource; + ds_info.sub_resource_idx = dsv->sub_resource_idx; + ds_info.layer_count = dsv->layer_count; + } + + context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, rt_count ? rts[0]->resource->draw_binding : 0, dsv ? dsv->resource->draw_binding : 0); } else { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); } @@ -3164,9 +3176,11 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + struct wined3d_rendertarget_info ds_info = {{0}}; + if (!context->render_offscreen) { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); } else @@ -3187,8 +3201,16 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (!color_location) color_location = fb->render_targets[i]->resource->draw_binding; } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, - wined3d_rendertarget_view_get_surface(fb->depth_stencil), + + if (fb->depth_stencil) + { + ds_info.gl_view = fb->depth_stencil->gl_view; + ds_info.resource = fb->depth_stencil->resource; + ds_info.sub_resource_idx = fb->depth_stencil->sub_resource_idx; + ds_info.layer_count = fb->depth_stencil->layer_count; + } + + context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, color_location, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } }

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to context_restore().
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 21257be2a9350a664f21daf1a01ccc87c97bb5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21257be2a9350a664f21daf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 12:54:47 2018 +0330 wined3d: Pass a texture and sub-resource index to context_restore(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 +++----- dlls/wined3d/surface.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 60bf52b..6c635f5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1585,14 +1585,12 @@ void context_release(struct wined3d_context *context) /* This is used when a context for render target A is active, but a separate context is * needed to access the WGL framebuffer for render target B. Re-acquire a context for rt * A to avoid breaking caller code. */ -void context_restore(struct wined3d_context *context, struct wined3d_surface *restore) +void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - if (context->current_rt.texture != restore->container - || context->current_rt.sub_resource_idx != surface_get_sub_resource_idx(restore)) + if (context->current_rt.texture != texture || context->current_rt.sub_resource_idx != sub_resource_idx) { context_release(context); - context = context_acquire(restore->container->resource.device, - restore->container, surface_get_sub_resource_idx(restore)); + context = context_acquire(texture->resource.device, texture, sub_resource_idx); } context_release(context); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e98541c..b830447 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -507,7 +507,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 gl_info->gl_ops.gl.p_glFlush(); if (restore_texture) - context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); + context_restore(context, restore_texture, restore_idx); } static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, @@ -1471,7 +1471,7 @@ error: } if (restore_texture) - context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); + context_restore(context, restore_texture, restore_idx); } /* Read the framebuffer contents into a texture. Note that this function @@ -1518,7 +1518,7 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, checkGLcall("glCopyTexSubImage2D"); if (restore_texture) - context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); + context_restore(context, restore_texture, restore_idx); } /* Does a direct frame buffer -> texture copy. Stretching is done with single @@ -2106,9 +2106,10 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) { - struct wined3d_surface *restore_rt = NULL; + struct wined3d_texture *restore_texture; struct wined3d_surface *surface; struct wined3d_device *device; + unsigned int restore_idx; unsigned int level; RECT r; @@ -2129,11 +2130,12 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, device = texture->resource.device; surface = texture->sub_resources[sub_resource_idx].u.surface; - restore_rt = context_get_rt_surface(context); - if (restore_rt != surface) + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) context = context_acquire(device, texture, sub_resource_idx); else - restore_rt = NULL; + restore_texture = NULL; level = sub_resource_idx % texture->level_count; SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), @@ -2144,8 +2146,8 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, surface, WINED3D_LOCATION_DRAWABLE, &r, NULL, WINED3D_TEXF_POINT); - if (restore_rt) - context_restore(context, restore_rt); + if (restore_texture) + context_restore(context, restore_texture, restore_idx); return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 753681f..e961ddf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2170,7 +2170,8 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; -void context_restore(struct wined3d_context *context, struct wined3d_surface *restore) DECLSPEC_HIDDEN; +void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, + unsigned int sub_resource_idx) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Recognise AMD RC410 and RV380.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 7cc82c1ea6a28253b83e0cc0d57e8e4636f75c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cc82c1ea6a28253b83e0cc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 12 12:54:46 2018 +0330 wined3d: Recognise AMD RC410 and RV380. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 46fbaba..dd738f2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2212,9 +2212,7 @@ cards_intel[] = {"830M", CARD_INTEL_830M}, }, /* 20101109 - These are never returned by current Gallium radeon - * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. - * - * These are returned but not handled: RC410, RV380. */ + * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { /* Polaris 10/11 */ @@ -2292,10 +2290,12 @@ cards_amd_mesa[] = {"RS482", CARD_AMD_RADEON_XPRESS_200M}, {"RS480", CARD_AMD_RADEON_XPRESS_200M}, {"RS400", CARD_AMD_RADEON_XPRESS_200M}, + {"RC410", CARD_AMD_RADEON_XPRESS_200M}, /* R300 */ {"R360", CARD_AMD_RADEON_9500}, {"R350", CARD_AMD_RADEON_9500}, {"R300", CARD_AMD_RADEON_9500}, + {"RV380", CARD_AMD_RADEON_9500}, {"RV370", CARD_AMD_RADEON_9500}, {"RV360", CARD_AMD_RADEON_9500}, {"RV351", CARD_AMD_RADEON_9500},

1 0

Kai Krakow : wined3d: Recognize GTX 1050 Ti card with NVIDIA driver.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 4b08602d57254cada14eb10b72b3bc0fe43fad03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b08602d57254cada14eb10b… Author: Kai Krakow <kai(a)kaishome.de> Date: Sun Mar 11 09:41:03 2018 +0100 wined3d: Recognize GTX 1050 Ti card with NVIDIA driver. Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8bda9c4..46fbaba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1395,6 +1395,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, @@ -1893,6 +1894,7 @@ cards_nvidia_binary[] = {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ + {"GTX 1050 Ti", CARD_NVIDIA_GEFORCE_GTX1050TI}, /* GeForce 1000 - midend */ {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3d669a..753681f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2395,6 +2395,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, + CARD_NVIDIA_GEFORCE_GTX1050TI = 0x1c82, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80,

1 0

Matteo Bruni : d3d8: Filter device caps.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 832157880b1805a4bc0507450bd9c2600ee09be8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832157880b1805a4bc050745… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:44 2018 -0600 d3d8: Filter device caps. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5daf6f4..9f92d3c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -343,6 +343,57 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) caps->PixelShaderVersion = wined3d_caps->PixelShaderVersion; caps->MaxPixelShaderValue = wined3d_caps->PixelShader1xMaxValue; + caps->Caps2 &= D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED; + caps->Caps3 &= D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED; + caps->PrimitiveMiscCaps &= D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE; + caps->RasterCaps &= D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE; + caps->SrcBlendCaps &= D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA; + caps->DestBlendCaps &= D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA; + caps->TextureCaps &= D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_ALPHA + | D3DPTEXTURECAPS_SQUAREONLY | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE + | D3DPTEXTURECAPS_ALPHAPALETTE | D3DPTEXTURECAPS_NONPOW2CONDITIONAL + | D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP + | D3DPTEXTURECAPS_MIPMAP | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2; + caps->TextureFilterCaps &= D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + caps->CubeTextureFilterCaps &= D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + caps->VolumeTextureFilterCaps &= D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; + caps->VertexProcessingCaps &= D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4; + /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ if (caps->PixelShaderVersion) caps->PixelShaderVersion = D3DPS_VERSION(1, 4); @@ -353,8 +404,6 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) else caps->VertexShaderVersion = D3DVS_VERSION(0, 0); caps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); - - caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; } /* Handle table functions */

1 0

Matteo Bruni : include: Add a couple of missing d3d8 cap flags.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 4ccab716dea4feaf4be2a399c831147e3711f0ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccab716dea4feaf4be2a399… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:43 2018 -0600 include: Add a couple of missing d3d8 cap flags. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d8caps.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/include/d3d8caps.h b/include/d3d8caps.h index d11a46f..469dace 100644 --- a/include/d3d8caps.h +++ b/include/d3d8caps.h @@ -86,16 +86,17 @@ #define D3DPCMPCAPS_GREATEREQUAL 0x40 #define D3DPCMPCAPS_ALWAYS 0x80 -#define D3DPMISCCAPS_MASKZ 0x0002 -#define D3DPMISCCAPS_LINEPATTERNREP 0x0004 -#define D3DPMISCCAPS_CULLNONE 0x0010 -#define D3DPMISCCAPS_CULLCW 0x0020 -#define D3DPMISCCAPS_CULLCCW 0x0040 -#define D3DPMISCCAPS_COLORWRITEENABLE 0x0080 -#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x0100 -#define D3DPMISCCAPS_CLIPTLVERTS 0x0200 -#define D3DPMISCCAPS_TSSARGTEMP 0x0400 -#define D3DPMISCCAPS_BLENDOP 0x0800 +#define D3DPMISCCAPS_MASKZ __MSABI_LONG(0x00000002) +#define D3DPMISCCAPS_LINEPATTERNREP __MSABI_LONG(0x00000004) +#define D3DPMISCCAPS_CULLNONE __MSABI_LONG(0x00000010) +#define D3DPMISCCAPS_CULLCW __MSABI_LONG(0x00000020) +#define D3DPMISCCAPS_CULLCCW __MSABI_LONG(0x00000040) +#define D3DPMISCCAPS_COLORWRITEENABLE __MSABI_LONG(0x00000080) +#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS __MSABI_LONG(0x00000100) +#define D3DPMISCCAPS_CLIPTLVERTS __MSABI_LONG(0x00000200) +#define D3DPMISCCAPS_TSSARGTEMP __MSABI_LONG(0x00000400) +#define D3DPMISCCAPS_BLENDOP __MSABI_LONG(0x00000800) +#define D3DPMISCCAPS_NULLREFERENCE __MSABI_LONG(0x00001000) #define D3DPRASTERCAPS_DITHER 0x00000001 #define D3DPRASTERCAPS_PAT 0x00000008 @@ -196,12 +197,13 @@ #define D3DTEXOPCAPS_MULTIPLYADD 0x1000000 #define D3DTEXOPCAPS_LERP 0x2000000 -#define D3DVTXPCAPS_TEXGEN 0x01 -#define D3DVTXPCAPS_MATERIALSOURCE7 0x02 -#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x08 -#define D3DVTXPCAPS_POSITIONALLIGHTS 0x10 -#define D3DVTXPCAPS_LOCALVIEWER 0x20 -#define D3DVTXPCAPS_TWEENING 0x40 +#define D3DVTXPCAPS_TEXGEN __MSABI_LONG(0x00000001) +#define D3DVTXPCAPS_MATERIALSOURCE7 __MSABI_LONG(0x00000002) +#define D3DVTXPCAPS_DIRECTIONALLIGHTS __MSABI_LONG(0x00000008) +#define D3DVTXPCAPS_POSITIONALLIGHTS __MSABI_LONG(0x00000010) +#define D3DVTXPCAPS_LOCALVIEWER __MSABI_LONG(0x00000020) +#define D3DVTXPCAPS_TWEENING __MSABI_LONG(0x00000040) +#define D3DVTXPCAPS_NO_VSDT_UBYTE4 __MSABI_LONG(0x00000080) #define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020 #define D3DCAPS3_RESERVED 0x8000001f

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018