March 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add a state table entry for WINED3DRS_TWEENFACTOR.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: a298f37a9ab8bb9db584eb8b5a04c526e16d01f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a298f37a9ab8bb9db584eb8b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:29:01 2010 +0200 wined3d: Add a state table entry for WINED3DRS_TWEENFACTOR. --- dlls/wined3d/state.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d3be2c5..f7e6f13 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5413,6 +5413,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_w }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_TWEENFACTOR), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }, WINED3D_GL_EXT_NONE }, + /* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported, * so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states. * otherwise, register sampler_texmatrix, which takes care of updating the texture matrix

1 0

André Hentschel : loader/manpages: Replace all occurrence of bugs.sgml.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 68632904f611993272c8fdc598abf2dbe649562b URL: http://source.winehq.org/git/wine.git/?a=commit;h=68632904f611993272c8fdc59… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 31 16:08:03 2010 +0200 loader/manpages: Replace all occurrence of bugs.sgml. --- loader/wine.de.man.in | 4 ++-- loader/wine.fr.man.in | 4 ++-- loader/wine.man.in | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/loader/wine.de.man.in b/loader/wine.de.man.in index 7ead4a4..888c77c 100644 --- a/loader/wine.de.man.in +++ b/loader/wine.de.man.in @@ -286,8 +286,8 @@ Statusberichte für viele Anwendungen sind unter Fehler können unter .I http://bugs.winehq.org gemeldet werden. Wenn Sie einen Fehler melden möchten, lesen Sie -bitte vorher die Datei -.I documentation/bugs.sgml +bitte vorher +.I http://wiki.winehq.org/Bugs im .B wine -Quellcode, um zu sehen, welche Informationen benötigt werden. diff --git a/loader/wine.fr.man.in b/loader/wine.fr.man.in index 17c727e..fb64513 100644 --- a/loader/wine.fr.man.in +++ b/loader/wine.fr.man.in @@ -277,8 +277,8 @@ N'hésitez pas à y ajouter les applications que vous exécutez actuellement. .PP Les rapports d'anomalie peuvent être postés sur le Bugzilla de Wine .I http://bugs.winehq.org -Si vous souhaitez envoyer un rapport d'anomalie, veuillez vous référer au fichier -.I documentation/bugs.sgml +Si vous souhaitez envoyer un rapport d'anomalie, veuillez vous référer à +.I http://wiki.winehq.org/Bugs dans les sources de .B wine pour voir quelles informations sont nécessaires diff --git a/loader/wine.man.in b/loader/wine.man.in index 0f71f95..e9f3df4 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -281,8 +281,8 @@ there is no entry for this application. .PP Bug reports may be posted to Wine Bugzilla .I http://bugs.winehq.org -If you want to post a bug report, please read the file -.I documentation/bugs.sgml +If you want to post a bug report, please see +.I http://wiki.winehq.org/Bugs in the .B wine source to see what information is necessary

1 0

André Hentschel : documentation: Remove all occurrence of bugs.sgml.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 1778afea6410b1004aba911cb90e4edf187c8b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1778afea6410b1004aba911cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 31 16:07:34 2010 +0200 documentation: Remove all occurrence of bugs.sgml. --- documentation/README.de | 2 -- documentation/README.es | 2 -- documentation/README.fr | 2 -- documentation/README.hu | 2 -- documentation/README.it | 2 -- documentation/README.pt_br | 3 +-- documentation/README.tr | 3 +-- 7 files changed, 2 insertions(+), 14 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 9aa272b..e678a25 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -177,8 +177,6 @@ Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org Schauen Sie bitte erst in der Bugzilla-Datenbank nach, ob Ihr Problem bereits gemeldet wurde, bevor Sie eine Fehlermeldung verfassen. Sie können Fehlermeldungen auch an comp.emulators.ms-windows.wine schicken. - Lesen Sie bitte die Datei documentation/bugs.sgml um zu sehen, welche - Informationen benötigt werden. IRC: Online-Hilfe wird Ihnen im Chat-Kanal #WineHQ unter irc.freenode.net gewährt. diff --git a/documentation/README.es b/documentation/README.es index 8debe80..0603992 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -185,8 +185,6 @@ Bugs: Reporte bugs al Bugzilla de Wine en http://bugs.winehq.org Por favor, busque en la base de datos de bugzilla para comprobar si su problema ya se encuentra antes de enviar un informe de bug. Puede tambi�n enviar informes de bugs a comp.emulators.ms-windows.wine. - Por favor, lea el fichero documentation/bugs.sgml para ver qu� - informaci�n se requiere. IRC: Hay disponoble ayuda online en el canal #WineHQ de irc.freenode.net. diff --git a/documentation/README.fr b/documentation/README.fr index 5b27060..f6970ad 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -174,8 +174,6 @@ Bogues Rapportez les bogues sur le Bugzilla Wine sur http://bugs.winehq.org que le problème n'a pas déjà été découvert. Vous pouvez aussi rapporter des bogues sur le forum de discussion comp.emulators.ms-windows.wine. - Veuillez également lire le fichier documentation/bugs.sgml pour - connaître les informations indispensables à fournir. IRC L'aide en ligne est disponible sur le canal #WineHQ sur irc.freenode.net. diff --git a/documentation/README.hu b/documentation/README.hu index 887dcaa..4fb81ab 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -189,8 +189,6 @@ Hib K�rem hibabejelent�s k�ld�se el�tt ellen�rizze, hogy az �n probl�m�ja m�r megtal�lhat�-e az adatb�zisban. K�ldhet hibabejelent�seket a comp.emulators.ms-windows.wine c�mre is. - K�rem olvassa el a documentation/bugs.sgml f�jlt, �s n�zze meg melyik - inform�ci� sz�ks�ges. IRC: Azonnali seg�ts�g el�rhet� a #WineHQ csatorn�n a irc.freenode.net-en. diff --git a/documentation/README.it b/documentation/README.it index 90eb635..54de929 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -188,8 +188,6 @@ Bugs: Segnala i Bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org per favore cerca nel database di bugzilla per verificare che il tuo problema non sia gi� stato trovato prima di postare un rapporto su un bug. Puoi anche mandare le segnalazioni sui bug a comp.emulators.ms-windows.wine. - Per favore leggi il file documentation/bugs.sgml per verificare quali - informazioni sono richieste. IRC: Aiuto online � disponibile nel canale #winehq su irc.freenode.net. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 07aa179..4e6ec9f 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -186,8 +186,7 @@ Bugs: Relate erros ao Wine Bugzilla em http://bugs.winehq.org Por favor pesquise a base de dados do bugzilla para verificar se seu problema j� tenha sido encontrado, antes de enviar um relat�rio do erro. Voc� pode tamb�m afixar relat�rios do erro em - comp.emulators.ms-windows.wine. Por favor leia o arquivo - documentation/bugs.sgml para ver qual informa��o � requerida. + comp.emulators.ms-windows.wine. IRC: A ajuda online est� dispon�vel em #WineHQ em irc.freenode.net. diff --git a/documentation/README.tr b/documentation/README.tr index 6f399f5..cc5ace5 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -192,8 +192,7 @@ Hatalar: ile raporlayabilirsiniz. Lütfen bir hata raporlamadan önce hatanın önceden girilip girilmediğini öğrenmek için bugzilla'da arama yapınız. Hata raporlarını ayrıca comp.emulators.ms-windows.wine - haber grubuna gönderebilirsiniz. Lütfen hangi bilgilerin gerekli - olduğunu öğrenmek için documentation/bugs.sgml dosyasını okuyunuz. + haber grubuna gönderebilirsiniz. IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz.

1 0

Henri Verbeet : wined3d: Print a FIXME/ WARN for all unsupported vertex blend flags.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 6e1ed1c167ff364dd0268cbdc802c704544f535d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1ed1c167ff364dd0268cbdc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:29:00 2010 +0200 wined3d: Print a FIXME/WARN for all unsupported vertex blend flags. --- dlls/wined3d/state.c | 34 +++++++++++----------------------- 1 files changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 28404b6..d3be2c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3780,27 +3780,19 @@ static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateblock, s static void state_vertexblend_w(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - static BOOL once = FALSE; + WINED3DVERTEXBLENDFLAGS f = stateblock->renderState[WINED3DRS_VERTEXBLEND]; + static unsigned int once; - switch(stateblock->renderState[WINED3DRS_VERTEXBLEND]) { - case WINED3DVBF_1WEIGHTS: - case WINED3DVBF_2WEIGHTS: - case WINED3DVBF_3WEIGHTS: - if(!once) { - once = TRUE; - /* TODO: Implement vertex blending in drawStridedSlow */ - FIXME("Vertex blending enabled, but not supported by hardware\n"); - } - break; + if (f == WINED3DVBF_DISABLE) return; - case WINED3DVBF_TWEENING: - WARN("Tweening not supported yet\n"); - } + if (!once++) FIXME("Vertex blend flags %#x not supported.\n", f); + else WARN("Vertex blend flags %#x not supported.\n", f); } static void state_vertexblend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { WINED3DVERTEXBLENDFLAGS val = stateblock->renderState[WINED3DRS_VERTEXBLEND]; + static unsigned int once; switch(val) { case WINED3DVBF_1WEIGHTS: @@ -3828,19 +3820,15 @@ static void state_vertexblend(DWORD state, IWineD3DStateBlockImpl *stateblock, s } break; + case WINED3DVBF_TWEENING: + case WINED3DVBF_0WEIGHTS: /* Indexed vertex blending, not supported. */ + if (!once++) FIXME("Vertex blend flags %#x not supported.\n", val); + else WARN("Vertex blend flags %#x not supported.\n", val); + /* Fall through. */ case WINED3DVBF_DISABLE: - case WINED3DVBF_0WEIGHTS: /* for Indexed vertex blending - not supported */ glDisable(GL_VERTEX_BLEND_ARB); checkGLcall("glDisable(GL_VERTEX_BLEND_ARB)"); break; - - case WINED3DVBF_TWEENING: - /* Just set the vertex weight for weight 0, enable vertex blending and hope the app doesn't have - * vertex weights in the vertices? - * For now we don't report that as supported, so a warn should suffice - */ - WARN("Tweening not supported yet\n"); - break; } }

1 0

Henri Verbeet : wined3d: Remove some unused / duplicate render states.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 97ea3b63222c8b58d92eec047a549667983865dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ea3b63222c8b58d92eec047… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:28:59 2010 +0200 wined3d: Remove some unused / duplicate render states. --- include/wine/wined3d.idl | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index dc1853d..f784774 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -411,8 +411,6 @@ typedef enum _WINED3DRENDERSTATETYPE WINED3DRS_COLORWRITEENABLE = 168, WINED3DRS_TWEENFACTOR = 170, WINED3DRS_BLENDOP = 171, - WINED3DRS_POSITIONORDER = 172, - WINED3DRS_NORMALORDER = 173, WINED3DRS_POSITIONDEGREE = 172, WINED3DRS_NORMALDEGREE = 173, WINED3DRS_SCISSORTESTENABLE = 174,

1 0

Hans Leidekker : rsaenh: Add some tests for the hash functions.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 9f4b022be56f4d0e1b72a07c53eae468587ed7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4b022be56f4d0e1b72a07c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 31 15:20:59 2010 +0200 rsaenh: Add some tests for the hash functions. --- dlls/rsaenh/tests/rsaenh.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index b4bdcfa..a13ca8e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -320,8 +320,9 @@ static void test_hashes(void) unsigned char pbData[2048]; BOOL result; HCRYPTHASH hHash, hHashClone; + HCRYPTPROV prov; BYTE pbHashValue[36]; - DWORD hashlen, len; + DWORD hashlen, len, error; int i; for (i=0; i<2048; i++) pbData[i] = (unsigned char)i; @@ -463,6 +464,57 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA_512, 0, 0, &hHash); ok(!result && GetLastError() == NTE_BAD_ALGID, "expected NTE_BAD_ALGID, got %08x\n", GetLastError()); + + result = CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(result, "CryptAcquireContext failed 0x%08x\n", GetLastError()); + + result = CryptCreateHash(prov, CALG_SHA1, 0, 0, &hHash); + ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); + + /* release provider before using the hash */ + result = CryptReleaseContext(prov, 0); + ok(result, "CryptReleaseContext failed 0x%08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptHashData(hHash, (BYTE *)"data", sizeof("data"), 0); + error = GetLastError(); + ok(!result, "CryptHashData succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); + + SetLastError(0xdeadbeef); + result = CryptDestroyHash(hHash); + error = GetLastError(); + ok(!result, "CryptDestroyHash succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); + + result = CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(result, "CryptAcquireContext failed 0x%08x\n", GetLastError()); + + result = CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); + ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); + + result = CryptHashData(hHash, (BYTE *)"data", sizeof("data"), 0); + ok(result, "CryptHashData failed 0x%08x\n", GetLastError()); + + result = CryptDuplicateHash(hHash, NULL, 0, &hHashClone); + ok(result, "CryptDuplicateHash failed 0x%08x\n", GetLastError()); + + len = 20; + result = CryptGetHashParam(hHashClone, HP_HASHVAL, pbHashValue, &len, 0); + ok(result, "CryptGetHashParam failed 0x%08x\n", GetLastError()); + + /* add data after duplicating the hash */ + result = CryptHashData(hHash, (BYTE *)"more data", sizeof("more data"), 0); + ok(result, "CryptHashData failed 0x%08x\n", GetLastError()); + + result = CryptDestroyHash(hHash); + ok(result, "CryptDestroyHash failed 0x%08x\n", GetLastError()); + + result = CryptDestroyHash(hHashClone); + ok(result, "CryptDestroyHash failed 0x%08x\n", GetLastError()); + + result = CryptReleaseContext(prov, 0); + ok(result, "CryptReleaseContext failed 0x%08x\n", GetLastError()); } static void test_block_cipher_modes(void)

1 0

Henri Verbeet : wined3d: Remove a redundant initialization in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 91db9f8bd33be44e5605c5d86ba28234b4325966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91db9f8bd33be44e5605c5d86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:28:58 2010 +0200 wined3d: Remove a redundant initialization in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b6e80fb..c6f8d9b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5159,10 +5159,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const struct wined3d_format_desc *src_format; const struct wined3d_format_desc *dst_format; - CONVERT_TYPES convert = NO_CONVERSION; struct wined3d_context *context; const unsigned char *data; UINT update_w, update_h; + CONVERT_TYPES convert; UINT src_w, src_h; UINT dst_x, dst_y; DWORD sampler;

1 0

Henri Verbeet : wined3d: Get rid of some mostly useless local variables in IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 3af090969302546c4893b64d2db254c3953ac3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af090969302546c4893b64d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:28:57 2010 +0200 wined3d: Get rid of some mostly useless local variables in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4de5c86..b6e80fb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5161,8 +5161,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, const struct wined3d_format_desc *dst_format; CONVERT_TYPES convert = NO_CONVERSION; struct wined3d_context *context; - WINED3DPOOL src_pool, dst_pool; - WINED3DSURFACE_DESC winedesc; const unsigned char *data; UINT update_w, update_h; UINT src_w, src_h; @@ -5175,15 +5173,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_point(dst_point)); - IWineD3DSurface_GetDesc(src_surface, &winedesc); - src_w = winedesc.width; - src_h = winedesc.height; - src_pool = winedesc.pool; - - IWineD3DSurface_GetDesc(dst_surface, &winedesc); - dst_pool = winedesc.pool; - - if (src_pool != WINED3DPOOL_SYSTEMMEM || dst_pool != WINED3DPOOL_DEFAULT) + if (src_impl->resource.pool != WINED3DPOOL_SYSTEMMEM || dst_impl->resource.pool != WINED3DPOOL_DEFAULT) { WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", src_surface, dst_surface); @@ -5221,6 +5211,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, surface_internal_preload(dst_surface, SRGB_RGB); IWineD3DSurface_BindTexture(dst_surface, FALSE); + src_w = src_impl->currentDesc.Width; + src_h = src_impl->currentDesc.Height; update_w = src_rect ? src_rect->right - src_rect->left : src_w; update_h = src_rect ? src_rect->bottom - src_rect->top : src_h;

1 0

Stefan Dösinger : wined3d: Split out offscreen rendering concerns from FindContext.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: a4b0bedc30f31d19d969364c80f979b77cce9011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b0bedc30f31d19d969364c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 27 17:40:28 2010 +0100 wined3d: Split out offscreen rendering concerns from FindContext. --- dlls/wined3d/context.c | 163 ++++++++++++++++++++++++----------------------- 1 files changed, 83 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 15a8f77..f3729ae 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1834,10 +1834,8 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur { IWineD3DSwapChain *swapchain = NULL; struct wined3d_context *current_context = context_get_current(); - const struct StateEntry *StateTable = This->StateTable; DWORD tid = GetCurrentThreadId(); struct wined3d_context *context; - BOOL old_render_offscreen; if (current_context && current_context->destroyed) current_context = NULL; @@ -1867,9 +1865,6 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur TRACE("Rendering onscreen\n"); context = findThreadContextForSwapChain(swapchain, tid); - - old_render_offscreen = context->render_offscreen; - context->render_offscreen = surface_is_offscreen(target); IWineD3DSwapChain_Release(swapchain); } else @@ -1891,85 +1886,10 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur * is perfect to call. */ context = findThreadContextForSwapChain(This->swapchains[0], tid); } - - old_render_offscreen = context->render_offscreen; - context->render_offscreen = TRUE; } context_validate(context); - if (context->render_offscreen != old_render_offscreen) - { - Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); - Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); - Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); - } - - /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers - * the alpha blend state changes with different render target formats. */ - if (!context->current_rt) - { - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); - } - else - { - const struct wined3d_format_desc *old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; - const struct wined3d_format_desc *new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; - - if (old->format != new->format) - { - /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ - if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) - || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - { - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); - } - } - - /* When switching away from an offscreen render target, and we're not - * using FBOs, we have to read the drawable into the texture. This is - * done via PreLoad (and SFLAG_INDRAWABLE set on the surface). There - * are some things that need care though. PreLoad needs a GL context, - * and FindContext is called before the context is activated. It also - * has to be called with the old rendertarget active, otherwise a - * wrong drawable is read. */ - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && old_render_offscreen && context->current_rt != target) - { - BOOL oldInDraw = This->isInDraw; - - /* surface_internal_preload() requires a context to load the - * texture, so it will call context_acquire(). Set isInDraw to true - * to signal surface_internal_preload() that it has a context. */ - - /* FIXME: This is just broken. There's no guarantee whatsoever - * that the currently active context, if any, is appropriate for - * reading back the render target. We should probably call - * context_set_current(context) here and then rely on - * context_acquire() doing the right thing. */ - This->isInDraw = TRUE; - - /* Read the back buffer of the old drawable into the destination texture. */ - if (((IWineD3DSurfaceImpl *)context->current_rt)->texture_name_srgb) - { - surface_internal_preload(context->current_rt, SRGB_BOTH); - } - else - { - surface_internal_preload(context->current_rt, SRGB_RGB); - } - - IWineD3DSurface_ModifyLocation(context->current_rt, SFLAG_INDRAWABLE, FALSE); - - This->isInDraw = oldInDraw; - } - } - - context->draw_buffer_dirty = TRUE; - context->current_rt = target; - return context; } @@ -2139,6 +2059,88 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI } } +static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target) +{ + BOOL old_render_offscreen = context->render_offscreen; + const struct StateEntry *StateTable = device->StateTable; + + if (!target) return; + else if (context->current_rt == target) return; + context->render_offscreen = surface_is_offscreen(target); + + if (context->render_offscreen != old_render_offscreen) + { + Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); + Context_MarkStateDirty(context, STATE_VDECL, StateTable); + Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); + Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); + Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); + } + + /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers + * the alpha blend state changes with different render target formats. */ + if (!context->current_rt) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + } + else + { + const struct wined3d_format_desc *old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; + const struct wined3d_format_desc *new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; + + if (old->format != new->format) + { + /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ + if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) + || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + } + } + + /* When switching away from an offscreen render target, and we're not + * using FBOs, we have to read the drawable into the texture. This is + * done via PreLoad (and SFLAG_INDRAWABLE set on the surface). There + * are some things that need care though. PreLoad needs a GL context, + * and FindContext is called before the context is activated. It also + * has to be called with the old rendertarget active, otherwise a + * wrong drawable is read. */ + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && old_render_offscreen && context->current_rt != target) + { + BOOL oldInDraw = device->isInDraw; + + /* surface_internal_preload() requires a context to load the + * texture, so it will call context_acquire(). Set isInDraw to true + * to signal surface_internal_preload() that it has a context. */ + + /* FIXME: This is just broken. There's no guarantee whatsoever + * that the currently active context, if any, is appropriate for + * reading back the render target. We should probably call + * context_set_current(context) here and then rely on + * context_acquire() doing the right thing. */ + device->isInDraw = TRUE; + + /* Read the back buffer of the old drawable into the destination texture. */ + if (((IWineD3DSurfaceImpl *)context->current_rt)->texture_name_srgb) + { + surface_internal_preload(context->current_rt, SRGB_BOTH); + } + else + { + surface_internal_preload(context->current_rt, SRGB_RGB); + } + + IWineD3DSurface_ModifyLocation(context->current_rt, SFLAG_INDRAWABLE, FALSE); + + device->isInDraw = oldInDraw; + } + } + + context->draw_buffer_dirty = TRUE; + context->current_rt = target; +} + /***************************************************************************** * context_acquire * @@ -2160,6 +2162,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf TRACE("device %p, target %p, usage %#x.\n", device, target, usage); context = FindContext(device, target); + context_setup_target(device, context, target); context_enter(context); if (!context->valid) return context;

1 0

Stefan Dösinger : wined3d: Control the onscreen depth stencil format in the swapchain.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 19b6f5ca75b43f61a366aa521eab9ddbfc4f99dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b6f5ca75b43f61a366aa521… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 28 16:25:04 2010 +0200 wined3d: Control the onscreen depth stencil format in the swapchain. This allows the swapchain to know what depth format its window contexts have to see if the requested depth format is compatible or a FBO fallback is needed, and it will be needed to set the onscreen format to the requested auto depth stencil format instead of the let's-hope-it-fits D24_UNORM_S8_UINT format. --- dlls/wined3d/context.c | 22 ++-------------------- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 25 +++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 4 +++- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f3729ae..738746e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1087,23 +1087,6 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, return 0; } - /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. - * You are able to add a depth + stencil surface at a later stage when you need it. - * In order to support this properly in WineD3D we need the ability to recreate the opengl context and - * drawable when this is required. This is very tricky as we need to reapply ALL opengl states for the new - * context, need torecreate shaders, textures and other resources. - * - * The context manager already takes care of the state problem and for the other tasks code from Reset - * can be used. These changes are way to risky during the 1.0 code freeze which is taking place right now. - * Likely a lot of other new bugs will be exposed. For that reason request a depth stencil surface all the - * time. It can cause a slight performance hit but fixes a lot of regressions. A fixme reminds of that this - * issue needs to be fixed. */ - if (ds_format_desc->format != WINED3DFMT_D24_UNORM_S8_UINT) - { - FIXME("Add OpenGL context recreation support to SetDepthStencilSurface\n"); - ds_format_desc = getFormatDescEntry(WINED3DFMT_D24_UNORM_S8_UINT, &This->adapter->gl_info); - } - getDepthStencilBits(ds_format_desc, &depthBits, &stencilBits); for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])) && !iPixelFormat; matchtry++) { @@ -1229,12 +1212,12 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, * pPresentParameters: contains the pixelformats to use for onscreen rendering * *****************************************************************************/ -struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target) +struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target, + const struct wined3d_format_desc *ds_format_desc) { IWineD3DDeviceImpl *device = swapchain->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format_desc *color_format_desc; - const struct wined3d_format_desc *ds_format_desc; struct wined3d_context *ret; PIXELFORMATDESCRIPTOR pfd; BOOL auxBuffers = FALSE; @@ -1260,7 +1243,6 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 goto out; } - ds_format_desc = getFormatDescEntry(WINED3DFMT_UNKNOWN, gl_info); color_format_desc = target->resource.format_desc; /* In case of ORM_BACKBUFFER, make sure to request an alpha component for diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa16118..06e95f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6318,7 +6318,7 @@ HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain * } target = (IWineD3DSurfaceImpl *)(swapchain->backBuffer ? swapchain->backBuffer[0] : swapchain->frontBuffer); - if (!(context = context_create(swapchain, target))) + if (!(context = context_create(swapchain, target, swapchain->ds_format))) { WARN("Failed to create context.\n"); HeapFree(GetProcessHeap(), 0, swapchain->context); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bd44b03..14a741b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -795,7 +795,28 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (surface_type == SURFACE_OPENGL) { - if (!(swapchain->context[0] = context_create(swapchain, (IWineD3DSurfaceImpl *)swapchain->frontBuffer))) + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + + /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. + * You are able to add a depth + stencil surface at a later stage when you need it. + * In order to support this properly in WineD3D we need the ability to recreate the opengl context and + * drawable when this is required. This is very tricky as we need to reapply ALL opengl states for the new + * context, need torecreate shaders, textures and other resources. + * + * The context manager already takes care of the state problem and for the other tasks code from Reset + * can be used. These changes are way to risky during the 1.0 code freeze which is taking place right now. + * Likely a lot of other new bugs will be exposed. For that reason request a depth stencil surface all the + * time. It can cause a slight performance hit but fixes a lot of regressions. A fixme reminds of that this + * issue needs to be fixed. */ + if (!present_parameters->EnableAutoDepthStencil + || swapchain->presentParms.AutoDepthStencilFormat != WINED3DFMT_D24_UNORM_S8_UINT) + { + FIXME("Add OpenGL context recreation support to SetDepthStencilSurface\n"); + } + swapchain->ds_format = getFormatDescEntry(WINED3DFMT_D24_UNORM_S8_UINT, gl_info); + swapchain->context[0] = context_create(swapchain, (IWineD3DSurfaceImpl *)swapchain->frontBuffer, + swapchain->ds_format); + if (!swapchain->context[0]) { WARN("Failed to create context.\n"); hr = WINED3DERR_NOTAVAILABLE; @@ -912,7 +933,7 @@ struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *i TRACE("Creating a new context for swapchain %p, thread %d\n", This, GetCurrentThreadId()); - if (!(ctx = context_create(This, (IWineD3DSurfaceImpl *)This->frontBuffer))) + if (!(ctx = context_create(This, (IWineD3DSurfaceImpl *)This->frontBuffer, This->ds_format))) { ERR("Failed to create a new context for the swapchain\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eb9ae9f..a812114 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1204,7 +1204,8 @@ void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_attach_surface_fbo(const struct wined3d_context *context, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) DECLSPEC_HIDDEN; -struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target) DECLSPEC_HIDDEN; +struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target, + const struct wined3d_format_desc *ds_format_desc) DECLSPEC_HIDDEN; void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) DECLSPEC_HIDDEN; void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; @@ -2556,6 +2557,7 @@ struct IWineD3DSwapChainImpl WINED3DFORMAT orig_fmt; WINED3DGAMMARAMP orig_gamma; BOOL render_to_fbo; + const struct wined3d_format_desc *ds_format; long prev_time, frames; /* Performance tracking */ unsigned int vSyncCounter;

1 0