wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Juan Lang : wininet: Fix another typo.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: a1ab4a7effcaa41a3a6cb2b607d2466f7c30121a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ab4a7effcaa41a3a6cb2b60… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 14:45:06 2007 -0800 wininet: Fix another typo. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 328e151..0a23979 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3203,7 +3203,7 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer) * */ -#define COALESCEFLASG (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) +#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR value, DWORD dwModifier) { @@ -3272,7 +3272,7 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v return TRUE; } - else if (dwModifier & COALESCEFLASG) + else if (dwModifier & COALESCEFLAGS) { LPWSTR lpsztmp; WCHAR ch = 0;

1 0

Juan Lang : wininet: Fix typo.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: b210e3a751cf3e505d5a82450c89c42a8ed9ccc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b210e3a751cf3e505d5a82450… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 14:34:49 2007 -0800 wininet: Fix typo. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a316fa4..328e151 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -245,7 +245,7 @@ static void HTTP_FixURL( LPWININETHTTPREQW lpwhr) } if(CSTR_EQUAL != CompareStringW( LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - lpwhr->lpszPath, strlenW(szHttp), szHttp, strlenW(szHttp) ) + lpwhr->lpszPath, strlenW(lpwhr->lpszPath), szHttp, strlenW(szHttp) ) && lpwhr->lpszPath[0] != '/') /* not an absolute path ?? --> fix it !! */ { WCHAR *fixurl = HeapAlloc(GetProcessHeap(), 0,

1 0

Lei Zhang : wininet: Initialize ftp sockets.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: f727e56d6d330b5ed5103f4d93d25d529c792bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f727e56d6d330b5ed5103f4d9… Author: Lei Zhang <thestig(a)google.com> Date: Wed Nov 7 22:33:21 2007 -0800 wininet: Initialize ftp sockets. --- dlls/wininet/ftp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 8c0cc5d..39fbc90 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2049,6 +2049,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, lpwfs->hdr.destroy = FTP_CloseSessionHandle; lpwfs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; lpwfs->download_in_progress = NULL; + lpwfs->sndSocket = -1; + lpwfs->lstnSocket = -1; + lpwfs->pasvSocket = -1; WININET_AddRef( &hIC->hdr ); lpwfs->lpAppInfo = hIC;

1 0

Andrew Talbot : urlmon: Constify some variables.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 509760922aa59a22606497f01a506f10c9a2e4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=509760922aa59a22606497f01… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 7 21:11:10 2007 +0000 urlmon: Constify some variables. --- dlls/urlmon/format.c | 4 ++-- dlls/urlmon/http.c | 2 +- dlls/urlmon/umon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index 0a0a97d..fdc0083 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -43,7 +43,7 @@ typedef struct { LONG ref; } EnumFORMATETC; -static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, FORMATETC *rgfmtetc, UINT it); +static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it); #define ENUMF_THIS(iface) ICOM_THIS_MULTI(EnumFORMATETC, lpEnumFORMATETCVtbl, iface) @@ -158,7 +158,7 @@ static const IEnumFORMATETCVtbl EnumFORMATETCVtbl = { EnumFORMATETC_Clone }; -static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, FORMATETC *rgfmtetc, UINT it) +static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it) { EnumFORMATETC *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFORMATETC)); diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 89bdec3..46243e6 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -228,7 +228,7 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( IInternetProtocolSink_ReportProgress(This->protocol_sink, ulStatusCode, (LPWSTR)lpvStatusInformation); } -static inline LPWSTR strndupW(LPWSTR string, int len) +static inline LPWSTR strndupW(LPCWSTR string, int len) { LPWSTR ret = NULL; if (string && diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 9d17afa..9cf1af3 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -183,7 +183,7 @@ static void Binding_CloseCacheDownload(Binding *This) This->pstrCache = 0; } -static HRESULT Binding_MoreCacheData(Binding *This, char *buf, DWORD dwBytes) +static HRESULT Binding_MoreCacheData(Binding *This, const char *buf, DWORD dwBytes) { DWORD written;

1 0

Andrew Talbot : twain_32: Constify a variable.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 76255835019ecd3b9c398d4c05464d0221ec4044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76255835019ecd3b9c398d4c0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 7 21:11:07 2007 +0000 twain_32: Constify a variable. --- dlls/twain_32/twain32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index b7db5d2..c04e9cf 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); /* A helper function that looks up a destination identity in the active source list */ -static activeDS *TWAIN_LookupSource (pTW_IDENTITY pDest) +static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest) { activeDS *pSource;

1 0

Stefan Dösinger : wined3d: Pass surface dirtification to the container.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 24ee003bfec32b6e02b738cb8e817539c1130f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ee003bfec32b6e02b738cb8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 3 16:41:13 2007 +0100 wined3d: Pass surface dirtification to the container. --- dlls/wined3d/surface.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b25d18..1ee7b6f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3439,6 +3439,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DWORD flag, BOOL persistent) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DBaseTexture *texture; TRACE("(%p)->(%s, %s)\n", iface, flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", @@ -3446,9 +3447,23 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW /* TODO: For offscreen textures with fbo offscreen rendering the drawable is the same as the texture.*/ if(persistent) { + if((This->Flags & SFLAG_INTEXTURE) && !(flag & SFLAG_INTEXTURE)) { + if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) { + TRACE("Passing to container\n"); + IWineD3DBaseTexture_SetDirty(texture, TRUE); + IWineD3DBaseTexture_Release(texture); + } + } This->Flags &= ~SFLAG_LOCATIONS; This->Flags |= flag; } else { + if((This->Flags & SFLAG_INTEXTURE) && (flag & SFLAG_INTEXTURE)) { + if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) { + TRACE("Passing to container\n"); + IWineD3DBaseTexture_SetDirty(texture, TRUE); + IWineD3DBaseTexture_Release(texture); + } + } This->Flags &= ~flag; } }

1 0

Stefan Dösinger : d3d9: Be less picky in the D3DFMT_X8L8V8U8 test.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 4454096db27e7560cce99367b45be3b24dd0894a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4454096db27e7560cce99367b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 00:11:19 2007 +0100 d3d9: Be less picky in the D3DFMT_X8L8V8U8 test. --- dlls/d3d9/tests/visual.c | 103 ++++++++++++++++------------------------------ 1 files changed, 35 insertions(+), 68 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6362b5c..2214783 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -323,13 +323,13 @@ typedef struct { } test_data_t; /* - * c7 mova ARGB mov ARGB - * -2.4 -2 0x00ffff00 -3 0x00ff0000 - * -1.6 -2 0x00ffff00 -2 0x00ffff00 - * -0.4 0 0x0000ffff -1 0x0000ff00 - * 0.4 0 0x0000ffff 0 0x0000ffff - * 1.6 2 0x00ff00ff 1 0x000000ff - * 2.4 2 0x00ff00ff 2 0x00ff00ff + * c7 rounded ARGB + * -2.4 -2 0x00ffff00 + * -1.6 -2 0x00ffff00 + * -0.4 0 0x0000ffff + * 0.4 0 0x0000ffff + * 1.6 2 0x00ff00ff + * 2.4 2 0x00ff00ff */ static void test_mova(IDirect3DDevice9 *device) { @@ -348,39 +348,14 @@ static void test_mova(IDirect3DDevice9 *device) 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ 0x0000ffff /* END */ }; - static const DWORD mov_test[] = { - 0xfffe0101, /* vs_1_1 */ - 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ - 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ - 0x00000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, /* def c1, 1.0, 1.0, 0.0, 1.0 */ - 0x00000051, 0xa00f0002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, /* def c2, 0.0, 1.0, 0.0, 1.0 */ - 0x00000051, 0xa00f0003, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c3, 0.0, 1.0, 1.0, 1.0 */ - 0x00000051, 0xa00f0004, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, /* def c4, 0.0, 0.0, 1.0, 1.0 */ - 0x00000051, 0xa00f0005, 0x3f800000, 0x00000000, 0x3f800000, 0x3f800000, /* def c5, 1.0, 0.0, 1.0, 1.0 */ - 0x00000051, 0xa00f0006, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c6, 1.0, 1.0, 1.0, 1.0 */ - 0x00000001, 0xb0010000, 0xa0000007, /* mov a0.x, c7.x */ - 0x00000001, 0xd00f0000, 0xa0e42003, /* mov oD0, c[a0.x + 3] */ - 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x0000ffff /* END */ - }; - static const test_data_t test_data[2][6] = { - { - {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff0000}, - {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ff00}, - {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x000000ff}, - {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} - }, - { - {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, - {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} - } + static const test_data_t test_data[] = { + {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, + {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} }; static const float quad[][3] = { @@ -397,51 +372,43 @@ static void test_mova(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DVertexShader9 *mova_shader = NULL; - IDirect3DVertexShader9 *mov_shader = NULL; HRESULT hr; - int i, j; + int i; hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_CreateVertexShader(device, mov_test, &mov_shader); - ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, mov_shader); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - for(j = 0; j < 2; ++j) + for (i = 0; i < (sizeof(test_data) / sizeof(test_data_t)); ++i) { - for (i = 0; i < (sizeof(test_data[0]) / sizeof(test_data_t)); ++i) - { - DWORD color; + DWORD color; - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[j][i].in, 1); - ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[i].in, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); - ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == test_data[j][i].out, "Expected color %08x, got %08x (for input %f, instruction %s)\n", - test_data[j][i].out, color, test_data[j][i].in[0], j == 0 ? "mov" : "mova"); + color = getPixelColor(device, 320, 240); + ok(color == test_data[i].out, "Expected color %08x, got %08x (for input %f)\n", test_data[i].out, color, test_data[i].in[0]); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); - ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); - } - hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); } hr = IDirect3DDevice9_SetVertexShader(device, NULL); @@ -2839,7 +2806,7 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); color = getPixelColor(device, 578, 430); - ok(color == 0x008262ca, "D3DFMT_X8L8V8U8 = 0x112131ca returns color %08x, expected 0x008262ca\n", color); + ok(color == 0x008262ca || color == 0x008363ca, "D3DFMT_X8L8V8U8 = 0x112131ca returns color %08x, expected 0x008262ca\n", color); hr = IDirect3DDevice9_SetPixelShader(device, shader2); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed (%08x)\n", hr);

1 0

Stefan Dösinger : wined3d: Get rid of the conditionals in shader_glsl_compare.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 98b291192f2b2579502f17d4c161fe1a18aa4966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b291192f2b2579502f17d4c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 5 23:13:00 2007 +0100 wined3d: Get rid of the conditionals in shader_glsl_compare. --- dlls/wined3d/glsl_shader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 46f87aa..0dfcccd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1563,17 +1563,17 @@ void shader_glsl_compare(SHADER_OPCODE_ARG* arg) { shader_addline(arg->buffer, "vec%d(%s(%s, %s)));\n", mask_size, compare, src0_param.param_str, src1_param.param_str); } else { - const char *compare; - switch(arg->opcode->opcode) { - case WINED3DSIO_SLT: compare = "<"; break; - case WINED3DSIO_SGE: compare = ">="; break; - default: compare = ""; + case WINED3DSIO_SLT: + shader_addline(arg->buffer, "step(%s, %s));\n", src0_param.param_str, src1_param.param_str); + break; + case WINED3DSIO_SGE: + shader_addline(arg->buffer, "step(%s, %s));\n", src1_param.param_str, src0_param.param_str); + break; + default: FIXME("Can't handle opcode %s\n", arg->opcode->name); } - shader_addline(arg->buffer, "(%s %s %s) ? 1.0 : 0.0);\n", - src0_param.param_str, compare, src1_param.param_str); } }

1 0

Stefan Dösinger : wined3d: Take care for client storage and pbos.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: ed937c6ad4966f57e2e19892c5decd73e180159d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed937c6ad4966f57e2e19892c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 3 16:24:55 2007 +0100 wined3d: Take care for client storage and pbos. --- dlls/wined3d/surface.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4aa386f..7b25d18 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -200,11 +200,6 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { FIXME("Using DXT1/3/5 without advertized support\n"); } else { - if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { - /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ - This->Flags |= SFLAG_CLIENT; - } - /* glCompressedTexSubImage2D for uploading and glTexImage2D for allocating does not work well on some drivers(r200 dri, MacOS ATI driver) * glCompressedTexImage2D does not accept NULL pointers. So for compressed textures surface_allocate_surface does nothing, and this * function uses glCompressedTexImage2D instead of the SubImage call @@ -256,6 +251,7 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, GLsizei width, GLsizei height, GLenum format, GLenum type) { BOOL enable_client_storage = FALSE; + BYTE *mem = NULL; TRACE("(%p) : Creating surface (target %#x) level %d, d3d format %s, internal format %#x, width %d, height %d, gl format %#x, gl type=%#x\n", This, This->glDescription.target, This->glDescription.level, debug_d3dformat(This->resource.format), internal, width, height, format, type); @@ -265,6 +261,18 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { /* glCompressedTexImage2D does not accept NULL pointers, so we cannot allocate a compressed texture without uploading data */ TRACE("Not allocating compressed surfaces, surface_upload_data will specify them\n"); + + /* We have to point GL to the client storage memory here, because upload_data might use a PBO. This means a double upload + * once, unfortunately + */ + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ + This->Flags |= SFLAG_CLIENT; + mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, + width, height, 0 /* border */, This->resource.size, mem)); + } + return; } @@ -285,11 +293,14 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, enable_client_storage = TRUE; } else { This->Flags |= SFLAG_CLIENT; - /* Below point opengl to our allocated texture memory */ + + /* Point opengl to our allocated texture memory. Do not use resource.allocatedMemory here because + * it might point into a pbo. Instead use heapMemory, but get the alignment right. + */ + mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); } } - glTexImage2D(This->glDescription.target, This->glDescription.level, internal, width, height, 0, format, type, - This->Flags & SFLAG_CLIENT ? This->resource.allocatedMemory : NULL); + glTexImage2D(This->glDescription.target, This->glDescription.level, internal, width, height, 0, format, type, mem); checkGLcall("glTexImage2D"); if(enable_client_storage) { @@ -751,16 +762,20 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { checkGLcall("glBindBufferARB"); /* We don't need the system memory anymore and we can't even use it for PBOs */ - HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); + if(!(This->Flags & SFLAG_CLIENT)) { + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); + This->resource.heapMemory = NULL; + } This->resource.allocatedMemory = NULL; - This->resource.heapMemory = NULL; This->Flags |= SFLAG_PBO; LEAVE_GL(); } else if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, * or a pbo to map */ - This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); + if(!This->resource.heapMemory) { + This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); + } This->resource.allocatedMemory = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); if(This->Flags & SFLAG_INSYSMEM) {

1 0

Stefan Dösinger : wined3d: Honor the driver' s min point size.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 5ffea6e5916ffd6d8aeade5fa28c6db8e069e7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffea6e5916ffd6d8aeade5fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 3 15:39:22 2007 +0100 wined3d: Honor the driver's min point size. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 14 +++++++++----- include/wine/wined3d_gl.h | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ccc47b..cff6550 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -641,6 +641,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Maximum texture size support - max texture size=%d\n", gl_max); glGetFloatv(GL_POINT_SIZE_RANGE, gl_floatv); + gl_info->max_pointsizemin = gl_floatv[0]; gl_info->max_pointsize = gl_floatv[1]; TRACE_(d3d_caps)("Maximum point size support - max point size=%f\n", gl_floatv[1]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7e847c9..251e77f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1312,14 +1312,18 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 GLfloat scaleFactor; float h = stateblock->viewport.Height; - if(pointSize.f < 1.0f) { + if(pointSize.f < GL_LIMITS(pointsizemin)) { /* - * Minimum valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. - * This means that OpenGL will clamp really small point sizes to 1.0f. - * To correct for this we need to multiply by the scale factor when sizes + * Minimum valid point size for OpenGL is driver specific. For Direct3D it is + * 0.0f. This means that OpenGL will clamp really small point sizes to the + * driver minimum. To correct for this we need to multiply by the scale factor when sizes * are less than 1.0f. scale_factor = 1.0f / point_size. */ - scaleFactor = pointSize.f; + scaleFactor = pointSize.f / GL_LIMITS(pointsizemin); + /* Clamp the point size, don't rely on the driver to do it. MacOS says min point size + * is 1.0, but then accepts points below that and draws too small points + */ + pointSize.f = GL_LIMITS(pointsizemin); } else if(pointSize.f > GL_LIMITS(pointsize)) { /* gl already scales the input to glPointSize, * d3d scales the result after the point size scale. diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 7fbe25c..1c316e9 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1137,6 +1137,7 @@ void (WINE_GLAPI *glVertex4s) (GLshort x, GLshort y, GLshort z, GLshort w); void (WINE_GLAPI *glVertex4sv) (const GLshort* v); void (WINE_GLAPI *glVertexPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid* pointer); void (WINE_GLAPI *glViewport) (GLint x, GLint y, GLsizei width, GLsizei height); +void (WINE_GLAPI *glPointParameterfv) (GLenum pname, const GLfloat *params); /* WGL functions */ HGLRC (WINAPI *pwglCreateContext)(HDC); @@ -1483,7 +1484,8 @@ BOOL (WINAPI *pwglShareLists)(HGLRC,HGLRC); USE_GL_FUNC(glVertex4s) \ USE_GL_FUNC(glVertex4sv) \ USE_GL_FUNC(glVertexPointer) \ - USE_GL_FUNC(glViewport) + USE_GL_FUNC(glViewport) \ + USE_GL_FUNC(glPointParameterfv) \ #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ @@ -3719,7 +3721,7 @@ typedef struct _WineD3D_GL_Info { UINT max_clipplanes; UINT max_texture_size; UINT max_texture3d_size; - float max_pointsize; + float max_pointsize, max_pointsizemin; UINT max_blends; UINT max_anisotropy; UINT max_aux_buffers;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
76
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 November 2007