wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Henri Verbeet : wined3d: Get rid of some unused declarations.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 27dac1eea39d3eebae3175b121f19a08ead677c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27dac1eea39d3eebae3175b12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:09 2016 +0200 wined3d: Get rid of some unused declarations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 65270d4..43d0daf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2715,8 +2715,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; -void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: NP2 emulation is not allowed on array textures.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 3e29f952f953f66db5677a0be74bc75fd869bc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e29f952f953f66db5677a0be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:08 2016 +0200 wined3d: NP2 emulation is not allowed on array textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f00e87..5534e73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -784,13 +784,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (surface->texture_target == GL_TEXTURE_2D_ARRAY) { - /* We don't expect to ever need to emulate NP2 textures when we have EXT_texture_array. */ + /* NP2 emulation is not allowed on array textures. */ if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - FIXME("Cannot download surface %p, level %u, layer %u.\n", - surface, surface->texture_level, surface->texture_layer); - return; - } + ERR("Array texture %p uses NP2 emulation.\n", texture); WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n");

1 0

Henri Verbeet : wined3d: Send shader constant updates through the command stream.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: aa666adfed929a2f711d9570fe389856bcaac346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa666adfed929a2f711d9570f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:07 2016 +0200 wined3d: Send shader constant updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 ----------- dlls/wined3d/cs.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 22 ++++++-------------- dlls/wined3d/glsl_shader.c | 10 --------- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++ 5 files changed, 68 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0fb2f67..80702a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -729,12 +729,6 @@ static void shader_arb_update_float_vertex_constants(struct wined3d_device *devi { struct wined3d_context *context = context_get_current(); struct shader_arb_priv *priv = device->shader_priv; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_VS_F; - } /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ @@ -748,12 +742,6 @@ static void shader_arb_update_float_pixel_constants(struct wined3d_device *devic { struct wined3d_context *context = context_get_current(); struct shader_arb_priv *priv = device->shader_priv; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - } /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ea4778c..edb5cf2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1070,10 +1070,54 @@ static void wined3d_cs_st_submit(struct wined3d_cs *cs) wined3d_cs_op_handlers[opcode](cs, cs->data); } +static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants) +{ + struct wined3d_device *device = cs->device; + unsigned int context_count; + unsigned int i; + size_t offset; + + static const struct + { + size_t offset; + size_t size; + DWORD mask; + } + push_constant_info[] = + { + /* WINED3D_PUSH_CONSTANTS_VS_F */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_f), sizeof(struct wined3d_vec4), WINED3D_SHADER_CONST_VS_F}, + /* WINED3D_PUSH_CONSTANTS_PS_F */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_f), sizeof(struct wined3d_vec4), WINED3D_SHADER_CONST_PS_F}, + /* WINED3D_PUSH_CONSTANTS_VS_I */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_i), sizeof(struct wined3d_ivec4), WINED3D_SHADER_CONST_VS_I}, + /* WINED3D_PUSH_CONSTANTS_PS_I */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_i), sizeof(struct wined3d_ivec4), WINED3D_SHADER_CONST_PS_I}, + /* WINED3D_PUSH_CONSTANTS_VS_B */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_VS_B}, + /* WINED3D_PUSH_CONSTANTS_PS_B */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_PS_B}, + }; + + if (p == WINED3D_PUSH_CONSTANTS_VS_F) + device->shader_backend->shader_update_float_vertex_constants(device, start_idx, count); + else if (p == WINED3D_PUSH_CONSTANTS_PS_F) + device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); + + offset = push_constant_info[p].offset + start_idx * push_constant_info[p].size; + memcpy((BYTE *)&cs->state + offset, constants, count * push_constant_info[p].size); + for (i = 0, context_count = device->context_count; i < context_count; ++i) + { + device->contexts[i]->constant_update_mask |= push_constant_info[p].mask; + } +} + static const struct wined3d_cs_ops wined3d_cs_st_ops = { wined3d_cs_st_require_space, wined3d_cs_st_submit, + wined3d_cs_st_push_constants, }; struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index da83b56..967a831 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2363,16 +2363,6 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return device->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; } -static void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) -{ - UINT i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= mask; - } -} - HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { @@ -2400,7 +2390,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_VS_B); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); } return WINED3D_OK; @@ -2449,7 +2439,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_VS_I); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); } return WINED3D_OK; @@ -2494,7 +2484,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, memset(&device->recording->changed.vs_consts_f[start_idx], 1, count * sizeof(*device->recording->changed.vs_consts_f)); else - device->shader_backend->shader_update_float_vertex_constants(device, start_idx, count); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); return WINED3D_OK; } @@ -2633,7 +2623,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_PS_B); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants); } return WINED3D_OK; @@ -2682,7 +2672,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_PS_I); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants); } return WINED3D_OK; @@ -2728,7 +2718,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, memset(&device->recording->changed.ps_consts_f[start_idx], 1, count * sizeof(*device->recording->changed.ps_consts_f)); else - device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8c22468..b228718 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1540,11 +1540,6 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev { update_heap_entry(heap, i, priv->next_constant_version); } - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_VS_F; - } } static void shader_glsl_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) @@ -1557,11 +1552,6 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi { update_heap_entry(heap, i, priv->next_constant_version); } - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - } } static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00f34e9..65270d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2837,10 +2837,22 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; +enum wined3d_push_constants +{ + WINED3D_PUSH_CONSTANTS_VS_F, + WINED3D_PUSH_CONSTANTS_PS_F, + WINED3D_PUSH_CONSTANTS_VS_I, + WINED3D_PUSH_CONSTANTS_PS_I, + WINED3D_PUSH_CONSTANTS_VS_B, + WINED3D_PUSH_CONSTANTS_PS_B, +}; + struct wined3d_cs_ops { void *(*require_space)(struct wined3d_cs *cs, size_t size); void (*submit)(struct wined3d_cs *cs); + void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants); }; struct wined3d_cs @@ -2905,6 +2917,12 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; +static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants) +{ + cs->ops->push_constants(cs, p, start_idx, count, constants); +} + /* 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 because d3d * allows GetData on a created issue, but opengl doesn't

1 0

Alexandre Julliard : user32: Only start reusing DCEs after the cache reached its limit.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: d1048914332e118c2ae107177f24910807471367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1048914332e118c2ae107177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:55:18 2016 +0900 user32: Only start reusing DCEs after the cache reached its limit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index ba1967c..30dabfe 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -56,6 +56,8 @@ struct dce static struct list dce_list = LIST_INIT(dce_list); +#define DCE_CACHE_SIZE 64 + static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam ); static const WCHAR displayW[] = { 'D','I','S','P','L','A','Y',0 }; @@ -429,10 +431,11 @@ void invalidate_dce( WND *win, const RECT *extra_rect ) LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { + if (!dce->hwnd) continue; + TRACE( "%p: hwnd %p dcx %08x %s %s\n", dce, dce->hwnd, dce->flags, (dce->flags & DCX_CACHE) ? "Cache" : "Owned", dce->count ? "InUse" : "" ); - if (!dce->hwnd) continue; if ((dce->hwnd == win->parent) && !(dce->flags & DCX_CLIPCHILDREN)) continue; /* child window positions don't bother us */ @@ -1001,7 +1004,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if ((flags & DCX_CACHE) || !(dce = get_window_dce( hwnd ))) { - struct dce *dceEmpty = NULL, *dceUnused = NULL; + struct dce *dceEmpty = NULL, *dceUnused = NULL, *found = NULL; + unsigned int count = 0; /* Strategy: First, we attempt to find a non-empty but unused DCE with * compatible flags. Next, we look for an empty entry. If the cache is @@ -1010,24 +1014,23 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) USER_Lock(); LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { - if ((dce->flags & DCX_CACHE) && !dce->count) + if (!(dce->flags & DCX_CACHE)) break; + count++; + if (dce->count) continue; + dceUnused = dce; + if (!dce->hwnd) dceEmpty = dce; + else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags)) { - dceUnused = dce; - - if (!dce->hwnd) dceEmpty = dce; - else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags)) - { - TRACE("\tfound valid %p dce [%p], flags %08x\n", - dce, hwnd, dce->flags ); - bUpdateVisRgn = FALSE; - break; - } + TRACE( "found valid %p dce [%p], flags %08x\n", dce, hwnd, dce->flags ); + found = dce; + bUpdateVisRgn = FALSE; + break; } } + if (!found) found = dceEmpty; + if (!found && count >= DCE_CACHE_SIZE) found = dceUnused; - if (&dce->entry == &dce_list) /* nothing found */ - dce = dceEmpty ? dceEmpty : dceUnused; - + dce = found; if (dce) dce->count = 1; USER_Unlock();

1 0

Alexandre Julliard : user32: Completely free owned DCEs when the corresponding window/ class is destroyed.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: d341b0c3815a1b8872c8354dd0811e05a1ce7152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d341b0c3815a1b8872c8354dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:54:40 2016 +0900 user32: Completely free owned DCEs when the corresponding window/class is destroyed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 1 - dlls/user32/painting.c | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c9b7b31..a4088fd 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -812,7 +812,6 @@ static void test_DeleteDC(void) ok(ret, "UnregisterClassA failed\n"); ret = GetObjectType(hdc_test); -todo_wine ok(!ret, "GetObjectType should fail for a deleted DC\n"); /* CS_OWNDC */ diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c0c92d8..ba1967c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -338,16 +338,17 @@ static struct dce *get_window_dce( HWND hwnd ) */ void free_dce( struct dce *dce, HWND hwnd ) { + struct dce *dce_to_free = NULL; + USER_Lock(); if (dce) { if (!--dce->count) { - /* turn it into a cache entry */ - SetHookFlags( dce->hdc, DCHF_RESETDC ); release_dce( dce ); - dce->flags |= DCX_CACHE; + list_remove( &dce->entry ); + dce_to_free = dce; } else if (dce->hwnd == hwnd) { @@ -362,7 +363,7 @@ void free_dce( struct dce *dce, HWND hwnd ) LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { if (dce->hwnd != hwnd) continue; - if (!(dce->flags & DCX_CACHE)) continue; + if (!(dce->flags & DCX_CACHE)) break; if (dce->count) WARN( "GetDC() without ReleaseDC() for window %p\n", hwnd ); dce->count = 0; @@ -371,6 +372,13 @@ void free_dce( struct dce *dce, HWND hwnd ) } USER_Unlock(); + + if (dce_to_free) + { + SetDCHook( dce_to_free->hdc, NULL, 0 ); + DeleteDC( dce_to_free->hdc ); + HeapFree( GetProcessHeap(), 0, dce_to_free ); + } }

1 0

Alexandre Julliard : user32: Fix refcounting of window DCEs.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 5f7e4ce642d4deb615e09a3411dc7f416e7e4c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7e4ce642d4deb615e09a341… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:54:01 2016 +0900 user32: Fix refcounting of window DCEs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 9e5bc0a..c0c92d8 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -311,7 +311,6 @@ static struct dce *get_window_dce( HWND hwnd ) { win->dce = dce; dce->hwnd = hwnd; - dce->count++; list_add_tail( &dce_list, &dce->entry ); } WIN_ReleasePtr( win ); @@ -501,14 +500,10 @@ static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam WARN("DC is not in use!\n"); break; case DCHC_DELETEDC: - /* - * Windows will not let you delete a DC that is busy - * (between GetDC and ReleaseDC) - */ USER_Lock(); - if (dce->count > 1) + if (!(dce->flags & DCX_CACHE)) { - WARN("Application trying to delete a busy DC %p\n", dce->hdc); + WARN("Application trying to delete an owned DC %p\n", dce->hdc); retv = FALSE; } else

1 0

Józef Kucia : wined3d: Match position output register by sysval semantic value.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: e36a7e5da441be201ceb3b576999198998ad5b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36a7e5da441be201ceb3b576… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:30 2016 +0200 wined3d: Match position output register by sysval semantic value. 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/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c345d67..8c22468 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5053,7 +5053,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (args->vp_mode == vertexshader) { - if (input->sysval_semantic == WINED3D_SV_POSITION) + if (input->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) @@ -5392,7 +5392,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, semantic_idx = output->semantic_idx; shader_glsl_write_mask_to_str(output->mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_POSITION) && !semantic_idx) + if (output->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) { shader_addline(buffer, "gl_Position%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 01c5d50..bcaee1c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -256,7 +256,7 @@ static void shader_dump_src_param(struct wined3d_string_buffer *buffer, const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) { - if (handler_idx >= sizeof(shader_opcode_names) / sizeof(*shader_opcode_names)) + if (handler_idx >= ARRAY_SIZE(shader_opcode_names)) return wine_dbg_sprintf("UNRECOGNIZED(%#x)", handler_idx); return shader_opcode_names[handler_idx]; @@ -264,7 +264,7 @@ const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HA static const char *shader_semantic_name_from_usage(enum wined3d_decl_usage usage) { - if (usage >= sizeof(semantic_names) / sizeof(*semantic_names)) + if (usage >= ARRAY_SIZE(semantic_names)) { FIXME("Unrecognized usage %#x.\n", usage); return "UNRECOGNIZED"; @@ -277,14 +277,26 @@ static enum wined3d_decl_usage shader_usage_from_semantic_name(const char *name) { unsigned int i; - for (i = 0; i < sizeof(semantic_names) / sizeof(*semantic_names); ++i) + for (i = 0; i < ARRAY_SIZE(semantic_names); ++i) { - if (!strcmp(name, semantic_names[i])) return i; + if (!strcmp(name, semantic_names[i])) + return i; } return ~0U; } +static enum wined3d_sysval_semantic shader_sysval_semantic_from_usage(enum wined3d_decl_usage usage) +{ + switch (usage) + { + case WINED3D_DECL_USAGE_POSITION: + return WINED3D_SV_POSITION; + default: + return 0; + } +} + BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) { return !strcmp(semantic_name, shader_semantic_name_from_usage(usage)); @@ -295,7 +307,7 @@ static void shader_signature_from_semantic(struct wined3d_shader_signature_eleme { e->semantic_name = shader_semantic_name_from_usage(s->usage); e->semantic_idx = s->usage_idx; - e->sysval_semantic = 0; + e->sysval_semantic = shader_sysval_semantic_from_usage(s->usage); e->component_type = 0; e->register_idx = s->reg.reg.idx[0].offset; e->mask = s->reg.write_mask; @@ -306,7 +318,7 @@ static void shader_signature_from_usage(struct wined3d_shader_signature_element { e->semantic_name = shader_semantic_name_from_usage(usage); e->semantic_idx = usage_idx; - e->sysval_semantic = 0; + e->sysval_semantic = shader_sysval_semantic_from_usage(usage); e->component_type = 0; e->register_idx = reg_idx; e->mask = write_mask;

1 0

Józef Kucia : d3d10core/tests: Add create_buffer() helper.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 9eef3c90ca7bcee7ef2cdb4ae80a7f1e8616b6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eef3c90ca7bcee7ef2cdb4ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:29 2016 +0200 d3d10core/tests: Add create_buffer() helper. 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/d3d10core/tests/device.c | 252 ++++++++---------------------------------- 1 file changed, 48 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eef3c90ca7bcee7ef2cd…

1 0

Józef Kucia : d3d11/tests: Add create_buffer() helper.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 4c8f89d37d36a6e2ab6cfa1435320562e97615cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8f89d37d36a6e2ab6cfa143… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:28 2016 +0200 d3d11/tests: Add create_buffer() helper. 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/d3d11/tests/d3d11.c | 245 +++++++++-------------------------------------- 1 file changed, 45 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c8f89d37d36a6e2ab6cf…

1 0

Sebastian Lackner : wininet: Initialize user_len before GetUserNameW call.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: ff1fb7f51cc5555d0a30c0131a012d730600ecba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1fb7f51cc5555d0a30c0131… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu May 19 21:25:04 2016 +0200 wininet: Initialize user_len before GetUserNameW call. Fixes a regression introduced by 441347f084963ef9f9ae721e5731284443c40656. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 8e9ebfb..34c6c0b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -151,6 +151,7 @@ static WCHAR *create_cookie_url(substr_t domain, substr_t path, substr_t *ret_pa static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; + user_len = sizeof(user)/sizeof(WCHAR); if(!GetUserNameW(user, &user_len)) return FALSE; user_len--;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
55
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 May 2016