August 2007 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: GL_SRC_ALPHA_SATURATE is supported as src blend param only.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 06cc0fa95fcca3805bdbfb99475f0d09758385e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cc0fa95fcca3805bdbfb994… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 12 21:38:24 2007 +0200 wined3d: GL_SRC_ALPHA_SATURATE is supported as src blend param only. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/state.c | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3889554..b294004 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1945,9 +1945,11 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPBLENDCAPS_INVSRCCOLOR | WINED3DPBLENDCAPS_ONE | WINED3DPBLENDCAPS_SRCALPHA | - WINED3DPBLENDCAPS_SRCALPHASAT | WINED3DPBLENDCAPS_SRCCOLOR | WINED3DPBLENDCAPS_ZERO; + /* NOTE: WINED3DPBLENDCAPS_SRCALPHASAT is not supported as dest blend factor, + * according to the glBlendFunc manpage + */ *pCaps->AlphaCmpCaps = WINED3DPCMPCAPS_ALWAYS | WINED3DPCMPCAPS_EQUAL | diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 82cb90e..9a768d1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -285,7 +285,11 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D case WINED3DBLEND_INVDESTALPHA : dstBlend = GL_ONE_MINUS_DST_ALPHA; break; case WINED3DBLEND_DESTCOLOR : dstBlend = GL_DST_COLOR; break; case WINED3DBLEND_INVDESTCOLOR : dstBlend = GL_ONE_MINUS_DST_COLOR; break; - case WINED3DBLEND_SRCALPHASAT : dstBlend = GL_SRC_ALPHA_SATURATE; break; + + case WINED3DBLEND_SRCALPHASAT : + dstBlend = GL_SRC_ALPHA_SATURATE; + WARN("Application uses SRCALPHASAT as dest blend factor, expect problems\n"); + break; case WINED3DBLEND_BOTHSRCALPHA : dstBlend = GL_SRC_ALPHA; srcBlend = GL_SRC_ALPHA;

1 0

Stefan Dösinger : wined3d: Catch transformed position data that appears at offset 0.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 581664c006066855268fe33a7142fc7c48b7c80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=581664c006066855268fe33a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 12 21:34:51 2007 +0200 wined3d: Catch transformed position data that appears at offset 0. --- dlls/wined3d/vertexbuffer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 7d0071e..bd599c4 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -235,7 +235,8 @@ inline BOOL WINAPI IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T */ if( /* Position transformed vs untransformed */ ((This->strided.u.s.position_transformed || strided.u.s.position_transformed) && - This->strided.u.s.position.lpData != strided.u.s.position.lpData) || + (This->strided.u.s.position.lpData != strided.u.s.position.lpData || + This->strided.u.s.position.dwType != strided.u.s.position.dwType)) || /* Diffuse position and data type */ This->strided.u.s.diffuse.lpData != strided.u.s.diffuse.lpData || This->strided.u.s.diffuse.dwStride != strided.u.s.diffuse.dwStride || This->strided.u.s.diffuse.dwType != strided.u.s.diffuse.dwType ||

1 0

Stefan Dösinger : wined3d: Fix R32F and R16F.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 86b991c8515c9da190fdbf95ed0c24685b4b6083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b991c8515c9da190fdbf95e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 12 16:24:29 2007 +0200 wined3d: Fix R32F and R16F. --- dlls/d3d9/tests/visual.c | 69 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 63 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++- 3 files changed, 135 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cc13413..6807fc8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1564,6 +1564,74 @@ static void release_buffer_test(IDirect3DDevice9 *device) IDirect3DVertexBuffer9_Release(vb); } +static void float_texture_test(IDirect3DDevice9 *device) +{ + IDirect3D9 *d3d = NULL; + HRESULT hr; + IDirect3DTexture9 *texture = NULL; + D3DLOCKED_RECT lr; + float *data; + DWORD color; + float quad[] = { + -1.0, -1.0, 0.1, 0.0, 0.0, + -1.0, 1.0, 0.1, 0.0, 1.0, + 1.0, -1.0, 0.1, 1.0, 0.0, + 1.0, 1.0, 0.1, 1.0, 1.0, + }; + + memset(&lr, 0, sizeof(lr)); + IDirect3DDevice9_GetDirect3D(device, &d3d); + if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, + D3DRTYPE_TEXTURE, D3DFMT_R32F) != D3D_OK) { + skip("D3DFMT_R32F textures not supported\n"); + goto out; + } + + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_R32F, + D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %s\n", DXGetErrorString9(hr)); + if(!texture) { + skip("Failed to create R32F texture\n"); + goto out; + } + + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed with %s\n", DXGetErrorString9(hr)); + data = lr.pBits; + *data = 0.0; + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr)); + } + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + color = getPixelColor(device, 240, 320); + ok(color == 0x0000FFFF, "R32F with value 0.0 has color %08x, expected 0x0000FFFF\n", color); + +out: + if(texture) IDirect3DTexture9_Release(texture); + IDirect3D9_Release(d3d); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -1639,6 +1707,7 @@ START_TEST(visual) } offscreen_test(device_ptr); release_buffer_test(device_ptr); + float_texture_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ba1dec..58b4ed6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1607,6 +1607,30 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 2; break; + case WINED3DFMT_R32F: + /* Can be loaded in theory with fmt=GL_RED, type=GL_FLOAT, but this fails. The reason + * is that D3D expects the undefined green, blue and alpha channels to return 1.0 + * when sampling, but OpenGL sets green and blue to 0.0 instead. Thus we have to inject + * 1.0 instead. + * + * The alpha channel defaults to 1.0 in opengl, so nothing has to be done about it. + */ + *convert = CONVERT_R32F; + *format = GL_RGB; + *internal = GL_RGB32F_ARB; + *type = GL_FLOAT; + *target_bpp = 12; + break; + + case WINED3DFMT_R16F: + /* Simmilar to R32F */ + *convert = CONVERT_R16F; + *format = GL_RGB; + *internal = GL_RGB16F_ARB; + *type = GL_HALF_FLOAT_ARB; + *target_bpp = 6; + break; + default: break; } @@ -1810,6 +1834,45 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN } break; } + + case CONVERT_R32F: + { + unsigned int x, y; + float *Source; + float *Dest; + for(y = 0; y < height; y++) { + Source = (float *) (src + y * pitch); + Dest = (float *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + float color = (*Source++); + Dest[0] = color; + Dest[1] = 1.0; + Dest[2] = 1.0; + Dest += 3; + } + } + break; + } + + case CONVERT_R16F: + { + unsigned int x, y; + WORD *Source; + WORD *Dest; + WORD one = 0x3c00; + for(y = 0; y < height; y++) { + Source = (WORD *) (src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + WORD color = (*Source++); + Dest[0] = color; + Dest[1] = one; + Dest[2] = one; + Dest += 3; + } + } + break; + } default: ERR("Unsupported conversation type %d\n", convert); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3110ce2..29bd24d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1233,7 +1233,9 @@ typedef enum { CONVERT_X8L8V8U8, CONVERT_Q8W8V8U8, CONVERT_V16U16, - CONVERT_A4L4 + CONVERT_A4L4, + CONVERT_R32F, + CONVERT_R16F } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode);

1 0

Stefan Dösinger : wined3d: Simplify IWineD3DBaseTextureImpl_ApplyStateChanges.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: b728ff0f557293b654c8006ef2cce524aa622b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b728ff0f557293b654c8006ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 12 13:37:17 2007 +0200 wined3d: Simplify IWineD3DBaseTextureImpl_ApplyStateChanges. --- dlls/wined3d/basetexture.c | 259 +++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 5 - 2 files changed, 111 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b728ff0f557293b654c80…

1 0

Juan Lang : crypt32: Move file store to a separate file.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 71dffcee843fc26f98ed36ed8e38ae2aba2cb1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71dffcee843fc26f98ed36ed8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 16 10:54:52 2007 -0700 crypt32: Move file store to a separate file. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_private.h | 6 + dlls/crypt32/filestore.c | 270 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 244 ------------------------------------ 4 files changed, 277 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71dffcee843fc26f98ed3…

1 0

Stefan Dösinger : wined3d: Enable WINED3DSAMP_BORDERCOLOR.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 67465540999bfc37b7c0406517fc74a0e26df1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67465540999bfc37b7c040651… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 12 13:36:06 2007 +0200 wined3d: Enable WINED3DSAMP_BORDERCOLOR. --- dlls/wined3d/basetexture.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 719424f..996a622 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -30,8 +30,7 @@ static const Wined3dTextureStateMap textureObjectSamplerStates[] = { {WINED3DSAMP_ADDRESSU, WINED3DSAMP_ADDRESSU}, {WINED3DSAMP_ADDRESSV, WINED3DSAMP_ADDRESSV}, {WINED3DSAMP_ADDRESSW, WINED3DSAMP_ADDRESSW}, -/* NOTE: Sometimes it's a good idea to disable the setting of border colour, e.g. Axis and Allies */ - {WINED3DSAMP_BORDERCOLOR, WINED3DFUNC_NOTSUPPORTED/* WINED3DSAMP_BORDERCOLOR */}, + {WINED3DSAMP_BORDERCOLOR, WINED3DSAMP_BORDERCOLOR}, {WINED3DSAMP_MAGFILTER, WINED3DSAMP_MAGFILTER}, {WINED3DSAMP_MINFILTER, WINED3DSAMP_MINFILTER}, {WINED3DSAMP_MIPFILTER, WINED3DSAMP_MIPFILTER},

1 0

Juan Lang : crypt32: Move collection stores to a separate file.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 9f85156e23c808bc8beff9f32dbfdf2dc7280116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f85156e23c808bc8beff9f32… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 16 10:49:33 2007 -0700 crypt32: Move collection stores to a separate file. --- dlls/crypt32/Makefile.in | 7 +- dlls/crypt32/collectionstore.c | 481 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32_private.h | 7 + dlls/crypt32/store.c | 459 +-------------------------------------- 4 files changed, 494 insertions(+), 460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f85156e23c808bc8beff…

1 0

Juan Lang : crypt32: Move provider stores to a separate file.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 131f1d20e717aacf75c5213ae2fbd0d2d880af34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131f1d20e717aacf75c5213ae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 16 10:50:33 2007 -0700 crypt32: Move provider stores to a separate file. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_private.h | 6 + dlls/crypt32/provstore.c | 303 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 276 ------------------------------------ 4 files changed, 310 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=131f1d20e717aacf75c52…

1 0

Juan Lang : crypt32: Move registry stores to a separate file.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 0070d8226fc1a075b1056abf7596335a654719ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0070d8226fc1a075b1056abf7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 16 10:54:03 2007 -0700 crypt32: Move registry stores to a separate file. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_private.h | 3 + dlls/crypt32/regstore.c | 543 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 516 +------------------------------------- 4 files changed, 548 insertions(+), 515 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0070d8226fc1a075b1056…

1 0

Juan Lang : crypt32: Use public APIs to empty a store.
by Alexandre Julliard 17 Aug '07

17 Aug '07

Module: wine Branch: master Commit: 6aa10439a9b0dcf28f02097f47b2a9f7ee01abc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa10439a9b0dcf28f02097f4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 16 10:43:35 2007 -0700 crypt32: Use public APIs to empty a store. --- dlls/crypt32/store.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 07b5448..14a6631 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -317,10 +317,21 @@ static BOOL CRYPT_MemDeleteCrl(PWINECRYPT_CERTSTORE store, void *pCrlContext) return TRUE; } -static void CRYPT_MemEmptyStore(PWINE_MEMSTORE store) +static void CRYPT_EmptyStore(HCERTSTORE store) { - ContextList_Empty(store->certs); - ContextList_Empty(store->crls); + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + + do { + cert = CertEnumCertificatesInStore(store, NULL); + if (cert) + CertDeleteCertificateFromStore(cert); + } while (cert); + do { + crl = CertEnumCRLsInStore(store, NULL); + if (crl) + CertDeleteCRLFromStore(crl); + } while (crl); } static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) @@ -1359,7 +1370,7 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, { case CERT_STORE_CTRL_RESYNC: CRYPT_RegFlushStore(store, FALSE); - CRYPT_MemEmptyStore((PWINE_MEMSTORE)store->memStore); + CRYPT_EmptyStore(store->memStore); CRYPT_RegReadFromReg(store); ret = TRUE; break; @@ -1758,7 +1769,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, switch (dwCtrlType) { case CERT_STORE_CTRL_RESYNC: - CRYPT_MemEmptyStore((PWINE_MEMSTORE)store->memStore); + CRYPT_EmptyStore(store->memStore); CRYPT_ReadSerializedFile(store->file, store); ret = TRUE; break;

1 0