September 2014 - Wine-commits

Vincent Povirk : gdiplus: Process a row instead of a column in inner conversion loop.
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: 3fc386fc865c20d14798786943c8de0d9921d55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc386fc865c20d1479878694… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 18 13:22:14 2014 -0500 gdiplus: Process a row instead of a column in inner conversion loop. --- dlls/gdiplus/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7964cd8..0564f33 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -582,8 +582,8 @@ GpStatus convert_pixels(INT width, INT height, } #define convert_indexed_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE index; \ ARGB argb; \ BYTE *color = (BYTE *)&argb; \ @@ -595,8 +595,8 @@ GpStatus convert_pixels(INT width, INT height, } while (0); #define convert_rgb_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x); \ @@ -605,8 +605,8 @@ GpStatus convert_pixels(INT width, INT height, } while (0); #define convert_rgb_to_indexed(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \

1 0

André Hentschel : d3d10core: Fix out of bounds access (Coverity).
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: 8a7d4c7f224737af7f6f9cc18a8737b6ab41f232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7d4c7f224737af7f6f9cc18… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 22 20:41:58 2014 +0200 d3d10core: Fix out of bounds access (Coverity). --- dlls/d3d10core/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 830b2b4..71a30cc 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -196,7 +196,7 @@ HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, /* D3D10_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, }; - if (desc->Query > sizeof(query_type_map) / sizeof(*query_type_map)) + if (desc->Query >= sizeof(query_type_map) / sizeof(*query_type_map)) { FIXME("Unhandled query type %#x.\n", desc->Query); return E_INVALIDARG;

1 0

André Hentschel : dwrite: Check correct variable ( Coverity).
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: b12381a04a4183f046cc70113db094f79d54db3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12381a04a4183f046cc70113… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 22 20:46:51 2014 +0200 dwrite: Check correct variable (Coverity). --- dlls/dwrite/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c626201..ec7f92d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -364,7 +364,7 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt *strings = NULL; New = heap_alloc(sizeof(struct localizedstrings)); - if (!This) return E_OUTOFMEMORY; + if (!New) return E_OUTOFMEMORY; New->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; New->ref = 1;

1 0

Frédéric Delanoy : French translation for release 1.7.27
by Jeremy Newman 22 Sep '14

22 Sep '14

Module: website Branch: master Commit: c09ebec01f1a26f54e5c53322be925018e097969 URL: http://source.winehq.org/git/website.git/?a=commit;h=c09ebec01f1a26f54e5c53… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 21 20:20:47 2014 +0200 French translation for release 1.7.27 --- news/fr/2014091901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014091901.xml b/news/fr/2014091901.xml new file mode 100644 index 0000000..245d3e2 --- /dev/null +++ b/news/fr/2014091901.xml @@ -0,0 +1,14 @@ +<news> +<date>19 septembre 2014</date> +<title>Sortie de Wine 1.7.27</title> +<body> + La version de développement 1.7.27 de Wine est disponible. + <a href="{$root}/announce/1.7.27">Nouveautés</a> de cette version : +<ul> + <li>Progrès dans la prise en charge de Direct2D.</li> + <li>Diverses améliorations dans les interfaces RichEdit.</li> + <li>Prise en charge initiale de ICMP version 6.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.27.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.27
by Jeremy Newman 22 Sep '14

22 Sep '14

Module: website Branch: master Commit: 2e0918d13211aaed74c26e2730a823d10fff87ef URL: http://source.winehq.org/git/website.git/?a=commit;h=2e0918d13211aaed74c26e… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Sep 20 17:05:56 2014 +0200 German translation for release 1.7.27 --- news/de/2014091901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014091901.xml b/news/de/2014091901.xml new file mode 100644 index 0000000..0dbe8e2 --- /dev/null +++ b/news/de/2014091901.xml @@ -0,0 +1,15 @@ +<news> +<date>19. September 2014</date> +<title>Wine 1.7.27 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.27 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.27">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Etwas mehr Arbeit an der Direct2D-Unterstützung.</li> + <li>Diverse Verbesserungen an den RichEdit-Schnittstellen.</li> + <li>Anfängliche Unterstützung für ICMP Version 6.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.27.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.27
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: website Branch: master Commit: f6c878d668557f4666309d07dec0aa31bbe396e5 URL: http://source.winehq.org/git/website.git/?a=commit;h=f6c878d668557f4666309d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 20:18:44 2014 +0200 Wine release 1.7.27 --- news/en/2014091901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014091901.xml b/news/en/2014091901.xml new file mode 100644 index 0000000..bb2269d --- /dev/null +++ b/news/en/2014091901.xml @@ -0,0 +1,15 @@ +<news> +<date>September 19, 2014</date> +<title>Wine 1.7.27 Released</title> +<body> + The Wine development release 1.7.27 is now available. + <a href="{$root}/announce/1.7.27">What's new</a> in this release: +<ul> + <li>Some more work on Direct2D support.</li> + <li>Various improvements to RichEdit interfaces.</li> + <li>Initial support for ICMP version 6.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.27.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Henri Verbeet : d3d10core: Create wined3d queries for queries.
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: 686546b6d3d07902f6159f49f69a28b315c92054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686546b6d3d07902f6159f49f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 19 10:41:45 2014 +0200 d3d10core: Create wined3d queries for queries. --- dlls/d3d10core/async.c | 34 +++++++++++++++++++++++++++++++++- dlls/d3d10core/d3d10core_private.h | 4 +++- dlls/d3d10core/device.c | 4 ++-- dlls/d3d10core/tests/device.c | 5 +++-- include/wine/wined3d.h | 3 +++ 5 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 6d3442b..f41369b 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -171,10 +171,42 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = d3d10_query_GetDesc, }; -HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, BOOL predicate) +HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, + const D3D10_QUERY_DESC *desc, BOOL predicate) { + HRESULT hr; + + static const enum wined3d_query_type query_type_map[] = + { + /* D3D10_QUERY_EVENT */ WINED3D_QUERY_TYPE_EVENT, + /* D3D10_QUERY_OCCLUSION */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D10_QUERY_TIMESTAMP */ WINED3D_QUERY_TYPE_TIMESTAMP, + /* D3D10_QUERY_TIMESTAMP_DISJOINT */ WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT, + /* D3D10_QUERY_PIPELINE_STATISTICS */ WINED3D_QUERY_TYPE_PIPELINE_STATISTICS, + /* D3D10_QUERY_OCCLUSION_PREDICATE */ WINED3D_QUERY_TYPE_OCCLUSION, + /* D3D10_QUERY_SO_STATISTICS */ WINED3D_QUERY_TYPE_SO_STATISTICS, + /* D3D10_QUERY_SO_OVERFLOW_PREDICATE */ WINED3D_QUERY_TYPE_SO_OVERFLOW, + }; + + if (desc->Query > sizeof(query_type_map) / sizeof(*query_type_map)) + { + FIXME("Unhandled query type %#x.\n", desc->Query); + return E_INVALIDARG; + } + + if (desc->MiscFlags) + FIXME("Ignoring MiscFlags %#x.\n", desc->MiscFlags); + query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; + + if (FAILED(hr = wined3d_query_create(device->wined3d_device, + query_type_map[desc->Query], &query->wined3d_query))) + { + WARN("Failed to create wined3d query, hr %#x.\n", hr); + return hr; + } + query->predicate = predicate; query->device = &device->ID3D10Device1_iface; ID3D10Device1_AddRef(query->device); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 0e0fdfd..0891ae0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -297,11 +297,13 @@ struct d3d10_query ID3D10Query ID3D10Query_iface; LONG refcount; + struct wined3d_query *wined3d_query; BOOL predicate; ID3D10Device1 *device; }; -HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, BOOL predicate) DECLSPEC_HIDDEN; +HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, + const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; /* IDirect3D10Device1 */ struct d3d10_device diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 5bdb8af..a5d806a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1722,7 +1722,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, device, FALSE))) + if (FAILED(hr = d3d10_query_init(object, device, desc, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -1756,7 +1756,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, device, TRUE))) + if (FAILED(hr = d3d10_query_init(object, device, desc, TRUE))) { WARN("Failed to initialize predicate, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 67398fa..4b3a325 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -961,8 +961,9 @@ static void test_create_predicate(void) query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE; hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); - ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); - ID3D10Predicate_Release(predicate); + todo_wine ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Predicate_Release(predicate); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 741e503..fdbd65b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -694,6 +694,9 @@ enum wined3d_pool enum wined3d_query_type { + WINED3D_QUERY_TYPE_PIPELINE_STATISTICS = 1, + WINED3D_QUERY_TYPE_SO_STATISTICS = 2, + WINED3D_QUERY_TYPE_SO_OVERFLOW = 3, WINED3D_QUERY_TYPE_VCACHE = 4, WINED3D_QUERY_TYPE_RESOURCE_MANAGER = 5, WINED3D_QUERY_TYPE_VERTEX_STATS = 6,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SetPredication().
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: fdf60e51fc389e5657dc4ffd4c205401b6364d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf60e51fc389e5657dc4ffd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 19 10:41:46 2014 +0200 d3d10core: Implement d3d10_device_SetPredication(). --- dlls/d3d10core/async.c | 8 ++++++++ dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 8 +++++++- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 4 ++++ include/wine/wined3d.h | 2 ++ 8 files changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index f41369b..058b7bc 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -171,6 +171,14 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = d3d10_query_GetDesc, }; +struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_query_vtbl); + return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); +} + HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) { diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 0891ae0..71c4dc0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -304,6 +304,7 @@ struct d3d10_query HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; +struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; /* IDirect3D10Device1 */ struct d3d10_device diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index a5d806a..7dc6543 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -385,7 +385,13 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_SetPredication(ID3D10Device1 *iface, ID3D10Predicate *predicate, BOOL value) { - FIXME("iface %p, predicate %p, value %d stub!\n", iface, predicate, value); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct d3d10_query *query; + + TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); + + query = unsafe_impl_from_ID3D10Query((ID3D10Query *)predicate); + wined3d_device_set_predication(device->wined3d_device, query ? query->wined3d_query : NULL, value); } static void STDMETHODCALLTYPE d3d10_device_GSSetShaderResources(ID3D10Device1 *iface, diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 205f3d8..bdd86c8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -29,6 +29,7 @@ enum wined3d_cs_op WINED3D_CS_OP_PRESENT, WINED3D_CS_OP_CLEAR, WINED3D_CS_OP_DRAW, + WINED3D_CS_OP_SET_PREDICATION, WINED3D_CS_OP_SET_VIEWPORT, WINED3D_CS_OP_SET_SCISSOR_RECT, WINED3D_CS_OP_SET_RENDERTARGET_VIEW, @@ -84,6 +85,13 @@ struct wined3d_cs_draw BOOL indexed; }; +struct wined3d_cs_set_predication +{ + enum wined3d_cs_op opcode; + struct wined3d_query *predicate; + BOOL value; +}; + struct wined3d_cs_set_viewport { enum wined3d_cs_op opcode; @@ -317,6 +325,26 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun cs->ops->submit(cs); } +static void wined3d_cs_exec_set_predication(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_predication *op = data; + + cs->state.predicate = op->predicate; + cs->state.predicate_value = op->value; +} + +void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query *predicate, BOOL value) +{ + struct wined3d_cs_set_predication *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_PREDICATION; + op->predicate = predicate; + op->value = value; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_set_viewport(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_viewport *op = data; @@ -880,6 +908,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, + /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, /* WINED3D_CS_OP_SET_VIEWPORT */ wined3d_cs_exec_set_viewport, /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, /* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */ wined3d_cs_exec_set_rendertarget_view, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 44fa206..cfe3b4c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3333,6 +3333,27 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou return WINED3D_OK; } +void CDECL wined3d_device_set_predication(struct wined3d_device *device, + struct wined3d_query *predicate, BOOL value) +{ + struct wined3d_query *prev; + + TRACE("device %p, predicate %p, value %#x.\n", device, predicate, value); + + prev = device->update_state->predicate; + if (predicate) + { + FIXME("Predicated rendering not implemented.\n"); + wined3d_query_incref(predicate); + } + device->update_state->predicate = predicate; + device->update_state->predicate_value = value; + if (!device->recording) + wined3d_cs_emit_set_predication(device->cs, predicate, value); + if (prev) + wined3d_query_decref(prev); +} + void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_type) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e064d1a..e0f9ebc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -126,6 +126,7 @@ @ cdecl wined3d_device_set_multithreaded(ptr) @ cdecl wined3d_device_set_npatch_mode(ptr float) @ cdecl wined3d_device_set_pixel_shader(ptr ptr) +@ cdecl wined3d_device_set_predication(ptr ptr long) @ cdecl wined3d_device_set_primitive_type(ptr long) @ cdecl wined3d_device_set_ps_cb(ptr long ptr) @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff98ec0..330fadd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1862,6 +1862,8 @@ struct wined3d_state INT base_vertex_index; INT load_base_vertex_index; /* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */ GLenum gl_primitive_type; + struct wined3d_query *predicate; + BOOL predicate_value; struct wined3d_shader *shader[WINED3D_SHADER_TYPE_COUNT]; struct wined3d_buffer *cb[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; @@ -2508,6 +2510,8 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, + struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_rendertarget_view(struct wined3d_cs *cs, unsigned int view_idx, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fdbd65b..01f8e2a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2237,6 +2237,8 @@ void __cdecl wined3d_device_set_material(struct wined3d_device *device, const st void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device); HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments); void __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_predication(struct wined3d_device *device, + struct wined3d_query *predicate, BOOL value); void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_topology); void __cdecl wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GetPredication().
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: a3daed9604fe80836eba2de8b453002eec7b0aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3daed9604fe80836eba2de8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 19 10:41:47 2014 +0200 d3d10core: Implement d3d10_device_GetPredication(). --- dlls/d3d10core/async.c | 2 +- dlls/d3d10core/device.c | 16 +++++++++++++++- dlls/d3d9/query.c | 2 +- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/query.c | 17 +++++++++++++---- dlls/wined3d/wined3d.spec | 4 +++- dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 4 +++- 8 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 058b7bc..830b2b4 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -209,7 +209,7 @@ HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, query->refcount = 1; if (FAILED(hr = wined3d_query_create(device->wined3d_device, - query_type_map[desc->Query], &query->wined3d_query))) + query_type_map[desc->Query], query, &query->wined3d_query))) { WARN("Failed to create wined3d query, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7dc6543..aac53dd 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -980,7 +980,21 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_GetPredication(ID3D10Device1 *iface, ID3D10Predicate **predicate, BOOL *value) { - FIXME("iface %p, predicate %p, value %p stub!\n", iface, predicate, value); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_query *wined3d_predicate; + struct d3d10_query *predicate_impl; + + TRACE("iface %p, predicate %p, value %p.\n", iface, predicate, value); + + if (!(wined3d_predicate = wined3d_device_get_predication(device->wined3d_device, value))) + { + *predicate = NULL; + return; + } + + predicate_impl = wined3d_query_get_parent(wined3d_predicate); + *predicate = (ID3D10Predicate *)&predicate_impl->ID3D10Query_iface; + ID3D10Predicate_AddRef(*predicate); } static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device1 *iface, diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 6af89f6..42b476c 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -189,7 +189,7 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER query->refcount = 1; wined3d_mutex_lock(); - hr = wined3d_query_create(device->wined3d_device, type, &query->wined3d_query); + hr = wined3d_query_create(device->wined3d_device, type, query, &query->wined3d_query); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cfe3b4c..a214442 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3354,6 +3354,14 @@ void CDECL wined3d_device_set_predication(struct wined3d_device *device, wined3d_query_decref(prev); } +struct wined3d_query * CDECL wined3d_device_get_predication(struct wined3d_device *device, BOOL *value) +{ + TRACE("device %p, value %p.\n", device, value); + + *value = device->state.predicate_value; + return device->state.predicate; +} + void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_type) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b01e124..e755764 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -421,6 +421,13 @@ static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, return S_OK; } +void * CDECL wined3d_query_get_parent(const struct wined3d_query *query) +{ + TRACE("query %p.\n", query); + + return query->parent; +} + enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query *query) { TRACE("query %p.\n", query); @@ -698,10 +705,13 @@ static const struct wined3d_query_ops timestamp_disjoint_query_ops = wined3d_timestamp_disjoint_query_ops_issue, }; -static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device, enum wined3d_query_type type) +static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device, + enum wined3d_query_type type, void *parent) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + query->parent = parent; + switch (type) { case WINED3D_QUERY_TYPE_OCCLUSION: @@ -797,7 +807,7 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de } HRESULT CDECL wined3d_query_create(struct wined3d_device *device, - enum wined3d_query_type type, struct wined3d_query **query) + enum wined3d_query_type type, void *parent, struct wined3d_query **query) { struct wined3d_query *object; HRESULT hr; @@ -808,8 +818,7 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, if (!object) return E_OUTOFMEMORY; - hr = query_init(object, device, type); - if (FAILED(hr)) + if (FAILED(hr = query_init(object, device, type, parent))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e0f9ebc..615a85d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -67,6 +67,7 @@ @ cdecl wined3d_device_get_material(ptr ptr) @ cdecl wined3d_device_get_npatch_mode(ptr) @ cdecl wined3d_device_get_pixel_shader(ptr) +@ cdecl wined3d_device_get_predication(ptr ptr) @ cdecl wined3d_device_get_primitive_type(ptr ptr) @ cdecl wined3d_device_get_ps_cb(ptr long) @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) @@ -169,10 +170,11 @@ @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) -@ cdecl wined3d_query_create(ptr long ptr) +@ cdecl wined3d_query_create(ptr long ptr ptr) @ cdecl wined3d_query_decref(ptr) @ cdecl wined3d_query_get_data(ptr ptr long long) @ cdecl wined3d_query_get_data_size(ptr) +@ cdecl wined3d_query_get_parent(ptr) @ cdecl wined3d_query_get_type(ptr) @ cdecl wined3d_query_incref(ptr) @ cdecl wined3d_query_issue(ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 330fadd..30a3321 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2559,6 +2559,8 @@ struct wined3d_query_ops struct wined3d_query { LONG ref; + + void *parent; const struct wined3d_query_ops *query_ops; struct wined3d_device *device; enum query_state state; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 01f8e2a..bd41106 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2145,6 +2145,7 @@ HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *dev void __cdecl wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material); float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); +struct wined3d_query * __cdecl wined3d_device_get_predication(struct wined3d_device *device, BOOL *value); void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, enum wined3d_primitive_type *primitive_topology); struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx); @@ -2304,10 +2305,11 @@ HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries); HRESULT __cdecl wined3d_query_create(struct wined3d_device *device, - enum wined3d_query_type type, struct wined3d_query **query); + enum wined3d_query_type type, void *parent, struct wined3d_query **query); ULONG __cdecl wined3d_query_decref(struct wined3d_query *query); HRESULT __cdecl wined3d_query_get_data(struct wined3d_query *query, void *data, UINT data_size, DWORD flags); UINT __cdecl wined3d_query_get_data_size(const struct wined3d_query *query); +void * __cdecl wined3d_query_get_parent(const struct wined3d_query *query); enum wined3d_query_type __cdecl wined3d_query_get_type(const struct wined3d_query *query); ULONG __cdecl wined3d_query_incref(struct wined3d_query *query); HRESULT __cdecl wined3d_query_issue(struct wined3d_query *query, DWORD flags);

1 0

Henri Verbeet : wined3d: Never pass a surface to wined3d_resource_is_offscreen().
by Alexandre Julliard 19 Sep '14

19 Sep '14

Module: wine Branch: master Commit: 4f2110b0ce758822f549c5a730938739e1b5a79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2110b0ce758822f549c5a73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 19 10:41:48 2014 +0200 wined3d: Never pass a surface to wined3d_resource_is_offscreen(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/resource.c | 3 --- dlls/wined3d/surface.c | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4a61cc8..52b9d9d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7645,7 +7645,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (src_surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DRAWABLE)) == WINED3D_LOCATION_DRAWABLE - && !wined3d_resource_is_offscreen(&src_surface->resource)) + && !wined3d_resource_is_offscreen(&src_surface->container->resource)) { /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can @@ -7662,7 +7662,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, context_apply_blit_state(context, device); - if (!wined3d_resource_is_offscreen(&dst_surface->resource)) + if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); arbfp_blit_set(device->blit_priv, context, src_surface); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 693267e..b83ec78 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1590,7 +1590,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->current_rt = target; ret->tid = GetCurrentThreadId(); - ret->render_offscreen = wined3d_resource_is_offscreen(&target->resource); + ret->render_offscreen = wined3d_resource_is_offscreen(&target->container->resource); ret->draw_buffers_mask = context_generate_rt_mask(GL_BACK); ret->valid = 1; @@ -3043,7 +3043,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; - render_offscreen = wined3d_resource_is_offscreen(&target->resource); + render_offscreen = wined3d_resource_is_offscreen(&target->container->resource); if (context->current_rt == target && render_offscreen == old_render_offscreen) return; /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 772ce10..d40af56 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -305,9 +305,6 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) { struct wined3d_swapchain *swapchain; - if (resource->type == WINED3D_RTYPE_SURFACE) - resource = &surface_from_resource(resource)->container->resource; - /* Only texture resources can be onscreen. */ if (resource->type != WINED3D_RTYPE_TEXTURE) return TRUE; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 04ef3f0..9603e21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1511,7 +1511,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi if (srgb) internal = format->glGammaInternal; else if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&surface->resource)) + && wined3d_resource_is_offscreen(&surface->container->resource)) internal = format->rtInternal; else internal = format->glInternal; @@ -1856,7 +1856,7 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru if (srgb) internal = format->glGammaInternal; else if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&surface->resource)) + && wined3d_resource_is_offscreen(&surface->container->resource)) internal = format->rtInternal; else internal = format->glInternal; @@ -3047,7 +3047,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc * There is no need to keep track of the current read buffer or reset it, every part of the code * that reads sets the read buffer as desired. */ - if (wined3d_resource_is_offscreen(&surface->resource)) + if (wined3d_resource_is_offscreen(&surface->container->resource)) { /* Mapping the primary render target which is not on a swapchain. * Read from the back buffer. */ @@ -3146,7 +3146,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) TRACE("Reading back offscreen render target %p.\n", surface); - if (wined3d_resource_is_offscreen(&surface->resource)) + if (wined3d_resource_is_offscreen(&surface->container->resource)) gl_info->gl_ops.gl.p_glReadBuffer(device->offscreenBuffer); else gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(surface)); @@ -3513,7 +3513,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc /* Bind the target texture */ context_bind_texture(context, dst_surface->container->target, dst_surface->container->texture_rgb.name); - if (wined3d_resource_is_offscreen(&src_surface->resource)) + if (wined3d_resource_is_offscreen(&src_surface->container->resource)) { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; @@ -3619,7 +3619,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context_apply_blit_state(context, device); wined3d_texture_load(dst_surface->container, context, FALSE); - src_offscreen = wined3d_resource_is_offscreen(&src_surface->resource); + src_offscreen = wined3d_resource_is_offscreen(&src_surface->container->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->container->texture_rgb.name) { @@ -3919,7 +3919,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* Activate the destination context, set it up for blitting */ context_apply_blit_state(context, device); - if (!wined3d_resource_is_offscreen(&dst_surface->resource)) + if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); device->blitter->set_shader(device->blit_priv, context, src_surface); @@ -4522,7 +4522,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, RECT r; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && wined3d_resource_is_offscreen(&surface->resource)) + && wined3d_resource_is_offscreen(&surface->container->resource)) { ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); return WINED3DERR_INVALIDCALL; @@ -4550,7 +4550,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, BYTE *mem = NULL; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && wined3d_resource_is_offscreen(&surface->resource) + && wined3d_resource_is_offscreen(&surface->container->resource) && (surface->locations & WINED3D_LOCATION_DRAWABLE)) { surface_load_fb_texture(surface, srgb); @@ -5856,7 +5856,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, &src_rect))) { - if (!wined3d_resource_is_offscreen(&dst_surface->resource)) + if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) surface_load_location(dst_surface, dst_surface->container->resource.draw_binding); return WINED3D_OK; }

1 0