September 2006 - Wine-commits

lostwages/templates/en press.template
by Jeremy Newman 27 Sep '06

27 Sep '06

ChangeSet ID: 28311 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/27 09:50:54 Modified files: templates/en : press.template Log message: Tom Wickline <twickline(a)gmail.com> add a link to google news Patch: http://cvs.winehq.org/patch.py?id=28311 Old revision New revision Changes Path 1.40 1.41 +1 -0 lostwages/templates/en/press.template Index: lostwages/templates/en/press.template diff -u -p lostwages/templates/en/press.template:1.40 lostwages/templates/en/press.template:1.41 --- lostwages/templates/en/press.template:1.40 27 Sep 2006 14:50:54 -0000 +++ lostwages/templates/en/press.template 27 Sep 2006 14:50:54 -0000 @@ -3,6 +3,7 @@ <h1>Press articles covering Wine</h1> <ul> + <li> <a href="http://news.google.com/news?svnum=10&hl=en&ned=us&ie=UTF-8&q=linux+wine">Google News</a> - Wine press coverage via Google News <li> <a href="http://www.theinquirer.net/default.aspx?article=34181">TheINQUIRER</a> September 6, 2006 - CrossOver allows Windows to run on a Mac <li> <a href="http://apple.slashdot.org/article.pl?sid=06/09/05/2213244">Slashdot</a> September 5, 2006 - CodeWeavers Releases CrossOver For Intel Mac <li> <a href=" http://www.tuxmagazine.com/node/1000223">TuxMagazine</a> September 2, 2006 - Issue #17 Has articles covering Wine and CrossOver Office

1 0

lostwages/templates/en sending_patches.template
by Jeremy Newman 27 Sep '06

27 Sep '06

ChangeSet ID: 28310 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/27 09:49:04 Modified files: templates/en : sending_patches.template Log message: Mike McCormack <mike(a)codeweavers.com> Add hints on what to do if a patch is not applied Patch: http://cvs.winehq.org/patch.py?id=28310 Old revision New revision Changes Path 1.16 1.17 +22 -6 lostwages/templates/en/sending_patches.template Index: lostwages/templates/en/sending_patches.template diff -u -p lostwages/templates/en/sending_patches.template:1.16 lostwages/templates/en/sending_patches.template:1.17 --- lostwages/templates/en/sending_patches.template:1.16 27 Sep 2006 14:49: 4 -0000 +++ lostwages/templates/en/sending_patches.template 27 Sep 2006 14:49: 4 -0000 @@ -38,12 +38,28 @@ to make sure it's not spam before they c </ul> <p>Accepted patches will appear in the <a href="{$root}/site/forums">wine-cvs</a> mailing list. -If your patch is not applied, review it carefully and check it against the above points.</p> -<p>Rejected patches might receive a note in the <a href="{$root}/site/forums">wine-devel</a> -mailing list, however they also may be silently dropped. If you receive no -response to your patch don't give up! Try checking it against the above -points, asking for guidance on wine-devel if you find no obvious issue, and -resubmitting it.</p> + +<p>Patches with obvious problems may receive a response on wine-devel. + +<p>Some patches may not receive any response. In this case, your patch + maybe considered <i>Not Obviously Correct</i>, and you can: + +<ul> + <li> Check the patch over yourself, and think about what can be done to + clarify the patch (hints in the list above). + + <li> Write a mail to wine-devel, explain your patch and request it be + reviewed by anybody that cares to review it. + + <li> Unless one already exists, open a bug in bugzilla describing the + problem you are trying to solve (eg. ./configure fails on Solaris, + etc) and attach your patch. + + <li> Ask for advice about your patch on #winehackers. +</ul> + +<p> You may find it difficult to solicit feedback, + so think carefully about the comments you receive. <hr>

1 0

Vitaliy Margolen : winecfg: Update Russian translation.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: e6c754b65c7ba5178ef9edd5216bc4b31732c521 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6c754b65c7ba5178ef9edd… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Sep 26 08:19:29 2006 -0600 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 105 +++++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 50 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index cb44a82..fbda795 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -3,6 +3,7 @@ * Russian Language Support * * Copyright 2003 Igor Stepin + * Copyright 2006 Vitaliy Margolen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -82,7 +83,7 @@ BEGIN GROUPBOX " Direct3D ",IDC_STATIC,8,189,244,55 - LTEXT "�� Vertex Shader: ",IDC_STATIC,15,199,120,30 + LTEXT "�� : ",IDC_STATIC,15,199,120,30 COMBOBOX IDC_D3D_VSHADER_MODE,120,197,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "�� Pixel Shader (�� )",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 @@ -160,14 +161,18 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 + GROUPBOX " �� ",IDC_STATIC,8,4,244,195 LTEXT "�� : ",IDC_STATIC,15,20,227,30 CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,50,80,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "�� : ",IDC_STATIC,15,215,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "�� (��):",IDC_STATIC,15,232,70,8 + COMBOBOX IDC_DSOUND_RATES,100,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "�� (��):",IDC_STATIC,144,232,80,8 + COMBOBOX IDC_DSOUND_BITS,216,230,30,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 @@ -214,63 +219,63 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DLL_WARNING "Changing the load order of this library is not recommended.\nAre you sure you want to do this?" - IDS_DLL_WARNING_CAPTION "Warning: system library" - IDS_DLL_NATIVE "native" - IDS_DLL_BUILTIN "builtin" - IDS_DLL_NATIVE_BUILTIN "native, builtin" - IDS_DLL_BUILTIN_NATIVE "builtin, native" - IDS_DLL_DISABLED "disabled" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DLL_WARNING "�� .\n�� ?" + IDS_DLL_WARNING_CAPTION "��: �� " + IDS_DLL_NATIVE "��" + IDS_DLL_BUILTIN "��" + IDS_DLL_NATIVE_BUILTIN "��, ��" + IDS_DLL_BUILTIN_NATIVE "��, ��" + IDS_DLL_DISABLED "��" + IDS_DEFAULT_SETTINGS "�� " + IDS_EXECUTABLE_FILTER "�� Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "�� " + IDS_SELECT_EXECUTABLE "�� " END STRINGTABLE DISCARDABLE BEGIN - IDS_SHADER_MODE_HARDWARE "Hardware" - IDS_SHADER_MODE_NONE "None" - IDS_SHADER_MODE_EMULATION "Emulated" + IDS_SHADER_MODE_HARDWARE "��" + IDS_SHADER_MODE_NONE "��" + IDS_SHADER_MODE_EMULATION "��" END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "Autodetect" - IDS_DRIVE_FIXED "Local hard disk" - IDS_DRIVE_REMOTE "Network share" - IDS_DRIVE_REMOVABLE "Floppy disk" + IDS_DRIVE_UNKNOWN "��" + IDS_DRIVE_FIXED "�� " + IDS_DRIVE_REMOTE "�� " + IDS_DRIVE_REMOVABLE "��" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" - IDS_SYSTEM_DRIVE_LABEL "System drive" - IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" - IDS_COL_DRIVELETTER "Letter" - IDS_COL_DRIVEMAPPING "Drive Mapping" - IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click 'Add' in the Drives tab to create one!\n" + IDS_DRIVE_LETTERS_EXCEEDED "�� .\n\n� �� - �� A �� Z, � � �� 26 ��." + IDS_SYSTEM_DRIVE_LABEL "�� " + IDS_CONFIRM_DELETE_C "�� C?\n\n�� Windows �� C. �� , �� !" + IDS_COL_DRIVELETTER "��" + IDS_COL_DRIVEMAPPING "��" + IDS_NO_DRIVE_C "�� C.\n\n�� !\n" END STRINGTABLE DISCARDABLE BEGIN - IDS_ACCEL_FULL "Full" - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ARTS "aRts Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" - IDS_DRIVER_JACK "JACK Driver" - IDS_DRIVER_NAS "NAS Driver" - IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver" - IDS_DRIVER_COREAUDIO "CoreAudio Driver" - IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" - IDS_SOUNDDRIVERS "Sound Drivers" - IDS_DEVICES_WAVEOUT "Wave Out Devices" - IDS_DEVICES_WAVEIN "Wave In Devices" - IDS_DEVICES_MIDIOUT "MIDI Out Devices" - IDS_DEVICES_MIDIIN "MIDI In Devices" - IDS_DEVICES_AUX "Aux Devices" - IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove \"%s\" from registry?" - IDS_WARNING "Warning" + IDS_ACCEL_FULL "��" + IDS_ACCEL_STANDARD "��" + IDS_ACCEL_BASIC "��" + IDS_ACCEL_EMULATION "��" + IDS_DRIVER_ALSA "ALSA ��" + IDS_DRIVER_ARTS "aRts ��" + IDS_DRIVER_ESOUND "EsounD ��" + IDS_DRIVER_OSS "OSS ��" + IDS_DRIVER_JACK "JACK ��" + IDS_DRIVER_NAS "NAS ��" + IDS_DRIVER_AUDIOIO "Audio IO (Solaris) ��" + IDS_DRIVER_COREAUDIO "CoreAudio ��" + IDS_OPEN_DRIVER_ERROR "�� %s!" + IDS_SOUNDDRIVERS "�� " + IDS_DEVICES_WAVEOUT "�� " + IDS_DEVICES_WAVEIN "�� " + IDS_DEVICES_MIDIOUT "�� MIDI" + IDS_DEVICES_MIDIIN "�� MIDI" + IDS_DEVICES_AUX "�� " + IDS_DEVICES_MIXER "�� " + IDS_UNAVAILABLE_DRIVER "��, �� , �� !\n\n�� \"%s\" �� ?" + IDS_WARNING "��" END

1 0

H. Verbeet : wined3d: Comparing BOOLs against FALSE is redundant.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 5abdd7a19f8e977db2a8c4cbb739837b98635f8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5abdd7a19f8e977db2a8c4c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:58 2006 +0200 wined3d: Comparing BOOLs against FALSE is redundant. --- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 22 +++++++++++----------- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 8146a72..7af48ba 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -143,7 +143,7 @@ static void WINAPI IWineD3DCubeTextureIm ENTER_GL(); /* If were dirty then reload the surfaces */ - if (This->baseTexture.dirty != FALSE) { + if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { for (j = D3DCUBEMAP_FACE_POSITIVE_X; j <= D3DCUBEMAP_FACE_NEGATIVE_Z ; j++) { if(setGlTextureDesc) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 736399f..9ac13aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -500,7 +500,7 @@ #undef APPLY_STATE /* TODO: NV_POINT_SPRITE */ if (GL_SUPPORT(ARB_POINT_SPRITE)) { - if (This->stateBlock->renderState[WINED3DRS_POINTSPRITEENABLE] != FALSE) { + if (This->stateBlock->renderState[WINED3DRS_POINTSPRITEENABLE]) { /* Doesn't work with GL_POINT_SMOOTH on on my ATI 9600, but then ATI drivers are buggered! */ glDisable(GL_POINT_SMOOTH); @@ -1059,13 +1059,13 @@ static HRESULT WINAPI IWineD3DDeviceImp * ****************************************/ switch(Pool) { case WINED3DPOOL_SCRATCH: - if(Lockable == FALSE) + if(!Lockable) FIXME("Create suface called with a pool of SCRATCH and a Lockable of FALSE \ which are mutually exclusive, setting lockable to true\n"); Lockable = TRUE; break; case WINED3DPOOL_SYSTEMMEM: - if(Lockable == FALSE) FIXME("Create surface called with a pool of SYSTEMMEM and a Lockable of FALSE, \ + if(!Lockable) FIXME("Create surface called with a pool of SYSTEMMEM and a Lockable of FALSE, \ this is acceptable but unexpected (I can't know how the surface can be usable!)\n"); case WINED3DPOOL_MANAGED: if(Usage == WINED3DUSAGE_DYNAMIC) FIXME("Create surface called with a pool of MANAGED and a \ @@ -2859,7 +2859,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } /* OK, we now have a light... */ - if (Enable == FALSE) { + if (!Enable) { /* If we are disabling it, check it was enabled, and still only do something if it has assigned a glIndex (which it should have!) */ @@ -2901,7 +2901,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl while (pos != NULL && pos->glIndex != -1 && Index < This->maxConcurrentLights) { /* Try to remember which index can be replaced if necessary */ - if (bsf==NULL && pos->lightEnabled == FALSE) { + if (bsf==NULL && !pos->lightEnabled) { /* Found a light we can replace, save as best replacement */ bsf = pos; } @@ -5224,7 +5224,7 @@ process_vertices_strided(IWineD3DDeviceI * */ - if( doClip == FALSE || + if( !doClip || ( (-rhw -eps < x) && (-rhw -eps < y) && ( -eps < z) && (x <= rhw + eps) && (y <= rhw + eps ) && (z <= rhw + eps) && ( rhw > eps ) ) ) { @@ -5326,7 +5326,7 @@ process_vertices_strided(IWineD3DDeviceI if(!color_d) { static BOOL warned = FALSE; - if(warned == FALSE) { + if(!warned) { ERR("No diffuse color in source, but destination has one\n"); warned = TRUE; } @@ -5357,7 +5357,7 @@ process_vertices_strided(IWineD3DDeviceI if(!color_s) { static BOOL warned = FALSE; - if(warned == FALSE) { + if(!warned) { ERR("No specular color in source, but destination has one\n"); warned = TRUE; } @@ -7149,7 +7149,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl } else { /* Otherwise, set the render target up */ - if (FALSE == This->sceneEnded) { + if (!This->sceneEnded) { IWineD3DDevice_EndScene(iface); } TRACE("clearing renderer\n"); @@ -7252,7 +7252,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl ATI cards don't destroy pbuffers, but as soon as resource releasing callbacks are inplace the pSurface can be set to 0 allowing it to be reused from cache **/ if (This->contextCache[i].Width == width && This->contextCache[i].Height == height - && (pbuffer_per_surface == FALSE || This->contextCache[i].pSurface == pSurface || This->contextCache[i].pSurface == NULL)) { + && (!pbuffer_per_surface || This->contextCache[i].pSurface == pSurface || This->contextCache[i].pSurface == NULL)) { *context = &This->contextCache[i]; break; } @@ -7762,7 +7762,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_SetDialogBoxMode(IWineD3DDevice *iface, BOOL bEnableDialogs) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; /** FIXME: always true at the moment **/ - if(bEnableDialogs == FALSE) { + if(!bEnableDialogs) { FIXME("(%p) Dialogs cannot be disabled yet\n", This); } return WINED3D_OK; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index af27994..fdde6ea 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1272,7 +1272,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAd /* FillGLCaps updates gl_info, but we only want to store and reuse the values once we have a context which is valid. Values from a temporary context may differ from the final ones */ - if (isGLInfoValid == FALSE) { + if (!isGLInfoValid) { WineD3D_Context *fake_ctx = NULL; if (glXGetCurrentContext() == NULL) fake_ctx = WineD3D_CreateFakeGLContext(); /* If we don't know the device settings, go query them now */ @@ -1816,7 +1816,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDe /* FIXME: both the gl_info and the shader_mode should be made per adapter */ /* If we don't know the device settings, go query them now */ - if (This->isGLInfoValid == FALSE) { + if (!This->isGLInfoValid) { /* use the desktop window to fill gl caps */ BOOL rc = IWineD3DImpl_FillGLCaps(iface, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ff465a8..c9b14a0 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -109,8 +109,8 @@ static void init_materials(IWineD3DDevic This->tracking_color = IS_TRACKING; requires_material_reset = TRUE; /* Restore material settings as will be used */ - } else if ((This->tracking_color == IS_TRACKING && isDiffuseSupplied == FALSE) || - (This->tracking_color == NEEDS_TRACKING && isDiffuseSupplied == FALSE)) { + } else if ((This->tracking_color == IS_TRACKING && !isDiffuseSupplied) || + (This->tracking_color == NEEDS_TRACKING && !isDiffuseSupplied)) { /* If we are tracking the current color but one isn't supplied, don't! */ glDisable(GL_COLOR_MATERIAL); checkGLcall("glDisable GL_COLOR_MATERIAL"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2e1e65d..190d7ed 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -124,7 +124,7 @@ static void WINAPI IWineD3DTextureImpl_P IWineD3DTexture_BindTexture(iface); ENTER_GL(); /* If were dirty then reload the surfaces */ - if(This->baseTexture.dirty != FALSE) { + if(This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { if(setGlTextureDesc) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2d072fa..138de01 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1663,7 +1663,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl * /*FIXME("Stage %d matrix is (%.2f,%.2f),(%.2f,%.2f)\n", Stage, m[0][0], m[0][1], m[1][0], m[1][0]);*/ - if (FALSE == This->texture_shader_active) { + if (!This->texture_shader_active) { This->texture_shader_active = TRUE; glEnable(GL_TEXTURE_SHADER_NV); } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 5a10b13..7eb9694 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -223,7 +223,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl static HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - if (FALSE == This->locked) { + if (!This->locked) { ERR("trying to lock unlocked volume@%p\n", This); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index f754f00..b88ab09 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -120,7 +120,7 @@ static void WINAPI IWineD3DVolumeTexture ENTER_GL(); /* If were dirty then reload the volumes */ - if(This->baseTexture.dirty != FALSE) { + if(This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { IWineD3DVolume_LoadTexture(This->volumes[i], i); }

1 0

H. Verbeet : wined3d: Add support for native NPOT textures.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 193f6bbd92ddb8e97c9c7874507905a0b9b5b523 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=193f6bbd92ddb8e97c9c787… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:48 2006 +0200 wined3d: Add support for native NPOT textures. --- dlls/wined3d/device.c | 31 ++++++++++++++++++++----------- dlls/wined3d/directx.c | 9 +++++++++ dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_gl.h | 1 + 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c7ed30e..736399f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -971,11 +971,15 @@ static HRESULT WINAPI IWineD3DDeviceImp *******************************/ /* Non-power2 support */ - - /* Find the nearest pow2 match */ - pow2Width = pow2Height = 1; - while (pow2Width < Width) pow2Width <<= 1; - while (pow2Height < Height) pow2Height <<= 1; + if (wined3d_settings.nonpower2_mode == NP2_NATIVE) { + pow2Width = Width; + pow2Height = Height; + } else { + /* Find the nearest pow2 match */ + pow2Width = pow2Height = 1; + while (pow2Width < Width) pow2Width <<= 1; + while (pow2Height < Height) pow2Height <<= 1; + } if (pow2Width > Width || pow2Height > Height) { /** TODO: add support for non power two compressed textures (OpenGL 2 provices support for * non-power-two textures gratis) **/ @@ -1125,8 +1129,8 @@ static HRESULT WINAPI IWineD3DDeviceImp UINT tmpW; UINT tmpH; HRESULT hr; - unsigned int pow2Width = Width; - unsigned int pow2Height = Height; + unsigned int pow2Width; + unsigned int pow2Height; TRACE("(%p) : Width %d, Height %d, Levels %d, Usage %#lx\n", This, Width, Height, Levels, Usage); @@ -1146,10 +1150,15 @@ static HRESULT WINAPI IWineD3DDeviceImp object->height = Height; /** Non-power2 support **/ - /* Find the nearest pow2 match */ - pow2Width = pow2Height = 1; - while (pow2Width < Width) pow2Width <<= 1; - while (pow2Height < Height) pow2Height <<= 1; + if (wined3d_settings.nonpower2_mode == NP2_NATIVE) { + pow2Width = Width; + pow2Height = Height; + } else { + /* Find the nearest pow2 match */ + pow2Width = pow2Height = 1; + while (pow2Width < Width) pow2Width <<= 1; + while (pow2Height < Height) pow2Height <<= 1; + } /** FIXME: add support for real non-power-two if it's provided by the video card **/ /* Precalculated scaling for 'faked' non power of two texture coords */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3a2bc7e..68914d6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -590,6 +590,9 @@ #undef USE_GL_FUNC } else if (strcmp(ThisExtn, "GL_ARB_texture_mirrored_repeat") == 0) { TRACE_(d3d_caps)(" FOUND: ARB Texture mirrored repeat support\n"); gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] = TRUE; + } else if (strcmp(ThisExtn, "GL_ARB_texture_non_power_of_two") == 0) { + TRACE_(d3d_caps)(" FOUND: ARB NPOT texture support\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = TRUE; } else if (strcmp(ThisExtn, "GLX_ARB_multisample") == 0) { TRACE_(d3d_caps)(" FOUND: ARB multisample support\n"); gl_info->supported[ARB_MULTISAMPLE] = TRUE; @@ -765,6 +768,12 @@ #undef USE_GL_FUNC gl_info->max_sampler_stages = max(gl_info->max_samplers, gl_info->max_texture_stages); + /* We can only use NP2_NATIVE when the hardware supports it. */ + if (wined3d_settings.nonpower2_mode == NP2_NATIVE && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { + WARN_(d3d_caps)("GL_ARB_texture_non_power_of_two not supported, falling back to NP2_NONE NPOT mode.\n"); + wined3d_settings.nonpower2_mode = NP2_NONE; + } + /* Below is a list of Nvidia and ATI GPUs. Both vendors have dozens of different GPUs with roughly the same * features. In most cases GPUs from a certain family differ in clockspeeds, the amount of video memory and * in case of the latest videocards in the number of pixel/vertex pipelines. diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index af4e5f3..ab6fb3d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -42,7 +42,7 @@ wined3d_settings_t wined3d_settings = FALSE, /* Use of GLSL disabled by default */ SHADER_ARB, /* Use ARB vertex programs, when available */ SHADER_ARB, /* Use ARB fragment programs, when available */ - NP2_NONE, /* Box NPOT textures */ + NP2_NATIVE, /* Use native NPOT textures, when available */ RTL_AUTO, /* Automatically determine best locking method */ 64*1024*1024 /* 64MB texture memory by default */ }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da607de..ff84c5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -132,6 +132,7 @@ #define VBO_HW 1 #define NP2_NONE 0 #define NP2_REPACK 1 +#define NP2_NATIVE 2 #define SHADER_SW 0 #define SHADER_ARB 1 diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 1832287..1cc6409 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1424,6 +1424,7 @@ typedef enum _GL_SupportedExt { ARB_HALF_FLOAT_PIXEL, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_MIRRORED_REPEAT, + ARB_TEXTURE_NON_POWER_OF_TWO, ARB_VERTEX_PROGRAM, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT,

1 0

H. Verbeet : wined3d: Add a comment to clarify the point of max_sampler_stages.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 1d839e42e9d8a4bb5dd784f30c9dc0dd53a41418 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d839e42e9d8a4bb5dd784f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:52 2006 +0200 wined3d: Add a comment to clarify the point of max_sampler_stages. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68914d6..af27994 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -766,6 +766,9 @@ #undef USE_GL_FUNC } checkGLcall("extension detection\n"); + /* In some cases the number of texture stages can be larger than the number + * of samplers. The GF4 for example can use only 2 samplers (no fragment + * shaders), but 8 texture stages (register combiners). */ gl_info->max_sampler_stages = max(gl_info->max_samplers, gl_info->max_texture_stages); /* We can only use NP2_NATIVE when the hardware supports it. */

1 0

H. Verbeet : wined3d: Don' t overwrite the position y offset in ARB vertex programs.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 5bc0e91ddfb5261ab588ef9df7bd72e90750a692 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5bc0e91ddfb5261ab588ef9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:36 2006 +0200 wined3d: Don't overwrite the position y offset in ARB vertex programs. --- dlls/wined3d/vertexshader.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 2d7ab58..19eb21c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -786,19 +786,20 @@ #endif if (reg_maps->fog) shader_addline(&buffer, "MAX result.fogcoord, TMP_FOG, 0.0;\n"); - shader_addline(&buffer, "MOV result.position, TMP_OUT;\n"); /* Write the final position. * * OpenGL coordinates specify the center of the pixel while d3d coords specify * the corner. The offsets are stored in the 2nd row of the projection matrix, * the x offset in z and the y offset in w. Add them to the resulting position */ - shader_addline(&buffer, "ADD result.position.x, TMP_OUT.x, posFixup.z;\n"); - shader_addline(&buffer, "ADD result.position.y, TMP_OUT.y, posFixup.w;\n"); + shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;\n"); + shader_addline(&buffer, "ADD TMP_OUT.y, TMP_OUT.y, posFixup.w;\n"); /* Account for any inverted textures (render to texture case) by reversing the y coordinate * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ - shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, posFixup.y;\n"); + shader_addline(&buffer, "MUL TMP_OUT.y, TMP_OUT.y, posFixup.y;\n"); + + shader_addline(&buffer, "MOV result.position, TMP_OUT;\n"); shader_addline(&buffer, "END\n\0");

1 0

H. Verbeet : wined3d: Fix the default values for wined3d_settings.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: ba8a6a3c0cc6819556e366d476f884ef3b8c570b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba8a6a3c0cc6819556e366d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:41 2006 +0200 wined3d: Fix the default values for wined3d_settings. --- dlls/wined3d/wined3d_main.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6b43995..752cbb3 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -32,13 +32,19 @@ void (*wine_tsx11_lock_ptr)(void) = NULL void (*wine_tsx11_unlock_ptr)(void) = NULL; +/* When updating default value here, make sure to update winecfg as well, + * where appropriate. */ wined3d_settings_t wined3d_settings = { - VS_HW, /* Hardware by default */ - PS_NONE, /* Disabled by default */ - VBO_HW, /* Hardware by default */ - FALSE, /* Use of GLSL disabled by default */ - RTL_AUTO /* Automatically determine best locking method */ + VS_HW, /* Hardware by default */ + PS_NONE, /* Disabled by default */ + VBO_HW, /* Hardware by default */ + FALSE, /* Use of GLSL disabled by default */ + SHADER_ARB, /* Use ARB vertex programs, when available */ + SHADER_ARB, /* Use ARB fragment programs, when available */ + NP2_NONE, /* Box NPOT textures */ + RTL_AUTO, /* Automatically determine best locking method */ + 64*1024*1024 /* 64MB texture memory by default */ }; WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9921d4c..da607de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -145,6 +145,8 @@ #define RTL_READTEX 2 #define RTL_TEXDRAW 3 #define RTL_TEXTEX 4 +/* NOTE: When adding fields to this structure, make sure to update the default + * values in wined3d_main.c as well. */ typedef struct wined3d_settings_s { /* vertex and pixel shader modes */ int vs_mode;

1 0

H. Verbeet : wined3d: Enable pixel shaders by default.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: fdefaed46d40b1f51379c24b5b3acda3e1b4261d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fdefaed46d40b1f51379c24… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:44 2006 +0200 wined3d: Enable pixel shaders by default. --- dlls/wined3d/wined3d_main.c | 2 +- programs/winecfg/x11drvdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 752cbb3..af4e5f3 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -37,7 +37,7 @@ void (*wine_tsx11_unlock_ptr)(void) = NU wined3d_settings_t wined3d_settings = { VS_HW, /* Hardware by default */ - PS_NONE, /* Disabled by default */ + PS_HW, /* Hardware by default */ VBO_HW, /* Hardware by default */ FALSE, /* Use of GLSL disabled by default */ SHADER_ARB, /* Use ARB vertex programs, when available */ diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index c02938f..d98d5fe 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -165,7 +165,7 @@ static void init_dialog(HWND dialog) } HeapFree(GetProcessHeap(), 0, buf); - buf = get_reg_key(config_key, keypath("Direct3D"), "PixelShaderMode", "disabled"); + buf = get_reg_key(config_key, keypath("Direct3D"), "PixelShaderMode", "enabled"); if (!strcmp(buf, "enabled")) CheckDlgButton(dialog, IDC_D3D_PSHADER_MODE, BST_CHECKED); else

1 0

H. Verbeet : wined3d: Render upside down when rendering offscreen, even if the backbuffer is used to render to.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: cc821415ae437187010b7b05bcccc8c602da1e54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc821415ae437187010b7b0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:28 2006 +0200 wined3d: Render upside down when rendering offscreen, even if the backbuffer is used to render to. --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d49653b..52cff80 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7609,6 +7609,9 @@ #if defined(GL_VERSION_1_3) implicitSwapchainImpl->drawable = newContext->drawable; implicitSwapchainImpl->render_ctx = newContext->context; } + } else { + /* Same context, but update renderUpsideDown and cull mode */ + device_render_to_texture(This, TRUE); } /* Replace the render target */

1 0