wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Vincent Povirk : windowscodecs: Implement IWICBitmap::GetPixelFormat.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: f26402cad7db8d62ae9f230ad02bfc6316703b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26402cad7db8d62ae9f230ad… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 15:39:58 2012 -0500 windowscodecs: Implement IWICBitmap::GetPixelFormat. --- dlls/windowscodecs/bitmap.c | 17 +++++++++++++---- dlls/windowscodecs/tests/bitmap.c | 10 +++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 0f93c76..0a7ecf5 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -43,6 +43,7 @@ typedef struct BitmapImpl { UINT width, height; UINT stride; UINT bpp; + WICPixelFormatGUID pixelformat; } BitmapImpl; typedef struct BitmapLockImpl { @@ -195,9 +196,10 @@ static HRESULT WINAPI BitmapLockImpl_GetDataPointer(IWICBitmapLock *iface, static HRESULT WINAPI BitmapLockImpl_GetPixelFormat(IWICBitmapLock *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); + BitmapLockImpl *This = impl_from_IWICBitmapLock(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + return IWICBitmap_GetPixelFormat(&This->parent->IWICBitmap_iface, pPixelFormat); } static const IWICBitmapLockVtbl BitmapLockImpl_Vtbl = { @@ -272,9 +274,15 @@ static HRESULT WINAPI BitmapImpl_GetSize(IWICBitmap *iface, static HRESULT WINAPI BitmapImpl_GetPixelFormat(IWICBitmap *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + if (!pPixelFormat) + return E_INVALIDARG; + + memcpy(pPixelFormat, &This->pixelformat, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI BitmapImpl_GetResolution(IWICBitmap *iface, @@ -446,6 +454,7 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, This->height = uiHeight; This->stride = stride; This->bpp = bpp; + memcpy(&This->pixelformat, pixelFormat, sizeof(GUID)); *ppIBitmap = &This->IWICBitmap_iface; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index f772e0d..fc45375 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -152,8 +152,8 @@ static void test_createbitmap(void) base_lock_buffer = lock_buffer; hr = IWICBitmapLock_GetPixelFormat(lock, &pixelformat); - todo_wine ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); - todo_wine ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); hr = IWICBitmapLock_GetSize(lock, &width, &height); ok(hr == S_OK, "IWICBitmapLock_GetSize failed hr=%x\n", hr); @@ -228,8 +228,8 @@ static void test_createbitmap(void) ok(lock_buffer == base_lock_buffer+6, "got %p, expected %p+6\n", lock_buffer, base_lock_buffer); hr = IWICBitmapLock_GetPixelFormat(lock, &pixelformat); - todo_wine ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); - todo_wine ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + ok(hr == S_OK, "IWICBitmapLock_GetPixelFormat failed hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); hr = IWICBitmapLock_GetSize(lock, &width, &height); ok(hr == S_OK, "IWICBitmapLock_GetSize failed hr=%x\n", hr); @@ -239,11 +239,11 @@ static void test_createbitmap(void) IWICBitmapLock_Release(lock); } -todo_wine { hr = IWICBitmap_GetPixelFormat(bitmap, &pixelformat); ok(hr == S_OK, "IWICBitmap_GetPixelFormat failed hr=%x\n", hr); ok(IsEqualGUID(&pixelformat, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); +todo_wine { hr = IWICBitmap_GetResolution(bitmap, &dpix, &dpiy); ok(hr == S_OK, "IWICBitmap_GetResolution failed hr=%x\n", hr); ok(dpix == 0.0, "got %f, expected 0.0\n", dpix);

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmap::CopyPixels.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 54a3134194cd2cdfd6ba3362a72bf571c33ea786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a3134194cd2cdfd6ba3362a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 15:36:30 2012 -0500 windowscodecs: Implement IWICBitmap::CopyPixels. --- dlls/windowscodecs/bitmap.c | 8 +++++--- dlls/windowscodecs/tests/bitmap.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 8a03c68..0f93c76 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -300,9 +300,11 @@ static HRESULT WINAPI BitmapImpl_CopyPalette(IWICBitmap *iface, static HRESULT WINAPI BitmapImpl_CopyPixels(IWICBitmap *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + return copy_pixels(This->bpp, This->data, This->width, This->height, + This->stride, prc, cbStride, cbBufferSize, pbBuffer); } static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, @@ -426,7 +428,7 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, datasize = stride * uiHeight; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); - data = HeapAlloc(GetProcessHeap(), 0, datasize); + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); if (!This || !data) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 4de4855..f772e0d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -85,7 +85,7 @@ static void test_createbitmap(void) /* pixel data is initially zeroed */ hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, 27, returned_data); - todo_wine ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); for (i=0; i<27; i++) ok(returned_data[i] == 0, "returned_data[%i] == %i\n", i, returned_data[i]); @@ -193,10 +193,10 @@ static void test_createbitmap(void) /* test that the data we wrote is returned by CopyPixels */ hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, 27, returned_data); - todo_wine ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); for (i=0; i<27; i++) - todo_wine ok(returned_data[i] == bitmap_data[i], "returned_data[%i] == %i\n", i, returned_data[i]); + ok(returned_data[i] == bitmap_data[i], "returned_data[%i] == %i\n", i, returned_data[i]); /* try a valid partial rect, and write mode */ rc.X = 2;

1 0

Józef Kucia : d3dx9: Fix ID3DXConstantTable::SetMatrix .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: b31b9864d92c86ed04b26a7dfb25f4e202233888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31b9864d92c86ed04b26a7df… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:23 2012 +0200 d3dx9: Fix ID3DXConstantTable::SetMatrix. --- dlls/d3dx9_36/shader.c | 36 ++---------------------------------- dlls/d3dx9_36/tests/shader.c | 12 ++++++------ 2 files changed, 8 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 900459e..9482518 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1178,7 +1178,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix); - return ID3DXConstantTable_SetMatrixArray(iface, device, constant, matrix, 1); + return set_matrix_array(iface, device, constant, matrix, 1, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -1186,41 +1186,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable * { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - HRESULT hr; - UINT i, desc_count = 1; - D3DXMATRIX temp; - TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); - hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); - if (FAILED(hr)) - { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); - return D3DERR_INVALIDCALL; - } - - switch (desc.RegisterSet) - { - case D3DXRS_FLOAT4: - /* i * 4 + 3 is the last register we set. The conditional makes sure that we don't access - registers we're not supposed to */ - for (i = 0; i < count && i * 4 + 3 < desc.RegisterCount; i++) - { - if (desc.Class == D3DXPC_MATRIX_ROWS) - temp = matrix[i]; - else - D3DXMatrixTranspose(&temp, &matrix[i]); - - set_float_shader_constant(This, device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); - } - break; - default: - FIXME("Handle other register sets\n"); - return E_NOTIMPL; - } - - return D3D_OK; + return set_matrix_array(iface, device, constant, matrix, count, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 18636d9..8bfea43 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -674,7 +674,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) (int)S(U(fmatrix))._21, (int)S(U(fmatrix))._22, (int)S(U(fmatrix))._23, 0); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f, + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f, "The variable fmatrix3x1 was not set correctly, out={%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3], S(U(fmatrix))._11, S(U(fmatrix))._21, S(U(fmatrix))._31, 0.0f); @@ -700,7 +700,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable c3x3: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 3); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == 0.0f && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == 0.0f && out[3] == 0.0f && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f && out[8] == S(U(fmatrix))._13 && out[9] == S(U(fmatrix))._23 && out[10] == 0.0f && out[11] == 0.0f, "The variable c2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " @@ -716,7 +716,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable r4x4: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 15, out, 2); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == S(U(fmatrix))._13 && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == S(U(fmatrix))._13 && out[3] == 0.0f && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._23 && out[7] == 0.0f, "The variable r2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", @@ -725,7 +725,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._21, S(U(fmatrix))._22, S(U(fmatrix))._23, 0.0f); IDirect3DDevice9_GetVertexShaderConstantF(device, 13, out, 2); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._32 && out[7] == 0.0f, "The variable c3x2 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", @@ -734,7 +734,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._12, S(U(fmatrix))._22, S(U(fmatrix))._32, 0.0f); IDirect3DDevice9_GetVertexShaderConstantF(device, 4, out, 3); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == 0.0f && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == 0.0f && out[3] == 0.0f && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f && out[8] == S(U(fmatrix))._31 && out[9] == S(U(fmatrix))._32 && out[10] == 0.0f && out[11] == 0.0f, "The variable r3x2 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " @@ -745,7 +745,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._31, S(U(fmatrix))._32, 0.0f, 0.0f); IDirect3DDevice9_GetVertexShaderConstantF(device, 10, out, 3); - todo_wine ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._32 && out[7] == 0.0f && out[8] == S(U(fmatrix))._13 && out[9] == S(U(fmatrix))._23 && out[10] == S(U(fmatrix))._33 && out[11] == 0.0f, "The variable c3x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, "

1 0

Józef Kucia : d3dx9: Fix ID3DXConstantTable::SetVector .
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 53ce2a240b0f69f1a301121753d91e3bb61ab422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ce2a240b0f69f1a30112175… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:22 2012 +0200 d3dx9: Fix ID3DXConstantTable::SetVector. --- dlls/d3dx9_36/shader.c | 25 ++----------------------- dlls/d3dx9_36/tests/shader.c | 3 ++- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 4dee641..900459e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1158,38 +1158,17 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, vector); - return ID3DXConstantTable_SetVectorArray(iface, device, constant, vector, 1); + return set_vector_array(iface, device, constant, vector, 1, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, CONST D3DXVECTOR4 *vector, UINT count) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - D3DXCONSTANT_DESC desc; - HRESULT hr; - UINT desc_count = 1; TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, vector, count); - hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); - if (FAILED(hr)) - { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); - return D3DERR_INVALIDCALL; - } - - switch (desc.RegisterSet) - { - case D3DXRS_FLOAT4: - set_float_shader_constant(This, device, desc.RegisterIndex, (float *)vector, - min(desc.RegisterCount, count)); - break; - default: - FIXME("Handle other register sets\n"); - return E_NOTIMPL; - } - - return D3D_OK; + return set_vector_array(iface, device, constant, vector, count, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index a371642..18636d9 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -632,7 +632,8 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetVector failed on variable f: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == f4.x, "The variable f was not set correctly by ID3DXConstantTable_SetVector, got %f, should be %f\n", + ok(out[0] == f4.x && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetVector, got %f, should be %f\n", out[0], f4.x); refcnt = ID3DXConstantTable_Release(ctable);

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXConstantTable::SetValue.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 5fd7d9826c4f7bfe4e1b484374ec7bac7363dcbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd7d9826c4f7bfe4e1b48437… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:21 2012 +0200 d3dx9/tests: Add tests for ID3DXConstantTable::SetValue. --- dlls/d3dx9_36/tests/shader.c | 175 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fd7d9826c4f7bfe4e1b4…

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetValue.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: c2c9959bb820fdf9c27dfb50773dd81a62084455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c9959bb820fdf9c27dfb507… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:20 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetValue. --- dlls/d3dx9_36/shader.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 800622c..4dee641 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -905,6 +905,135 @@ static HRESULT set_scalar_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3D_OK; } +static HRESULT set_vector_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, + UINT count, D3DXPARAMETER_TYPE type) +{ + struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT i, j, desc_count = 1; + float vec[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < min(count, desc.RegisterCount); i++) + { + switch (type) + { + case D3DXPT_FLOAT: + memcpy(vec, ((float *)data) + i * desc.Columns, desc.Columns * sizeof(float)); + break; + case D3DXPT_INT: + for (j = 0; j < desc.Columns; j++) + vec[j] = (float)((int *)data)[i * desc.Columns + j]; + break; + case D3DXPT_BOOL: + for (j = 0; j < desc.Columns; j++) + vec[j] = ((BOOL *)data)[i * desc.Columns + j] ? 1.0f : 0.0f; + break; + default: + FIXME("Unhandled type %#x\n", type); + return D3DERR_INVALIDCALL; + } + + set_float_shader_constant(This, device, desc.RegisterIndex + i, vec, 1); + } + break; + default: + FIXME("Unhandled register set %#x\n", desc.RegisterSet); + return E_NOTIMPL; + } + + return D3D_OK; +} + +static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, + UINT count, D3DXPARAMETER_TYPE type, UINT rows, UINT columns) +{ + struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT registers_per_matrix; + UINT i, j, k, desc_count = 1; + UINT row_offset, column_offset; + FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + return D3DERR_INVALIDCALL; + } + + if (desc.Class == D3DXPC_MATRIX_COLUMNS) + { + column_offset = 4; + row_offset = 1; + registers_per_matrix = desc.Columns; + } + else if (desc.Class == D3DXPC_MATRIX_ROWS) + { + column_offset = 1; + row_offset = 4; + registers_per_matrix = desc.Rows; + } + else + { + FIXME("Unhandled variable class %#x\n", desc.Class); + return D3D_OK; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < count; i++) + { + if (registers_per_matrix * (i + 1) > desc.RegisterCount) + break; + + switch (type) + { + case D3DXPT_FLOAT: + for (j = 0; j < min(desc.Rows, rows); j++) + { + for (k = 0; k < min(desc.Columns, columns); k++) + matrix[j * row_offset + k * column_offset] = ((float *)data)[i * rows * columns + j * columns + k]; + } + break; + case D3DXPT_INT: + for (j = 0; j < min(desc.Rows, rows); j++) + { + for (k = 0; k < min(desc.Columns, columns); k++) + matrix[j * row_offset + k * column_offset] = (float)((int *)data)[i * rows * columns + j * columns + k]; + } + break; + default: + FIXME("Unhandled type %#x", type); + return D3DERR_INVALIDCALL; + } + + set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + } + break; + default: + FIXME("Unhandled register set %#x\n", desc.RegisterSet); + return E_NOTIMPL; + } + + return D3D_OK; +} + static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -932,10 +1061,35 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCVOID data, UINT bytes) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + HRESULT hr; + UINT elements; + UINT count = 1; + D3DXCONSTANT_DESC desc; - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, data, bytes); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, data, bytes); - return E_NOTIMPL; + if (!device || !constant || !data) + return D3DERR_INVALIDCALL; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &count); + if (FAILED(hr)) + return hr; + + elements = bytes / (desc.Bytes / desc.Elements); + + switch (desc.Class) + { + case D3DXPC_SCALAR: + return set_scalar_array(iface, device, constant, data, elements, desc.Type); + case D3DXPC_VECTOR: + return set_vector_array(iface, device, constant, data,elements, desc.Type); + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + return set_matrix_array(iface, device, constant, data, elements, desc.Type, desc.Rows, desc.Columns); + default: + FIXME("Unhandled parameter class %#x", desc.Class); + return D3DERR_INVALIDCALL; + } } static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Józef Kucia : d3dx9/tests: Add tests for setting matrix shader constants.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 6fff4b9e872a486a9e4ba44782e31eb1ae16788f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fff4b9e872a486a9e4ba4478… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:19 2012 +0200 d3dx9/tests: Add tests for setting matrix shader constants. --- dlls/d3dx9_36/tests/shader.c | 174 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fff4b9e872a486a9e4ba…

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetBoolArray.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: fbba743484a00bc55e74e35c2081e23acdbdd9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbba743484a00bc55e74e35c2… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:18 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetBoolArray. --- dlls/d3dx9_36/shader.c | 4 ++-- dlls/d3dx9_36/tests/shader.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 350b83a..800622c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -953,9 +953,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *if { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, b, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, b, count); - return E_NOTIMPL; + return set_scalar_array(iface, device, constant, b, count, D3DXPT_BOOL); } static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index bdccb96..91001be 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -621,6 +621,7 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) static const D3DXVECTOR4 fvecarray[2] = { {0.745f, 0.997f, 0.353f, 0.237f}, {0.060f, 0.455f, 0.333f, 0.983f}}; + static BOOL barray[4] = {FALSE, 100, TRUE, TRUE}; ID3DXConstantTable *ctable; @@ -672,6 +673,9 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) res = ID3DXConstantTable_SetMatrixArray(ctable, device, "fmtxarray", fmtxarray, 2); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixArray failed: got 0x%08x\n", res); + res = ID3DXConstantTable_SetBoolArray(ctable, device, "barray", barray, 2); + ok(res == D3D_OK, "ID3DXConstantTable_SetBoolArray failed: got 0x%08x\n", res); + /* Read back constants */ IDirect3DDevice9_GetVertexShaderConstantF(device, 8, out, 4); ok(out[0] == farray[0] && out[4] == farray[1] && out[8] == farray[2] && out[12] == farray[3], @@ -686,6 +690,13 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) fvecarray[0].x, fvecarray[0].y, fvecarray[0].z, fvecarray[0].w, fvecarray[1].x, fvecarray[1].y, fvecarray[1].z, fvecarray[1].w); + IDirect3DDevice9_GetVertexShaderConstantF(device, 14, out, 2); + ok(out[0] == 0.0f && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f + && out[4] == 1.0f && out[5] == 0.0f && out[6] == 0.0f && out[7] == 0.0f, + "The variable barray was not set correctly, out={%f, %f %f, %f; %f, %f, %f, %f}, should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], + 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f); + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 8); /* Just check a few elements in each matrix to make sure fmtxarray was set row-major */ ok(out[0] == S(U(fmtxarray[0]))._11 && out[1] == S(U(fmtxarray[0]))._12 && out[2] == S(U(fmtxarray[0]))._13 && out[3] == S(U(fmtxarray[0]))._14,

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetBool.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: d2bbbc712e47a77dc062c73c4ebc30cb4888a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bbbc712e47a77dc062c73c4… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Aug 16 17:21:17 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetBool. --- dlls/d3dx9_36/shader.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 728bff2..350b83a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -857,7 +857,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant return NULL; } -static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, const void *data, +static HRESULT set_scalar_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, UINT count, D3DXPARAMETER_TYPE type) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -876,7 +876,7 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi switch (desc.RegisterSet) { case D3DXRS_FLOAT4: - for (i = 0; i < count && i < desc.RegisterCount; i++) + for (i = 0; i < min(count, desc.RegisterCount); i++) { /* We need the for loop since each IDirect3DDevice9_Set*ShaderConstantF expects a float4 */ switch(type) @@ -887,8 +887,11 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi case D3DXPT_INT: row[0] = (float)((int *)data)[i]; break; + case D3DXPT_BOOL: + row[0] = ((BOOL *)data)[i] ? 1.0f : 0.0f; + break; default: - FIXME("Unhandled type passed to set_float_array\n"); + FIXME("Unhandled type %#x\n", type); return D3DERR_INVALIDCALL; } set_float_shader_constant(This, device, desc.RegisterIndex + i, row, 1); @@ -940,9 +943,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable *iface, { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %d): stub\n", This, device, constant, b); + TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, b); - return E_NOTIMPL; + return set_scalar_array(iface, device, constant, &b, 1, D3DXPT_BOOL); } static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -961,7 +964,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, L TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, n); - return ID3DXConstantTable_SetIntArray(iface, device, constant, &n, 1); + return set_scalar_array(iface, device, constant, &n, 1, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -971,7 +974,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *ifa TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, n, count); - return set_float_array(iface, device, constant, n, count, D3DXPT_INT); + return set_scalar_array(iface, device, constant, n, count, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -981,7 +984,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, TRACE("(%p)->(%p, %p, %f)\n", This, device, constant, f); - return ID3DXConstantTable_SetFloatArray(iface, device, constant, &f, 1); + return set_scalar_array(iface, device, constant, &f, 1, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -991,7 +994,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *i TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, f, count); - return set_float_array(iface, device, constant, f, count, D3DXPT_FLOAT); + return set_scalar_array(iface, device, constant, f, count, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Alexandre Julliard : msvcr100: Add the 64-bit variants of the C++ exported names.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 98fe3f1d817366b6f27595d0398fba99e7a8b1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fe3f1d817366b6f27595d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 19:32:59 2012 +0200 msvcr100: Add the 64-bit variants of the C++ exported names. --- dlls/msvcr100/msvcr100.spec | 545 +++++++++++++++++++++++++++++-------------- 1 files changed, 364 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98fe3f1d817366b6f2759…

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
55
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 August 2012