wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Nikolay Sivov : xmllite: Added IXmlResolver definition.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 6d2caffd194dbe46baa69b1ed8216d44bd58cee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2caffd194dbe46baa69b1ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 16 11:33:00 2013 +0400 xmllite: Added IXmlResolver definition. --- include/xmllite.idl | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/xmllite.idl b/include/xmllite.idl index c1c0b88..7547d1a 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -78,6 +78,21 @@ interface IXmlReader : IUnknown BOOL IsEOF(void); } +/* IXmlResolver */ +[ + local, + object, + uuid(7279fc82-709d-4095-b63d-69fe4b0d9030), + pointer_default(unique) +] +interface IXmlResolver : IUnknown +{ + HRESULT ResolveUri([in] LPCWSTR base_uri, + [in] LPCWSTR public_id, + [in] LPCWSTR system_id, + [out] IUnknown **input); +} + /* IXmlReader state */ typedef enum XmlReadState {

1 0

Nikolay Sivov : xmllite: Initial implementation of DTD external id parsing.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: e7c58fca12e23071a26f32837e7ef8e92e366eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c58fca12e23071a26f32837… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 15 23:54:14 2013 +0400 xmllite: Initial implementation of DTD external id parsing. --- dlls/xmllite/reader.c | 198 ++++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 87 +++++++++++++++++++ 2 files changed, 272 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7c58fca12e23071a26f3…

1 0

Andrew Talbot : dmstyle: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 9d037fa95be17eddd9d2a22cee9ee6c6832ea2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d037fa95be17eddd9d2a22ce… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:26:56 2013 +0000 dmstyle: Avoid signed-unsigned integer comparisons. --- dlls/dmstyle/commandtrack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 17dc8f8..9fe0057 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -263,7 +263,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize); switch (chunkID) { case DMUS_FOURCC_COMMANDTRACK_CHUNK: { - int count; + DWORD count; TRACE_(dmfile)(": command track chunk\n"); IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL); if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) {

1 0

Andrew Talbot : dmusic: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 00f85d7fc335a748360299f585b412164ac69bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f85d7fc335a748360299f58… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:26:59 2013 +0000 dmusic: Avoid signed-unsigned integer comparisons. --- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/port.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index bdefe3a..0c2584f 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -316,7 +316,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) MIDIINCAPSW caps_in; IDirectMusicSynth8* synth; HRESULT hr; - int i; + ULONG i; TRACE("(%p)\n", object); diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 55d0dad..459fdb8 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -251,7 +251,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT ULONG offset; ULONG nb_regions; ULONG size; - int i; + ULONG i; TRACE("(%p/%p)->(%p, %p, %p, %d)\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); @@ -684,7 +684,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou { SynthPortImpl *obj; HRESULT hr = E_FAIL; - UINT i; + int i; TRACE("(%p,%p,%p,%p,%p%d)\n", guid, object, unkouter, port_params, port_caps, device);

1 0

Andrew Talbot : dsound: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 7805ff3291d19e1b4edd27ed113f913b6cb07c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7805ff3291d19e1b4edd27ed1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:27:02 2013 +0000 dsound: Avoid signed-unsigned integer comparisons. --- dlls/dsound/primary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index dd810fd..0bfd5667 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -262,7 +262,7 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) { IDirectSoundBufferImpl** dsb = device->buffers; LPBYTE newbuf; - DWORD i; + int i; TRACE("(%p)\n", device);

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A16B16G16R16.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 7c5517da6f8cc4a81b6760c5bce91eeed20e6ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5517da6f8cc4a81b6760c5b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 15 19:25:45 2013 +0100 d3dx9: Add support for D3DFMT_A16B16G16R16. --- dlls/d3dx9_36/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 6d8d152..9ba54e2 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -59,6 +59,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_X4R4G4B4, { 0, 4, 4, 4}, { 0, 8, 4, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A2R10G10B10, { 2, 10, 10, 10}, {30, 20, 10, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A2B10G10R10, { 2, 10, 10, 10}, {30, 0, 10, 20}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A16B16G16R16, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_G16R16, { 0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8, { 8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, { 8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba},

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A32B32G32R32F.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 25ce3a42204ab43850ee92fab133ea42f288f1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ce3a42204ab43850ee92fab… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 15 19:25:26 2013 +0100 d3dx9: Add support for D3DFMT_A32B32G32R32F. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/tests/texture.c | 4 ++-- dlls/d3dx9_36/texture.c | 8 +++++--- dlls/d3dx9_36/util.c | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 01bfbbe..85f0871 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -48,6 +48,7 @@ struct volume enum format_type { FORMAT_ARGB, /* unsigned */ FORMAT_ARGBF16,/* float 16 */ + FORMAT_ARGBF, /* float */ FORMAT_DXT, FORMAT_UNKNOWN }; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 968a8db..28fb47e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1101,7 +1101,7 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) { hr = D3DXFillTexture(tex, fillfunc, NULL); - todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); if (SUCCEEDED(hr)) @@ -1124,7 +1124,7 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) expected.z = 1.0f / 4.0f; expected.w = 1.0f; - todo_wine expect_vec4(&expected, &got); + expect_vec4(&expected, &got); } } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 7323852..9e45506 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1236,6 +1236,8 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po if (format->type == FORMAT_ARGBF16) v = float_32_to_16(comp_value); + else if (format->type == FORMAT_ARGBF) + v = *(DWORD *)&comp_value; else if (format->type == FORMAT_ARGB) v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; else @@ -1282,7 +1284,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1649,7 +1651,7 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1708,7 +1710,7 @@ HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LP return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 264581c..6d8d152 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -71,6 +71,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_DXT4, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_DXT5, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_A16B16G16R16F, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGBF16, NULL, NULL }, + {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, };

1 0

Stefan Dösinger : d3d8/tests: Add a software vertexprocessing buffer discard test.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: f30b6d0b4af97e2deafeae4b3872d09af0c026d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30b6d0b4af97e2deafeae4b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:20 2013 +0100 d3d8/tests: Add a software vertexprocessing buffer discard test. --- dlls/d3d8/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 17c3443..87d3f9e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4532,6 +4532,101 @@ static void test_set_palette(void) DestroyWindow(window); } +static void test_swvp_buffer(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + UINT refcount; + HWND window; + HRESULT hr; + unsigned int i; + IDirect3DVertexBuffer8 *buffer; + static const unsigned int bufsize = 1024; + D3DVERTEXBUFFER_DESC desc; + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct + { + float x, y, z; + } *ptr, *ptr2; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = FALSE; + if (FAILED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*ptr), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, + D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u, expected D3DPOOL_DEFAULT\n", desc.Pool); + ok(desc.Usage == (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY), + "Got usage %u, expected D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY\n", desc.Usage); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < bufsize; i++) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr == ptr2, "Lock returned two different pointers: %p, %p\n", ptr, ptr2); + for (i = 0; i < bufsize; i++) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Vertex %u is %f,%f,%f, expected %f,%f,%f\n", i, + ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -4606,6 +4701,7 @@ START_TEST(device) test_surface_double_unlock(); test_surface_lockrect_blocks(); test_set_palette(); + test_swvp_buffer(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Add a software vertexprocessing buffer discard test.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 4d5c8b6fe71519f42c8e1980d5b8f45aaebd0db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5c8b6fe71519f42c8e1980d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:19 2013 +0100 d3d9/tests: Add a software vertexprocessing buffer discard test. --- dlls/d3d9/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7e7fe40..a0997d6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6030,6 +6030,101 @@ static void test_set_palette(void) DestroyWindow(window); } +static void test_swvp_buffer(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + UINT refcount; + HWND window; + HRESULT hr; + unsigned int i; + IDirect3DVertexBuffer9 *buffer; + static const unsigned int bufsize = 1024; + D3DVERTEXBUFFER_DESC desc; + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct + { + float x, y, z; + } *ptr, *ptr2; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = FALSE; + if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + IDirect3D9_Release(d3d9); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*ptr), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, + D3DPOOL_DEFAULT, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u, expected D3DPOOL_DEFAULT\n", desc.Pool); + ok(desc.Usage == (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY), + "Got usage %u, expected D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY\n", desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, bufsize * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < bufsize; i++) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, bufsize * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr == ptr2, "Lock returned two different pointers: %p, %p\n", ptr, ptr2); + for (i = 0; i < bufsize; i++) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Vertex %u is %f,%f,%f, expected %f,%f,%f\n", i, + ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6116,6 +6211,7 @@ START_TEST(device) test_surface_double_unlock(); test_surface_lockrect_blocks(); test_set_palette(); + test_swvp_buffer(); } out:

1 0

Stefan Dösinger : wined3d: Shadow buffers in sysmem when software vertexprocessing is used.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 151407e5bfbd393ed83526649e1b2a62878c7690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151407e5bfbd393ed83526649… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:18 2013 +0100 wined3d: Shadow buffers in sysmem when software vertexprocessing is used. --- dlls/wined3d/buffer.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c8217e6..415b5e5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1207,6 +1207,15 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.allocatedMemory, buffer); + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING) + { + /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. + * Keep a system memory copy of the buffer to provide the same behavior to the application. + * Still use a VBO to support OpenGL 3 core contexts. */ + TRACE("Using doublebuffer mode because of software vertex processing\n"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + } + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting +

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
74
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 January 2013