wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable vector array test.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 787707025f65aab96433762d3183020911e56e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=787707025f65aab96433762d3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 23:24:56 2013 +0200 d3dx9/tests: Add ID3DXConstantTable vector array test. --- dlls/d3dx9_36/tests/shader.c | 322 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 322 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=787707025f65aab964337…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable vector test.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 89ecbde31d434bb1f0520a8f665e06abca002d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ecbde31d434bb1f0520a8f6… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 23:24:51 2013 +0200 d3dx9/tests: Add ID3DXConstantTable vector test. --- dlls/d3dx9_36/tests/shader.c | 226 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 226 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89ecbde31d434bb1f0520…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable scalar array test.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 833c0ce18d36fe44a9e72fbefaadd0a6a03cc7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=833c0ce18d36fe44a9e72fbef… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 23:24:43 2013 +0200 d3dx9/tests: Add ID3DXConstantTable scalar array test. --- dlls/d3dx9_36/tests/shader.c | 309 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 309 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=833c0ce18d36fe44a9e72…

1 0

Frédéric Delanoy : winemaker: Update French translation of manpage.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 6a9d50292beb14f3832fde0d3191780111d380d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9d50292beb14f3832fde0d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 21:52:10 2013 +0200 winemaker: Update French translation of manpage. --- tools/winemaker.fr.man.in | 68 +++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 32 deletions(-) diff --git a/tools/winemaker.fr.man.in b/tools/winemaker.fr.man.in index b126b8d..8e454ae 100644 --- a/tools/winemaker.fr.man.in +++ b/tools/winemaker.fr.man.in @@ -60,19 +60,19 @@ avec la casse correcte si nécessaire. .PP .RB "-\ " winemaker recherchera également d'autres problèmes plus exotiques comme l'emploi -de « #pragma pack », l'utilisation de « afxres.h » dans des projets +de \fI#pragma pack\fR, l'utilisation de \fIafxres.h\fR dans des projets non MFC, etc. Quand il trouve de tels points nébuleux, il émettra des avertissements. .PP .RB "-\ " winemaker peut également balayer un arbre de répertoires complet en une seule passe, deviner quels sont les exécutables et bibliothèques en cours de construction, -les faire correspondre à des fichiers sources, et générer le Makefile +les faire correspondre à des fichiers sources, et générer le \fIMakefile\fR correspondant. .PP -\ finalement, .B winemaker -générera un Makefile global pour une utilisation classique. +générera un \fIMakefile\fR global pour une utilisation classique. .PP .RB "-\ " winemaker comprend les projets de type MFC, et génère des fichiers appropriés. @@ -95,7 +95,7 @@ Ne pas effectuer de sauvegarde des fichiers sources modifiés. .B --nosource-fix Ne pas essayer de corriger les fichiers sources (p.ex. la conversion DOS vers UNIX). Cela évite des messages d'erreur si des fichiers sont -accessibles en lecture seule uniquement. +en lecture seule. .TP .B --lower-all Renommer tous les fichiers et répertoires en minuscules. @@ -103,7 +103,7 @@ Renommer tous les fichiers et répertoires en minuscules. .B --lower-uppercase Ne renommer que les fichiers et répertoires qui ont un nom composé uniquement de majuscules. -Ainsi, « HELLO.C » serait renommé, mais pas « World.c ». +Ainsi, \fIHELLO.C\fR serait renommé, mais pas \fIWorld.c\fR. .TP .B --lower-none Ne pas renommer de fichiers et répertoires en minuscules. Notez que cela @@ -150,11 +150,11 @@ et lie la cible avec la bibliothèque MFC. Spécifier que les cibles n'utilisent pas les MFC. Cette option empêche l'utilisation des bibliothèques MFC même si .B winemaker -rencontre des fichiers « stdafx.cpp » ou « stdafx.h » qui activeraient +rencontre des fichiers \fIstdafx.cpp\fR ou \fIstdafx.h\fR qui activeraient les MFC automatiquement en temps normal si ni \fB--nomfc\fR ni \fB--mfc\fR n'était spécifiée. .TP -.BI -D macro "\fR[=\fIdéfn\fR]" +.BI -D macro "\fR[\fB=\fIdéfn\fR]" Ajouter la définition de macro spécifiée à la liste globale des définitions de macros. .TP @@ -178,16 +178,16 @@ Ajouter la bibliothèque spécifiée à la liste globale de bibliothèques à ut Ne pas utiliser l'ensemble standard de bibliothèques Winelib pour les imports, c.-à-d. que toute DLL utilisée par votre code doit être explicitement spécifiée à l'aide d'options \fB-i\fR. -L'ensemble standard de bibliothèques est\ : odbc32.dll, odbccp32.dll, ole32.dll, -oleaut32.dll et winspool.drv. +L'ensemble standard de bibliothèques est : \fIodbc32.dll\fR, \fIodbccp32.dll\fR, \fIole32.dll\fR, +\fIoleaut32.dll\fR et \fIwinspool.drv\fR. .TP .B --nomsvcrt Définir certaines options afin que winegcc n'utilise pas msvcrt durant la compilation. Utilisez cette option si certains fichiers cpp -incluent <string>. +incluent \fI<string>\fR. .TP .B --interactive -Entrer dans le mode interactif. Dans ce mode, +Utiliser le mode interactif. Dans ce mode, .B winemaker demandera de confirmer la liste de cibles pour chaque répertoire, et ensuite de fournir des options spécifiques de répertoire et/ou de cible. @@ -196,10 +196,10 @@ de fournir des options spécifiques de répertoire et/ou de cible. Spécifier qu'il n'y a qu'une seule cible, appelée \fInom\fR. .TP .B --generated-files -Générer le Makefile. Comportement par défaut. +Générer le \fIMakefile\fR. Comportement par défaut. .TP .B --nogenerated-files -Ne pas générer le Makefile. +Ne pas générer le \fIMakefile\fR. .TP .B --wine32 Générer une cible 32 bits. Utile sur les systèmes wow64. Sans cette option, @@ -217,17 +217,17 @@ Recherche des fichiers sources dans le répertoire courant et ses sous-répertoires. Quand un fichier ou répertoire a un nom composé uniquement de majuscules, le renomme en minuscules. Ensuite, adapte tous ces fichiers sources pour une compilation avec Winelib, et génère des -Makefiles. « -DSTRICT » spécifie que la macro STRICT doit +\fIMakefile\fRs. \fB-DSTRICT\fR spécifie que la macro \fBSTRICT\fR doit être définie lors de la compilation des sources. -Finalement, un Makefile est créé. +Finalement, un \fIMakefile\fR est créé. .PP -L'étape suivante serait : +L'étape suivante serait : .PP $ make .PP Si vous obtenez des erreurs de compilation à ce moment (ce qui est plus que probable pour un projet d'une taille raisonnable), vous devriez consulter -le guide d'utilisateur Winelib pour trouver des moyens de les résoudre. +le guide de l'utilisateur de Winelib pour trouver des moyens de les résoudre. .PP Pour un projet utilisant les MFC, vous devriez plutôt exécuter les commandes suivantes\ : @@ -245,7 +245,7 @@ $ make .SH LIMITATIONS / PROBLÈMES .PP -Dans certains cas, vous devrez éditer manuellement le Makefile ou les fichiers +Dans certains cas, vous devrez éditer manuellement le \fIMakefile\fR ou les fichiers sources. .PP En supposant que l'exécutable ou la bibliothèque windows est disponible, on peut @@ -260,26 +260,30 @@ De plus, .B winemaker n'est pas très apte à trouver la bibliothèque contenant l'exécutable : elle doit être soit dans le répertoire courant, soit dans un des répertoires de -.IR LD_LIBRARY_PATH . +.BR LD_LIBRARY_PATH . .PP .B winemaker ne prend pas encore en charge les fichiers de messages, ni le compilateur de messages. .PP - -.SH VOIR AUSSI -.PP -Le guide utilisateur de Winelib : -.PP -http://www.winehq.org/docs/winelib-guide/index -.PP -.BR wine (1) -.PP - +Les bugs peuvent être signalés (en anglais) sur le +.UR http://bugs.winehq.org +.B système de suivi des problèmes de Wine +.UE . .SH AUTEURS François Gouget pour CodeWeavers -.PP +.br Dimitrie O. Paun -.PP +.br André Hentschel -.PP +.SH DISPONIBILITÉ +\fBwinemaker\fR fait partie de la distribution de Wine, qui est disponible sur WineHQ, le +.UR http://www.winehq.org/ +.B quartier général du développement de Wine +.UE . +.SH VOIR AUSSI +.BR wine (1), +.br +.UR http://www.winehq.org/help +.B Documentation et support de Wine +.UE .

1 0

Frédéric Delanoy : winemaker: Make manpage conform to common manpages conventions.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: e9911b095e32cd151fb8675991529fd25010811c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9911b095e32cd151fb867599… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 21:52:09 2013 +0200 winemaker: Make manpage conform to common manpages conventions. --- tools/winemaker.man.in | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index 8f297cf..5014cdd 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -42,7 +42,7 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U is a perl script designed to help you bootstrap the process of converting your Windows sources to Winelib programs. .PP -In order to do this winemaker can perform the following operations: +In order to do this \fBwinemaker\fR can perform the following operations: .PP - rename your source files and directories to lowercase in the event they got all uppercased during the transfer. @@ -52,23 +52,23 @@ got all uppercased during the transfer. - scan the include statements and resource file references to replace the backslashes with forward slashes. .PP -- during the above step winemaker will also perform a case insensitive search +- during the above step \fBwinemaker\fR will also perform a case insensitive search of the referenced file in the include path and rewrite the include statement with the right case if necessary. .PP -- winemaker will also check other more exotic issues like '#pragma pack' -usage, use of "afxres.h" in non MFC projects, and more. Whenever it -encounters something out of the ordinary, winemaker will warn you about it. +- \fBwinemaker\fR will also check other more exotic issues like \fI#pragma pack\fR +usage, use of \fIafxres.h\fR in non MFC projects, and more. Whenever it +encounters something out of the ordinary, it will warn you about it. .PP -- winemaker can also scan a complete directory tree at once, guess what are +- \fBwinemaker\fR can also scan a complete directory tree at once, guess what are the executables and libraries you are trying to build, match them with -source files, and generate the corresponding Makefile. +source files, and generate the corresponding \fIMakefile\fR. .PP -- finally winemaker will generate a global Makefile for normal use. +- finally \fBwinemaker\fR will generate a global \fIMakefile\fR for normal use. .PP -- winemaker knows about MFC-based project and will generate customized files. +- \fBwinemaker\fR knows about MFC-based project and will generate customized files. .PP -- winemaker can read existing project files. It supports dsp, dsw, vcproj and sln files. +- \fBwinemaker\fR can read existing project files. It supports dsp, dsw, vcproj and sln files. .PP .SH OPTIONS .TP @@ -130,7 +130,7 @@ Specify that targets are not MFC-based. This option disables use of MFC librarie even if \fBwinemaker\fR encounters files \fIstdafx.cpp\fR or \fIstdafx.h\fR that would cause it to enable MFC automatically if neither \fB--nomfc\fR nor \fB--mfc\fR was specified. .TP -.BI -D macro "\fR[=\fIdefn\fR]" +.BI -D macro "\fR[\fB=\fIdefn\fR]" Add the specified macro definition to the global list of macro definitions. .TP .BI -I dir @@ -178,16 +178,16 @@ Without that option the default architecture is used. .SH EXAMPLES .PP -Here is a typical winemaker use: +Here is a typical \fBwinemaker\fR use: .PP $ winemaker --lower-uppercase -DSTRICT . .PP -The above tells winemaker to scan the current directory and its +The above tells \fBwinemaker\fR to scan the current directory and its subdirectories for source files. Whenever if finds a file or directory which name is all uppercase, it should rename it to lowercase. It should then fix -all these source files for compilation with Winelib and generate Makefiles. -The '-DSTRICT' specifies that the STRICT macro must be set when compiling -these sources. Finally winemaker will create a Makefile. +all these source files for compilation with Winelib and generate \fIMakefile\fRs. +The \fB-DSTRICT\fR specifies that the \fBSTRICT\fR macro must be set when compiling +these sources. Finally a \fIMakefile\fR will be created. .PP The next step would be: .PP @@ -214,16 +214,16 @@ $ make In some cases you will have to edit the \fIMakefile\fR or source files manually. .PP Assuming that the windows executable/library is available, we could -use winedump to determine what kind of executable it is (graphical +use \fBwinedump\fR to determine what kind of executable it is (graphical or console), which libraries it is linked with, and which functions it exports (for libraries). We could then restore all these settings for the corresponding Winelib target. .PP -Furthermore winemaker is not very good at finding the library containing the +Furthermore \fBwinemaker\fR is not very good at finding the library containing the executable: it must either be in the current directory or in the -.IR LD_LIBRARY_PATH . +.BR LD_LIBRARY_PATH . .PP -Winemaker does not support message files and the message compiler yet. +\fBwinemaker\fR does not support message files and the message compiler yet. .PP Bugs can be reported on the .UR http://bugs.winehq.org

1 0

Frédéric Delanoy : winemaker: Make the manpage more concise.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 8b2ad6ade3a595a9e803a8f5dbe3d289354e38a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2ad6ade3a595a9e803a8f5d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 21:52:08 2013 +0200 winemaker: Make the manpage more concise. --- tools/winemaker.man.in | 94 ++++++++++++++++++++++-------------------------- 1 files changed, 43 insertions(+), 51 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index 7abffcc..8f297cf 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -73,115 +73,107 @@ source files, and generate the corresponding Makefile. .SH OPTIONS .TP .B --nobanner -Disables the printing of the banner. +Disable the printing of the banner. .TP .B --backup -Directs winemaker to perform a backup of all the source files in which it -makes changes. This is the default. +Perform a backup of all the modified source files. This is the default. .TP .B --nobackup -Tells winemaker not to backup modified source files. +Do not backup modified source files. .TP .B --nosource-fix -Directs winemaker not to try fixing the source files (e.g. DOS to Unix +Do no try to fix the source files (e.g. DOS to Unix conversion). This prevents complaints if the files are readonly. .TP .B --lower-all -Tells winemaker to rename all files and directories to lowercase. +Rename all files and directories to lowercase. .TP .B --lower-uppercase -Tells winemaker to only rename files and directories that have an all -uppercase name. -So "HELLO.C" would be renamed but not "World.c". +Only rename files and directories that have an all uppercase name. +So \fIHELLO.C\fR would be renamed but not \fIWorld.c\fR. .TP .B --lower-none -Tells winemaker not to rename files and directories to lower case. Note +Do not rename files and directories to lower case. Note that this does not prevent the renaming of a file if its extension cannot be handled as is, e.g. ".Cxx". This is the default. .TP -.B "--lower-include " -Tells winemaker that if it does not find the file corresponding to an -include statement (or other form of file reference for resource files), -then it should convert that filename to lowercase. This is the default. +.B --lower-include +When the file corresponding to an include statement (or other form of file reference +for resource files) cannot be found, convert that filename to lowercase. This is the default. .TP -.B "--nolower-include " -Tells winemaker not to modify the include statement if it cannot find the -referenced file. +.B --nolower-include +Do not modify the include statement if the referenced file cannot be found. .TP .BR "--guiexe " "| " "--windows" -Specifies that whenever winemaker finds an executable target, or a target of -unknown type, it should assume that it is a graphical application. -This is the default. +Assume a graphical application when an executable target or a target of +unknown type is found. This is the default. .TP .BR "--cuiexe " "| " "--console" -Specifies that whenever winemaker finds an executable target, or a target of -unknown type, it should assume that it is a console application. +Assume a console application when an executable target or a target of +unknown type is found. .TP .B --dll -This option tells winemaker that whenever it finds a target of unknown type, -i.e. for which it does not know whether it is an executable, a dll, or a static library, -it should assume it is a dll. +Assume a dll when a target of unknown type is found, i.e. when \fBwinemaker\fR is unable to +determine whether it is an executable, a dll, or a static library, .TP .B --lib -This option tells winemaker that whenever it finds a target of unknown type, -i.e. for which it does not know whether it is an executable, a dll, or a static library, -it should assume it is a static library. +Assume a static library when a target of unknown type is found, i.e. when \fBwinemaker\fR is +unable to determine whether it is an executable, a dll, or a static library, .TP .B --mfc -Specifies that the targets are MFC based. In such a case winemaker adapts +Specify that the targets are MFC based. In such a case \fBwinemaker\fR adapts the include and library paths accordingly, and links the target with the MFC library. .TP .B --nomfc -Specifies that targets are not MFC-based. This option disables use of MFC libraries -even if winemaker encounters files "stdafx.cpp" or "stdafx.h" that would cause it +Specify that targets are not MFC-based. This option disables use of MFC libraries +even if \fBwinemaker\fR encounters files \fIstdafx.cpp\fR or \fIstdafx.h\fR that would cause it to enable MFC automatically if neither \fB--nomfc\fR nor \fB--mfc\fR was specified. .TP .BI -D macro "\fR[=\fIdefn\fR]" -Adds the specified macro definition to the global list of macro definitions. +Add the specified macro definition to the global list of macro definitions. .TP .BI -I dir -Appends the specified directory to the global include path. +Append the specified directory to the global include path. .TP .BI -P dir -Appends the specified directory to the global dll path. +Append the specified directory to the global dll path. .TP .BI -i dll -Adds the Winelib library to the global list of Winelib libraries to import. +Add the Winelib library to the global list of Winelib libraries to import. .TP .BI -L dir -Appends the specified directory to the global library path. +Append the specified directory to the global library path. .TP .BI -l library -Adds the specified library to the global list of libraries to link with. +Add the specified library to the global list of libraries to link with. .TP .B --nodlls -This option tells winemaker not to use the standard set of winelib libraries -for imports. That is, any DLL your code uses must be explicitly passed to -winemaker with \fB-i\fR options. -The standard set of libraries is: odbc32.dll, odbccp32.dll, ole32.dll, -oleaut32.dll and winspool.drv. +Do not use the standard set of Winelib libraries for imports. +That is, any DLL your code uses must be explicitly passed with \fB-i\fR options. +The standard set of libraries is: \fIodbc32.dll\fR, \fIodbccp32.dll\fR, \fIole32.dll\fR, +\fIoleaut32.dll\fR and \fIwinspool.drv\fR. .TP .B --nomsvcrt -Sets some options to tell winegcc not to compile against msvcrt. -Use this option if you have cpp-files that include <string>. +Set some options to tell \fBwinegcc\fR not to compile against msvcrt. +Use this option if you have cpp-files that include \fI<string>\fR. .TP .B --interactive -Puts winemaker in interactive mode. In this mode winemaker will ask you to -confirm each directory's list of targets, and then to provide directory and +Use interactive mode. In this mode \fBwinemaker\fR will ask you to +confirm the list of targets for each directory, and then to provide directory and target specific options. .TP .BI --single-target " name" -Specifies that there is only one target, called \fIname\fR. +Specify that there is only one target, called \fIname\fR. .TP .B --generated-files -Tells winemaker to generate the Makefile. This is the default. +Generate the \fIMakefile\fR. This is the default. .TP .B --nogenerated-files -Tells winemaker not to generate the Makefile. +Do not generate the \fIMakefile\fR. .TP .B --wine32 -Tells winemaker to generate a 32-bit target. This is useful on wow64 systems. +Generate a 32-bit target. This is useful on wow64 systems. Without that option the default architecture is used. .SH EXAMPLES @@ -219,7 +211,7 @@ $ make .PP .SH TODO / BUGS -In some cases you will have to edit the Makefile or source files by yourself. +In some cases you will have to edit the \fIMakefile\fR or source files manually. .PP Assuming that the windows executable/library is available, we could use winedump to determine what kind of executable it is (graphical

1 0

Matteo Bruni : wined3d: Add a missing destroy_dummy_textures() call.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: 42cfbb825c3293f63b4af2122afcb478c6491c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cfbb825c3293f63b4af2122… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 22 20:24:30 2013 +0200 wined3d: Add a missing destroy_dummy_textures() call. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 464181f..07bb130 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1329,6 +1329,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ device->blitter->free_private(device); device->shader_backend->shader_free_private(device); + destroy_dummy_textures(device, gl_info); /* Release the buffers (with sanity checks)*/ if (device->onscreen_depth_stencil)

1 0

Matteo Bruni : wined3d: Implement special fog behavior for orthogonal projection matrices.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: e2cf98eb76b9c8451b5f9d25b0c9c07f9fdc4e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cf98eb76b9c8451b5f9d25b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 22 20:24:29 2013 +0200 wined3d: Implement special fog behavior for orthogonal projection matrices. --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/glsl_shader.c | 18 ++++++++++++++++-- dlls/wined3d/utils.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e84e8fd..b24b1f3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1324,7 +1324,7 @@ static void fog_test(IDirect3DDevice9 *device) } color = getPixelColor(device, 160, 360); - todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); + ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), "Fogged out quad has color %08x\n", color); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 98671aa..e1fe0ee 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5082,7 +5082,11 @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_ break; case WINED3D_FFP_VS_FOG_DEPTH: - shader_addline(buffer, "gl_FogFragCoord = ec_pos.z;\n"); + if (settings->ortho_fog) + /* Need to undo the [0.0 - 1.0] -> [-1.0 - 1.0] transformation from D3D to GL coordinates. */ + shader_addline(buffer, "gl_FogFragCoord = gl_Position.z * 0.5 + 0.5;\n"); + else + shader_addline(buffer, "gl_FogFragCoord = ec_pos.z;\n"); break; default: @@ -6814,6 +6818,16 @@ static void glsl_vertex_pipe_shader(struct wined3d_context *context, context->select_shader = 1; } +static void glsl_vertex_pipe_projection(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + /* Table fog behavior depends on the projection matrix. */ + if (state->render_states[WINED3D_RS_FOGENABLE] + && state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) + context->select_shader = 1; + transform_projection(context, state, state_id); +} + static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, @@ -6867,7 +6881,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_VIEWPORT, {STATE_VIEWPORT, viewport_vertexpart }, WINED3D_GL_EXT_NONE }, /* Transform states */ {STATE_TRANSFORM(WINED3D_TS_VIEW), {STATE_TRANSFORM(WINED3D_TS_VIEW), transform_view }, WINED3D_GL_EXT_NONE }, - {STATE_TRANSFORM(WINED3D_TS_PROJECTION), {STATE_TRANSFORM(WINED3D_TS_PROJECTION), transform_projection }, WINED3D_GL_EXT_NONE }, + {STATE_TRANSFORM(WINED3D_TS_PROJECTION), {STATE_TRANSFORM(WINED3D_TS_PROJECTION), glsl_vertex_pipe_projection}, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE0), {STATE_TEXTURESTAGE(0, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE1), {STATE_TEXTURESTAGE(1, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TRANSFORM(WINED3D_TS_TEXTURE2), {STATE_TEXTURESTAGE(2, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5b7fb3c..9bbd65e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3614,10 +3614,19 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct & WINED3D_FFP_LIGHT_TYPE_MASK) << WINED3D_FFP_LIGHT_TYPE_SHIFT(i); } + settings->ortho_fog = 0; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) + { settings->fog_mode = WINED3D_FFP_VS_FOG_DEPTH; + + if (state->transforms[WINED3D_TS_PROJECTION].u.m[0][3] == 0.0f + && state->transforms[WINED3D_TS_PROJECTION].u.m[1][3] == 0.0f + && state->transforms[WINED3D_TS_PROJECTION].u.m[2][3] == 0.0f + && state->transforms[WINED3D_TS_PROJECTION].u.m[3][3] == 1.0f) + settings->ortho_fog = 1; + } else if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE) settings->fog_mode = WINED3D_FFP_VS_FOG_FOGCOORD; else if (state->render_states[WINED3D_RS_RANGEFOGENABLE]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dca0d61..3b75cf0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1737,7 +1737,8 @@ struct wined3d_ffp_vs_settings DWORD point_size : 1; DWORD fog_mode : 2; DWORD texcoords : 8; /* MAX_TEXTURES */ - DWORD padding : 15; + DWORD ortho_fog : 1; + DWORD padding : 14; BYTE texgen[MAX_TEXTURES]; };

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 23 Jul '13

23 Jul '13

Module: website Branch: master Commit: 32a20333b42941a55ce83ba56f2b754156df489d URL: http://source.winehq.org/git/website.git/?a=commit;h=32a20333b42941a55ce83b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 23 15:08:20 2013 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Frédéric Delanoy : Link to translated wiki homepage in French main help page
by Jeremy Newman 23 Jul '13

23 Jul '13

Module: website Branch: master Commit: 2e9f7c6c08e4e01b5d1738f28a0504e6dc71534d URL: http://source.winehq.org/git/website.git/?a=commit;h=2e9f7c6c08e4e01b5d1738… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:13:43 2013 +0200 Link to translated wiki homepage in French main help page --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index aa18446..493213e 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -50,7 +50,7 @@ payant pour Wine. <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> </td> <td valign="top"> - Notre <a href="http://wiki.winehq.org/">wiki</a> peut aussi vous aider. + Notre <a href="http://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. </td> </tr> @@ -93,7 +93,7 @@ intéressante. <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"><br>Bugzilla</a> </td> <td valign="top"> - Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bogues</a> + Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bugs</a> présente tous les problèmes sur lesquels nous avons travaillé ou travaillons actuellement. </td> </tr>

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
45
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 July 2013