December 2007 - Wine-Commits

Stefan Dösinger : d3d9: Accept D3DDEVTYPE_REF devices in the vertex declaration test.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 998426e6b7fb51d6e6c5350514f64415bf5882a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998426e6b7fb51d6e6c535051… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 20 21:43:56 2007 +0100 d3d9: Accept D3DDEVTYPE_REF devices in the vertex declaration test. --- dlls/d3d9/tests/vertexdeclaration.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index d43b5ab..df8f162 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -63,8 +63,12 @@ static IDirect3DDevice9 *init_d3d9(void) if(FAILED(hres)) { - trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hres); - return NULL; + hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_REF, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + if(FAILED(hres)) + { + trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hres); + return NULL; + } } return device_ptr;

1 0

Stefan Dösinger : wined3d: Per stream offsets are 4 byte aligned.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: e27cf6ff8f0ac0b9d6179a46b9d998c41908d75b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27cf6ff8f0ac0b9d6179a46b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 20 22:14:53 2007 +0100 wined3d: Per stream offsets are 4 byte aligned. --- dlls/d3d9/tests/device.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 3 ++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5598ecb..a5a2f06 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1655,6 +1655,86 @@ static void test_lights(void) if(d3d9) IDirect3D9_Release(d3d9); } +static void test_set_stream_source(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d9; + HWND hwnd; + HRESULT hr; + IDirect3DVertexBuffer9 *pVertexBuffer; + + d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d9 || !hwnd) goto cleanup; + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device ); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!device) + { + hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_REF, hwnd, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device ); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!device) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } + } + + hr = IDirect3DDevice9_CreateVertexBuffer( device, 512, 0, 0, D3DPOOL_DEFAULT, &pVertexBuffer, NULL ); + ok(hr == D3D_OK, "Failed to create a vertex buffer, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 0, 32); + ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 1, 32); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 1, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 2, 32); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 2, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 3, 32); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 3, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 4, 32); + ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", + DXGetErrorString9(hr)); + + /* Try to set the NULL buffer with an offset and stride 0 */ + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 1, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 1, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 2, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 2, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 3, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 3, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 4, 0); + ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", + DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", DXGetErrorString9(hr)); + + cleanup: + if(pVertexBuffer) IDirect3DDevice9_Release(pVertexBuffer); + if(device) IDirect3DDevice9_Release(device); + if(d3d9) IDirect3D9_Release(d3d9); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -1681,5 +1761,6 @@ START_TEST(device) test_null_stream(); test_vertex_buffer_alignment(); test_lights(); + test_set_stream_source(); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9f1b635..f394c3f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2430,6 +2430,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, if (StreamNumber >= MAX_STREAMS) { WARN("Stream out of range %d\n", StreamNumber); return WINED3DERR_INVALIDCALL; + } else if(OffsetInBytes & 0x3) { + WARN("OffsetInBytes is not 4 byte aligned: %d\n", OffsetInBytes); + return WINED3DERR_INVALIDCALL; } oldSrc = This->updateStateBlock->streamSource[StreamNumber];

1 0

Stefan Dösinger : wined3d: Vertex attributes are 4 byte aligned.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 8ff517eeb980c999013ed70cdaf36152c0908108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff517eeb980c999013ed70cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 20 20:48:03 2007 +0100 wined3d: Vertex attributes are 4 byte aligned. --- dlls/d3d9/tests/vertexdeclaration.c | 47 +++++++++++++++++++++++++++++++++++ dlls/d3d9/vertexdeclaration.c | 2 +- dlls/wined3d/device.c | 4 +++ dlls/wined3d/vertexbuffer.c | 4 +-- dlls/wined3d/vertexdeclaration.c | 6 ++++ 5 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index c8b7a09..d43b5ab 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -736,6 +736,52 @@ static void test_fvf_decl_management( return; } +static void test_vertex_declaration_alignment( + IDirect3DDevice9* device) { + + HRESULT hr; + IDirect3DVertexDeclaration9* result_decl = NULL; + int i; + + CONST D3DVERTEXELEMENT9 test_elements[5][3] = + { + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 16, D3DDECLTYPE_D3DCOLOR, 0, D3DDECLUSAGE_COLOR , 0 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 17, D3DDECLTYPE_D3DCOLOR, 0, D3DDECLUSAGE_COLOR , 0 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 18, D3DDECLTYPE_D3DCOLOR, 0, D3DDECLUSAGE_COLOR , 0 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 19, D3DDECLTYPE_D3DCOLOR, 0, D3DDECLUSAGE_COLOR , 0 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 20, D3DDECLTYPE_D3DCOLOR, 0, D3DDECLUSAGE_COLOR , 0 }, + D3DDECL_END() + } + }; + HRESULT results[5] = {D3D_OK, E_FAIL, E_FAIL, E_FAIL, D3D_OK}; + + for(i = 0; i < sizeof(test_elements) / sizeof(test_elements[0]); i++) { + result_decl = NULL; + hr = IDirect3DDevice9_CreateVertexDeclaration(device, test_elements[i], &result_decl); + ok(hr == results[i], "CreateVertexDeclaration for declaration %d returned %#x, expected %#x\n", + i, hr, results[i]); + if(result_decl) IDirect3DVertexDeclaration9_Release(result_decl); + } +} + START_TEST(vertexdeclaration) { static D3DVERTEXELEMENT9 simple_decl[] = { @@ -770,4 +816,5 @@ START_TEST(vertexdeclaration) test_get_declaration(decl_ptr, simple_decl, simple_decl_num_elements); test_fvf_decl_conversion(device_ptr); test_fvf_decl_management(device_ptr); + test_vertex_declaration_alignment(device_ptr); } diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 3973c98..0c48aff 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -368,7 +368,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 if (FAILED(hr)) { /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateVertexDeclaration failed\n", This); + WARN("(%p) call to IWineD3DDevice_CreateVertexDeclaration failed\n", This); HeapFree(GetProcessHeap(), 0, object->elements); HeapFree(GetProcessHeap(), 0, object); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ab2157..9f1b635 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1716,6 +1716,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* D3DCREATEOBJECTINSTANCE(object, VertexDeclaration) hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count); + if(FAILED(hr)) { + *ppVertexDeclaration = NULL; + HeapFree(GetProcessHeap(), 0, object); + } return hr; } diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 6382662..5bcf904 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -572,9 +572,7 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if switch(This->conv_map[j]) { case CONV_NONE: /* Done already */ - /* Vertex attribute sizes are always multiples of 4, but we can't skip 3 additional bytes - * because the attributes don't have to start at aligned offsets - */ + j += 3; break; case CONV_D3DCOLOR: fixup_d3dcolor((DWORD *) (data + i * This->stride + j)); diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 4e1e1b6..1984d6b 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -159,6 +159,12 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte */ if(This->pDeclarationWine[i].Stream >= MAX_STREAMS) continue; + if(This->pDeclarationWine[i].Offset & 0x3) { + WARN("Declaration element %d is not 4 byte aligned(%d), returning E_FAIL\n", i, This->pDeclarationWine[i].Offset); + HeapFree(GetProcessHeap(), 0, This->pDeclarationWine); + return E_FAIL; + } + if(!isPreLoaded[This->pDeclarationWine[i].Stream]) { This->streams[This->num_streams] = This->pDeclarationWine[i].Stream; This->num_streams++;

1 0

Stefan Dösinger : wined3d: Implement and test vertex fixups with per stream offsets.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 47a8a6bd4412961b5b4c55927e21c25a36a9037b URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a8a6bd4412961b5b4c55927… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 20 23:40:12 2007 +0100 wined3d: Implement and test vertex fixups with per stream offsets. --- dlls/d3d9/tests/visual.c | 99 ++++++++++++++++++++++++++----------------- dlls/wined3d/state.c | 5 ++- dlls/wined3d/vertexbuffer.c | 25 ++++------- 3 files changed, 73 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47a8a6bd4412961b5b4c5…

1 0

Stefan Dösinger : wined3d: Add a test for POSITIONT vertex fixups.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: a0b81e1c44e5bd43495bf5e3834c9daca6914986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b81e1c44e5bd43495bf5e38… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 20 01:22:57 2007 +0100 wined3d: Add a test for POSITIONT vertex fixups. --- dlls/d3d9/tests/visual.c | 93 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7e6cab6..5062952 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5481,8 +5481,13 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) {0, 12, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, D3DDECL_END() }; + static const D3DVERTEXELEMENT9 decl_elements_positiont[] = { + {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, + {0, 16, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + D3DDECL_END() + }; IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; - IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL; + IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL, *dcl_positiont; IDirect3DVertexBuffer9 *vb, *vb2; struct vertex quad1[] = /* D3DCOLOR */ { @@ -5551,6 +5556,12 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) 0.0, 0.0, 0.1, 0.0, 1.0, 0.1 }; + struct tvertex quad_transformed[] = { + { 90, 110, 0.1, 2.0, 0x00ffff00}, + { 570, 110, 0.1, 2.0, 0x00ffff00}, + { 90, 300, 0.1, 2.0, 0x00ffff00}, + { 570, 300, 0.1, 2.0, 0x00ffff00} + }; hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); @@ -5567,6 +5578,8 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_d3dcolor_2streams, &dcl_color_2); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_positiont, &dcl_positiont); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); size = max(sizeof(quad1), max(sizeof(quad2), max(sizeof(quad3), max(sizeof(quad4), sizeof(quads))))); hr = IDirect3DDevice9_CreateVertexBuffer(device, size, @@ -5725,6 +5738,83 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) "D3DDECLTYPE_FLOAT4 returned color %08x, expected 0x00ff0000\n", color); } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad_transformed), (void **) &data, 0); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %s\n", DXGetErrorString9(hr)); + memcpy(data, quad_transformed, sizeof(quad_transformed)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed (%08x)\n", hr); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_positiont); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad_transformed[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive failed, hr = %#08x\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %s\n", DXGetErrorString9(hr)); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 88, 108); + ok(color == 0x000000ff, + "pixel 88/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 108); + ok(color == 0x000000ff, + "pixel 92/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 88, 112); + ok(color == 0x000000ff, + "pixel 88/112 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 112); + ok(color == 0x00ffff00, + "pixel 92/112 has color %08x, expected 0x00ffff00\n", color); + + color = getPixelColor(device, 568, 108); + ok(color == 0x000000ff, + "pixel 568/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 572, 108); + ok(color == 0x000000ff, + "pixel 572/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 568, 112); + ok(color == 0x00ffff00, + "pixel 568/112 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 572, 112); + ok(color == 0x000000ff, + "pixel 572/112 has color %08x, expected 0x000000ff\n", color); + + color = getPixelColor(device, 88, 298); + ok(color == 0x000000ff, + "pixel 88/298 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 298); + ok(color == 0x00ffff00, + "pixel 92/298 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 88, 302); + ok(color == 0x000000ff, + "pixel 88/302 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 302); + ok(color == 0x000000ff, + "pixel 92/302 has color %08x, expected 0x000000ff\n", color); + + color = getPixelColor(device, 568, 298); + ok(color == 0x00ffff00, + "pixel 568/298 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 572, 298); + ok(color == 0x000000ff, + "pixel 572/298 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 568, 302); + ok(color == 0x000000ff, + "pixel 568/302 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 572, 302); + ok(color == 0x000000ff, + "pixel 572/302 has color %08x, expected 0x000000ff\n", color); + /* This test is pointless without those two declarations: */ if(!dcl_color_2 || !dcl_ubyte_2) goto out; @@ -5800,6 +5890,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) if(dcl_color) IDirect3DVertexDeclaration9_Release(dcl_color); if(dcl_color_2) IDirect3DVertexDeclaration9_Release(dcl_color_2); if(dcl_ubyte_2) IDirect3DVertexDeclaration9_Release(dcl_ubyte_2); + if(dcl_positiont) IDirect3DVertexDeclaration9_Release(dcl_positiont); } struct vertex_float16color {

1 0

Stefan Dösinger : wined3d: Improve some traces.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: b475047cc078fe2bbfc1de8a1872f50bdbde8d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b475047cc078fe2bbfc1de8a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 19 23:29:39 2007 +0100 wined3d: Improve some traces. --- dlls/wined3d/device.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 602e2c3..6ab2157 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -317,7 +317,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac D3DCREATERESOURCEOBJECTINSTANCE(object, VertexBuffer, WINED3DRTYPE_VERTEXBUFFER, Size) - TRACE("(%p) : Size=%d, Usage=%d, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); + TRACE("(%p) : Size=%d, Usage=0x%08x, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); *ppVertexBuffer = (IWineD3DVertexBuffer *)object; object->fvf = FVF; @@ -338,8 +338,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac * more. In this call we can convert dx7 buffers too. */ conv = ((FVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) || (FVF & (WINED3DFVF_DIFFUSE | WINED3DFVF_SPECULAR)); - if( GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) && Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && - (dxVersion > 7 || !conv) ) { + if(!GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { + TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); + } else if(Pool == WINED3DPOOL_SYSTEMMEM) { + TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); + } else if(Usage & WINED3DUSAGE_DYNAMIC) { + TRACE("Not creating a vbo because the buffer has dynamic usage\n"); + } else if(dxVersion <= 7 && conv) { + TRACE("Not creating a vbo because dxVersion is 7 and the fvf needs conversion\n"); + } else { CreateVBO(object); } return WINED3D_OK;

1 0

Stefan Dösinger : d3d9: Extend the fixed function vertex declaration test.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: d8209b5de34ee66537cf354694cad0b55af7627b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8209b5de34ee66537cf35469… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 19 22:56:01 2007 +0100 d3d9: Extend the fixed function vertex declaration test. --- dlls/d3d9/tests/visual.c | 131 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 128 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8209b5de34ee66537cf3…

1 0

Michael Jung : ole32: Avoid leaving a critical section twice.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 6598589ebdab6a184960a2ef26b21f618f211f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6598589ebdab6a184960a2ef2… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Fri Dec 21 08:18:35 2007 +0100 ole32: Avoid leaving a critical section twice. --- dlls/ole32/moniker.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index cbb89e5..8511a9f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -817,11 +817,13 @@ RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface, } break; } - break; + + goto done; } } LeaveCriticalSection(&This->lock); +done: TRACE("-- 0x08%x\n", hr); return hr; }

1 0

Stefan Dösinger : wined3d: Change the vertex buffer declaration's data format.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: 6d575ec301e77e3a188f639f6c4cbb9197e887fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d575ec301e77e3a188f639f6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 21 03:55:31 2007 +0100 wined3d: Change the vertex buffer declaration's data format. This hopefully makes the vertex attribute detection simpler, more solid, readable and flexible. --- dlls/wined3d/vertexbuffer.c | 593 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 20 +- 2 files changed, 275 insertions(+), 338 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d575ec301e77e3a188f6…

1 0

Stefan Dösinger : wined3d: Implement half float vertex buffer conversion.
by Alexandre Julliard Dec. 21, 2007

Dec. 21, 2007

Module: wine Branch: master Commit: b5f925cae0af40bc1feea2fa18dbba13bba4c458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f925cae0af40bc1feea2fa1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 19 17:18:39 2007 +0100 wined3d: Implement half float vertex buffer conversion. --- dlls/wined3d/device.c | 2 + dlls/wined3d/drawprim.c | 38 ++------ dlls/wined3d/state.c | 59 ++++++++--- dlls/wined3d/vertexbuffer.c | 211 +++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 24 +++++ 5 files changed, 266 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5f925cae0af40bc1feea…

1 0