wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Alexandre Julliard : winebus.sys: Define SYN_DROPPED if missing.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: f1c344bc626874930e6bcd80c14fb4e5a95197b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1c344bc626874930e6bcd80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 12:50:54 2018 +0100 winebus.sys: Define SYN_DROPPED if missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 7e26493..d34e18c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -49,6 +49,9 @@ # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) # define HAS_PROPER_INPUT_HEADER # endif +# ifndef SYN_DROPPED +# define SYN_DROPPED 3 +# endif #endif #define NONAMELESSUNION

1 0

Michael Stefaniuc : quartz: Don' t create the advise thread during the clock teardown.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 9d704afd93ebd36a3d9e486354451684b575f9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d704afd93ebd36a3d9e4863… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 23 23:34:49 2018 +0100 quartz: Don't create the advise thread during the clock teardown. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index a3e1504..1638e11 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -229,7 +229,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { + if (This->adviseThreadActive && SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { WaitForSingleObject(This->adviseThread, INFINITE); CloseHandle(This->adviseThread); }

1 0

Józef Kucia : wined3d: Limit number of supported render targets to 8.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 1075b4615bfcd2aed7b5d80d52860d9ce557a5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1075b4615bfcd2aed7b5d80d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:33 2018 +0100 wined3d: Limit number of supported render targets to 8. Virtually all relatively modern GPUs support 8 render targets. 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/context.c | 4 ++-- dlls/wined3d/cs.c | 24 +++++------------------- dlls/wined3d/device.c | 28 +++++++++------------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 19 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index da5496d..04853c9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3039,7 +3039,7 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) { - struct wined3d_rendertarget_view **rts = fb->render_targets; + struct wined3d_rendertarget_view * const *rts = fb->render_targets; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD rt_mask = 0, *cur_mask; @@ -3148,7 +3148,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { - struct wined3d_rendertarget_view **rts = state->fb->render_targets; + struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; DWORD rt_mask, rt_mask_bits; unsigned int i; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2f77c7b..9f3ff46 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -563,17 +563,11 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { struct wined3d_cs_clear *op; - struct - { - struct wined3d_rendertarget_view *rt; - struct wined3d_fb_state fb; - } *extra; + size_t size; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(*extra), - WINED3D_CS_QUEUE_DEFAULT); - extra = (void *)&op->rects[1]; - extra->fb.render_targets = &extra->rt; - op->fb = &extra->fb; + size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); + op = cs->ops->require_space(cs, size, WINED3D_CS_QUEUE_DEFAULT); + op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; @@ -994,7 +988,7 @@ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const v { const struct wined3d_cs_set_rendertarget_view *op = data; - cs->state.fb->render_targets[op->view_idx] = op->view; + cs->fb.render_targets[op->view_idx] = op->view; device_invalidate_state(cs->device, STATE_FRAMEBUFFER); } @@ -2734,12 +2728,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - if (!(cs->fb.render_targets = heap_calloc(gl_info->limits.buffers, sizeof(*cs->fb.render_targets)))) - { - heap_free(cs); - return NULL; - } - state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); @@ -2782,7 +2770,6 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) fail: state_cleanup(&cs->state); - heap_free(cs->fb.render_targets); heap_free(cs); return NULL; } @@ -2798,7 +2785,6 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) } state_cleanup(&cs->state); - heap_free(cs->fb.render_targets); heap_free(cs->data); heap_free(cs); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 18b39b8..5ec0705 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1050,7 +1050,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; DWORD clear_flags = 0; HRESULT hr; @@ -1062,16 +1061,14 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->wined3d->flags & WINED3D_NO3D) return WINED3DERR_INVALIDCALL; - if (!(device->fb.render_targets = heap_calloc(gl_info->limits.buffers, sizeof(*device->fb.render_targets)))) - return E_OUTOFMEMORY; + memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); /* Setup the implicit swapchain. This also initializes a context. */ - TRACE("Creating implicit swapchain\n"); - hr = device->device_parent->ops->create_swapchain(device->device_parent, - swapchain_desc, &swapchain); - if (FAILED(hr)) + TRACE("Creating implicit swapchain.\n"); + if (FAILED(hr = device->device_parent->ops->create_swapchain(device->device_parent, + swapchain_desc, &swapchain))) { - WARN("Failed to create implicit swapchain\n"); + WARN("Failed to create implicit swapchain.\n"); goto err_out; } @@ -1108,7 +1105,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up, leaving 3D init.\n"); + TRACE("All defaults now set up.\n"); /* Clear the screen */ if (swapchain->back_buffers && swapchain->back_buffers[0]) @@ -1131,7 +1128,6 @@ err_out: wined3d_rendertarget_view_decref(device->back_buffer_view); if (swapchain) wined3d_swapchain_decref(swapchain); - heap_free(device->fb.render_targets); return hr; } @@ -1186,7 +1182,7 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { - UINT i; + unsigned int i; TRACE("device %p.\n", device); @@ -1246,9 +1242,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->swapchains = NULL; device->swapchain_count = 0; - heap_free(device->fb.render_targets); - device->fb.render_targets = NULL; - device->d3d_initialized = FALSE; return WINED3D_OK; @@ -4758,12 +4751,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - if (device->fb.render_targets) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } + wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } wined3d_device_set_depth_stencil_view(device, NULL); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f7f6452..a1577c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3521,7 +3521,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_DRAW_BUFFERS] && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); - gl_info->limits.buffers = gl_max; + gl_info->limits.buffers = min(MAX_RENDER_TARGET_VIEWS, gl_max); TRACE("Max draw buffers: %u.\n", gl_max); } if (gl_info->supported[ARB_MULTITEXTURE]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07c7c02..7813df5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -271,6 +271,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 +#define MAX_RENDER_TARGET_VIEWS 8 #define MAX_UNORDERED_ACCESS_VIEWS 8 #define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 @@ -1993,7 +1994,7 @@ struct wined3d_context struct wined3d_fb_state { - struct wined3d_rendertarget_view **render_targets; + struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS]; struct wined3d_rendertarget_view *depth_stencil; };

1 0

Józef Kucia : d3d9: Get rid of D3D9_MAX_SIMULTANEOUS_RENDERTARGETS.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 7e2e47295531ca683ceecc661a8bcf7c3387f63b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e2e47295531ca683ceecc66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:32 2018 +0100 d3d9: Get rid of D3D9_MAX_SIMULTANEOUS_RENDERTARGETS. D3D_MAX_SIMULTANEOUS_RENDERTARGETS is defined in d3d9types.h. 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/d3d9/d3d9_private.h | 3 +-- dlls/d3d9/device.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ee385d9..ba19e5f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -42,7 +42,6 @@ #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_TEXTURE_UNITS 20 -#define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 #define D3DPRESENTFLAGS_MASK 0x00000fffu @@ -103,7 +102,7 @@ struct d3d9_device UINT index_buffer_pos; struct d3d9_texture *textures[D3D9_MAX_TEXTURE_UNITS]; - struct d3d9_surface *render_targets[D3D9_MAX_SIMULTANEOUS_RENDERTARGETS]; + struct d3d9_surface *render_targets[D3D_MAX_SIMULTANEOUS_RENDERTARGETS]; LONG device_state; BOOL in_destruction; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1c9a625..e8798a7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -453,7 +453,7 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV; caps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); - caps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, caps->NumSimultaneousRTs); + caps->NumSimultaneousRTs = min(D3D_MAX_SIMULTANEOUS_RENDERTARGETS, caps->NumSimultaneousRTs); if (caps->PixelShaderVersion > 3) { @@ -1784,7 +1784,7 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO TRACE("iface %p, idx %u, surface %p.\n", iface, idx, surface); - if (idx >= D3D9_MAX_SIMULTANEOUS_RENDERTARGETS) + if (idx >= D3D_MAX_SIMULTANEOUS_RENDERTARGETS) { WARN("Invalid index %u specified.\n", idx); return D3DERR_INVALIDCALL; @@ -1825,7 +1825,7 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO if (!surface) return D3DERR_INVALIDCALL; - if (idx >= D3D9_MAX_SIMULTANEOUS_RENDERTARGETS) + if (idx >= D3D_MAX_SIMULTANEOUS_RENDERTARGETS) { WARN("Invalid index %u specified.\n", idx); return D3DERR_INVALIDCALL;

1 0

Józef Kucia : wined3d: Merge drawprim.c into context.c.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 6eb562210cb154749b1da5c399a69320d87365e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb562210cb154749b1da5c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:31 2018 +0100 wined3d: Merge drawprim.c into context.c. 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/Makefile.in | 1 - dlls/wined3d/context.c | 699 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/drawprim.c | 725 ----------------------------------------- dlls/wined3d/wined3d_private.h | 2 - 4 files changed, 698 insertions(+), 729 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6eb562210cb154749b1d…

1 0

Józef Kucia : wined3d: Drop d3d_draw debug channel.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 66cd87106025f6cd27a403fec4ac97460a71ca83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66cd87106025f6cd27a403fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:30 2018 +0100 wined3d: Drop d3d_draw debug channel. 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/drawprim.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2f3390b..19a578a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -29,9 +29,8 @@ #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -WINE_DECLARE_DEBUG_CHANNEL(d3d); /* Context activation is done by the caller. */ static void draw_primitive_arrays(struct wined3d_context *context, const struct wined3d_state *state, @@ -391,7 +390,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const } gl_info->gl_ops.gl.p_glEnd(); - checkGLcall("glEnd and previous calls"); + checkGLcall("draw immediate mode"); } static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, @@ -399,6 +398,7 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer = parameters->buffer; + const void *offset; if (!gl_info->supported[ARB_DRAW_INDIRECT]) { @@ -408,18 +408,17 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); + offset = (void *)(GLintptr)parameters->offset; if (idx_size) { GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (state->index_offset) FIXME("Ignoring index offset %u.\n", state->index_offset); - GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, - (void *)(GLintptr)parameters->offset)); + GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, offset)); } else { - GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, - (void *)(GLintptr)parameters->offset)); + GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, offset)); } GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); @@ -723,6 +722,4 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); - - TRACE("Done all gl drawing.\n"); }

1 0

Józef Kucia : wined3d: Cleanup draw_primitive_arrays( ) a bit.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: f8c8498f490d4a06941a31f1d4ee3314fcc0f397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8c8498f490d4a06941a31f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:29 2018 +0100 wined3d: Cleanup draw_primitive_arrays() a bit. 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/drawprim.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f87f091..2f3390b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,27 +44,29 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int instanced_element_count = 0; + GLenum mode = state->gl_primitive_type; + const void *indices; unsigned int i, j; + indices = (const char *)idx_data + idx_size * start_idx; + if (!instance_count) { if (!idx_size) { - gl_info->gl_ops.gl.p_glDrawArrays(state->gl_primitive_type, start_idx, count); + gl_info->gl_ops.gl.p_glDrawArrays(mode, start_idx, count); checkGLcall("glDrawArrays"); return; } if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - GL_EXTCALL(glDrawElementsBaseVertex(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), base_vertex_idx)); + GL_EXTCALL(glDrawElementsBaseVertex(mode, count, idx_type, indices, base_vertex_idx)); checkGLcall("glDrawElementsBaseVertex"); return; } - gl_info->gl_ops.gl.p_glDrawElements(state->gl_primitive_type, count, - idx_type, (const char *)idx_data + (idx_size * start_idx)); + gl_info->gl_ops.gl.p_glDrawElements(mode, count, idx_type, indices); checkGLcall("glDrawElements"); return; } @@ -78,33 +80,32 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct { if (gl_info->supported[ARB_BASE_INSTANCE]) { - GL_EXTCALL(glDrawArraysInstancedBaseInstance(state->gl_primitive_type, start_idx, count, instance_count, start_instance)); + GL_EXTCALL(glDrawArraysInstancedBaseInstance(mode, start_idx, count, instance_count, start_instance)); checkGLcall("glDrawArraysInstancedBaseInstance"); return; } - GL_EXTCALL(glDrawArraysInstanced(state->gl_primitive_type, start_idx, count, instance_count)); + GL_EXTCALL(glDrawArraysInstanced(mode, start_idx, count, instance_count)); checkGLcall("glDrawArraysInstanced"); return; } if (gl_info->supported[ARB_BASE_INSTANCE]) { - GL_EXTCALL(glDrawElementsInstancedBaseVertexBaseInstance(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_idx, start_instance)); + GL_EXTCALL(glDrawElementsInstancedBaseVertexBaseInstance(mode, count, idx_type, + indices, instance_count, base_vertex_idx, start_instance)); checkGLcall("glDrawElementsInstancedBaseVertexBaseInstance"); return; } if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - GL_EXTCALL(glDrawElementsInstancedBaseVertex(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_idx)); + GL_EXTCALL(glDrawElementsInstancedBaseVertex(mode, count, idx_type, + indices, instance_count, base_vertex_idx)); checkGLcall("glDrawElementsInstancedBaseVertex"); return; } - GL_EXTCALL(glDrawElementsInstanced(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), instance_count)); + GL_EXTCALL(glDrawElementsInstanced(mode, count, idx_type, indices, instance_count)); checkGLcall("glDrawElementsInstanced"); return; } @@ -120,7 +121,7 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct * has a different meaning in that situation. */ if (!idx_size) { - FIXME("Non-indexed instanced drawing is not supported\n"); + FIXME("Non-indexed instanced drawing is not supported.\n"); return; } @@ -152,14 +153,12 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - GL_EXTCALL(glDrawElementsBaseVertex(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx), base_vertex_idx)); + GL_EXTCALL(glDrawElementsBaseVertex(mode, count, idx_type, indices, base_vertex_idx)); checkGLcall("glDrawElementsBaseVertex"); } else { - gl_info->gl_ops.gl.p_glDrawElements(state->gl_primitive_type, count, idx_type, - (const char *)idx_data + (idx_size * start_idx)); + gl_info->gl_ops.gl.p_glDrawElements(mode, count, idx_type, indices); checkGLcall("glDrawElements"); } }

1 0

Józef Kucia : wined3d: Move dispatch_compute() to context.c file.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 41717a148e48544811a5eefcb7e49c8433d5f90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=41717a148e48544811a5eefc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 25 23:23:28 2018 +0100 wined3d: Move dispatch_compute() to context.c file. 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/context.c | 61 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/drawprim.c | 59 ---------------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 60 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d552c8c..1c39f0a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4023,7 +4023,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, return TRUE; } -void context_apply_compute_state(struct wined3d_context *context, +static void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; @@ -4247,3 +4247,62 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, ERR("Acquired context %p instead of %p.\n", current_context, context); return current_context; } + +void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_dispatch_parameters *parameters) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(device, NULL, 0); + if (!context->valid) + { + context_release(context); + WARN("Invalid context, skipping dispatch.\n"); + return; + } + gl_info = context->gl_info; + + if (!gl_info->supported[ARB_COMPUTE_SHADER]) + { + context_release(context); + FIXME("OpenGL implementation does not support compute shaders.\n"); + return; + } + + if (parameters->indirect) + wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + + context_apply_compute_state(context, device, state); + + if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) + { + context_release(context); + WARN("No compute shader bound, skipping dispatch.\n"); + return; + } + + if (parameters->indirect) + { + const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; + struct wined3d_buffer *buffer = indirect->buffer; + + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); + GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); + } + else + { + const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; + GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); + } + checkGLcall("dispatch compute"); + + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); + checkGLcall("glMemoryBarrier"); + + if (wined3d_settings.strict_draw_ordering) + gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + + context_release(context); +} diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 7eccc8f..f87f091 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -727,62 +727,3 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s TRACE("Done all gl drawing.\n"); } - -void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, - const struct wined3d_dispatch_parameters *parameters) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(device, NULL, 0); - if (!context->valid) - { - context_release(context); - WARN("Invalid context, skipping dispatch.\n"); - return; - } - gl_info = context->gl_info; - - if (!gl_info->supported[ARB_COMPUTE_SHADER]) - { - context_release(context); - FIXME("OpenGL implementation does not support compute shaders.\n"); - return; - } - - if (parameters->indirect) - wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - - context_apply_compute_state(context, device, state); - - if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) - { - context_release(context); - WARN("No compute shader bound, skipping dispatch.\n"); - return; - } - - if (parameters->indirect) - { - const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; - struct wined3d_buffer *buffer = indirect->buffer; - - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); - GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); - } - else - { - const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; - GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); - } - checkGLcall("dispatch compute"); - - GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); - checkGLcall("glMemoryBarrier"); - - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); -} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4d15c5..650c1a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2135,8 +2135,6 @@ void context_alloc_occlusion_query(struct wined3d_context *context, void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; 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_compute_state(struct wined3d_context *context, - const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,

1 0

Marcin Mikołajczak : po: Update Polish translation.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: f16e7e4478e7b69ab836464930ce7d9cdc254363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f16e7e4478e7b69ab8364649… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Feb 24 13:48:03 2018 +0100 po: Update Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 174 +++++++++++++++------------------------------------------------ 1 file changed, 40 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f16e7e4478e7b69ab836…

1 0

Andrey Gusev : mshtml/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard 26 Feb '18

26 Feb '18

Module: wine Branch: master Commit: 80690ecf4da076a98032b9292024973e489b3c65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80690ecf4da076a98032b929… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 23 12:08:03 2018 +0200 mshtml/tests: Use GetModuleHandleA instead of LoadLibraryA. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 6376f3f..ebaa630 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -603,7 +603,7 @@ static void test_res_protocol(void) test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html"); - if(GetProcAddress(LoadLibraryA("urlmon.dll"), "CreateUri")) { + if(GetProcAddress(GetModuleHandleA("urlmon.dll"), "CreateUri")) { test_res_url("/test/dir/dir2/res.html?query_part"); test_res_url("/test/dir/dir2/res.html#hash_part"); test_res_url("/#123");

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
81
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 February 2018