wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Matteo Bruni : wined3d: Avoid the deprecated GLSL "attribute" keyword on core profile contexts.
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 0526544576cfc02faee230f989ebe81862f4dc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0526544576cfc02faee230f98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 31 19:50:57 2016 +0200 wined3d: Avoid the deprecated GLSL "attribute" keyword on core profile contexts. 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/wined3d/glsl_shader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3041eef..75c9109 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1574,6 +1574,11 @@ static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info) return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; } +static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) +{ + return needs_legacy_glsl_syntax(gl_info) ? "attribute" : "in"; +} + static void PRINTF_ATTR(4, 5) declare_in_varying(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, BOOL flat, const char *format, ...) { @@ -1902,7 +1907,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", prefix, e->register_idx); else - shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, e->register_idx); + shader_addline(buffer, "%s vec4 %s_in%u;\n", + get_attribute_keyword(gl_info), prefix, e->register_idx); } if (vs_args->point_size && !vs_args->per_vertex_point_size) @@ -6059,7 +6065,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr { const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4"; - shader_addline(buffer, "attribute %s vs_in%u;\n", type, i); + shader_addline(buffer, "%s %s vs_in%u;\n", get_attribute_keyword(gl_info), type, i); } shader_addline(buffer, "\n");

1 0

Matteo Bruni : ddraw/tests: Add a test for color varyings clamping.
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 302b610f9c07ce30c35788476dad3547d383a113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302b610f9c07ce30c35788476… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 31 19:50:56 2016 +0200 ddraw/tests: Add a test for color varyings clamping. 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/ddraw/tests/ddraw4.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 92 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 192 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=302b610f9c07ce30c3578…

1 0

Nikolay Sivov : d2d1: Move mesh creation to mesh.c.
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 3d222560b22448e9fd17abeb263a716a1ea2c7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d222560b22448e9fd17abeb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 14:49:32 2016 +0300 d2d1: Move mesh creation to mesh.c. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/mesh.c | 14 ++++++++++---- dlls/d2d1/render_target.c | 12 ++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index bb3f978..f0577ed 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -188,7 +188,7 @@ struct d2d_mesh ID2D1Factory *factory; }; -void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) DECLSPEC_HIDDEN; struct d2d_bitmap { diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index 28d34da..eb223ad 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -98,9 +98,15 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl = d2d_mesh_Open, }; -void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) +HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) { - mesh->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; - mesh->refcount = 1; - ID2D1Factory_AddRef(mesh->factory = factory); + if (!(*mesh = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**mesh)))) + return E_OUTOFMEMORY; + + (*mesh)->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; + (*mesh)->refcount = 1; + ID2D1Factory_AddRef((*mesh)->factory = factory); + + TRACE("Created mesh %p.\n", *mesh); + return S_OK; } diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 287d7c3..5005840 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -446,18 +446,14 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_mesh *object; + HRESULT hr; TRACE("iface %p, mesh %p.\n", iface, mesh); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - d2d_mesh_init(object, render_target->factory); - - TRACE("Created mesh %p.\n", object); - *mesh = &object->ID2D1Mesh_iface; + if (SUCCEEDED(hr = d2d_mesh_create(render_target->factory, &object))) + *mesh = &object->ID2D1Mesh_iface; - return S_OK; + return hr; } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface,

1 0

Nikolay Sivov : d2d1: Move brush creation helpers to common location.
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 27d5d4caf2d694ef0ed281c9e48905e7aae0fdf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d5d4caf2d694ef0ed281c9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 14:49:31 2016 +0300 d2d1: Move brush creation helpers to common location. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 78 +++++++++++++++++++++++++++++++---------------- dlls/d2d1/d2d1_private.h | 21 ++++++------- dlls/d2d1/render_target.c | 53 ++++++++++---------------------- 3 files changed, 77 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27d5d4caf2d694ef0ed28…

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_get_memory().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: a2c5afe61e27eaac9449b00ff5b5a849c7a192a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c5afe61e27eaac9449b00ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 31 22:48:54 2016 +0200 wined3d: Introduce wined3d_texture_get_memory(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 59 +++++++---------------- dlls/wined3d/texture.c | 106 ++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 85 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2c5afe61e27eaac9449b…

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gdi_frontbuffer_updated().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: e50ff748080fe6381c27013f42efdd1dc9c511a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50ff748080fe6381c27013f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:53 2016 +0200 wined3d: Avoid surface_from_resource() in swapchain_gdi_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 84717d1..ba8f66c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -659,7 +659,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("swapchain %p.\n", swapchain); - front = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); + front = swapchain->front_buffer->sub_resources[0].u.surface; if (swapchain->palette) wined3d_palette_apply_to_dc(swapchain->palette, front->hDC);

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gl_present().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: c633ffb95caaf6e05299bb32a64c517621d5a6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c633ffb95caaf6e05299bb32a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:52 2016 +0200 wined3d: Avoid surface_from_resource() in swapchain_gl_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f1b8b54..84717d1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -480,8 +480,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags) { - struct wined3d_surface *back_buffer = surface_from_resource( - wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + struct wined3d_surface *back_buffer = swapchain->back_buffers[0]->sub_resources[0].u.surface; const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture;

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_device_update_texture().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: cf8ccb865dc1677df5599daaf238bd8c19630eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8ccb865dc1677df5599daaf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:51 2016 +0200 wined3d: Avoid surface_from_resource() in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d81bb70..35bf521 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3666,10 +3666,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { for (j = 0; j < level_count; ++j) { - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, - i * src_levels + j + src_skip_levels)); - dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, - i * dst_levels + j)); + src_surface = src_texture->sub_resources[i * src_levels + j + src_skip_levels].u.surface; + dst_surface = dst_texture->sub_resources[i * dst_levels + j].u.surface; if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) { WARN("Failed to update surface, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_device_init_3d().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: be34aaa789ff7671c6fcb8083e14eafede7cd6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be34aaa789ff7671c6fcb8083… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:50 2016 +0200 wined3d: Avoid surface_from_resource() in wined3d_device_init_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bda5e43..d81bb70 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1025,8 +1025,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->swapchains[0] = swapchain; device_init_swapchain_state(device, swapchain); - context = context_acquire(device, - surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0))); + context = context_acquire(device, swapchain->front_buffer->sub_resources[0].u.surface); create_dummy_textures(device, context); create_default_sampler(device);

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in device_load_logo ().
by Alexandre Julliard 01 Apr '16

01 Apr '16

Module: wine Branch: master Commit: 0abb6b948ea61d6d98dab2b9dc65d6ae6b0d1013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abb6b948ea61d6d98dab2b9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:49 2016 +0200 wined3d: Avoid surface_from_resource() in device_load_logo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ef8095f..bda5e43 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -665,7 +665,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename struct wined3d_surface *surface; /* Fill the surface with a white color to show that wined3d is there */ - surface = surface_from_resource(wined3d_texture_get_sub_resource(device->logo_texture, 0)); + surface = device->logo_texture->sub_resources[0].u.surface; surface_color_fill(surface, &rect, &c); }

1 0

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 April 2016