June 2009 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Advertise SM 3. 0 in ARB if the extensions are available.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 3845b37a213eef7b903dc0a7d3823f5882ee946b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3845b37a213eef7b903dc0a7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:28:41 2009 +0200 wined3d: Advertise SM 3.0 in ARB if the extensions are available. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fbd56a0..affc2ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4124,9 +4124,14 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g none_shader_backend.shader_get_caps(devtype, gl_info, pCaps); if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { - /* Shader Model 2.0 requires at least 256 vertex shader constants */ - if(GL_LIMITS(vshader_constantsF) >= 256) + if(GL_SUPPORT(NV_VERTEX_PROGRAM3)) { + pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); + TRACE_(d3d_caps)("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); + } + else if(GL_LIMITS(vshader_constantsF) >= 256) + { + /* Shader Model 2.0 requires at least 256 vertex shader constants */ pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); TRACE_(d3d_caps)("Hardware vertex shader version 2.0 enabled (ARB_PROGRAM)\n"); } @@ -4139,9 +4144,14 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { - /* Shader Model 2.0 requires at least 32 pixel shader constants */ - if(GL_LIMITS(vshader_constantsF) >= 32) + if(GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) + { + pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); + TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); + } + else if(GL_LIMITS(vshader_constantsF) >= 32) { + /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); TRACE_(d3d_caps)("Hardware pixel shader version 2.0 enabled (ARB_PROGRAM)\n"); }

1 0

Aurimas Fišeras : localui: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 8cbf64602bb458a87f9771687cc685c0e045fa9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbf64602bb458a87f9771687… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 10:01:05 2009 +0300 localui: Add Lithuanian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Lt.rc | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 815cac0..9963acb 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -43,6 +43,7 @@ #include "ui_En.rc" #include "ui_Fr.rc" #include "ui_Ko.rc" +#include "ui_Lt.rc" #include "ui_Nl.rc" #include "ui_No.rc" #include "ui_Pl.rc" diff --git a/dlls/localui/ui_Lt.rc b/dlls/localui/ui_Lt.rc new file mode 100644 index 0000000..660cea4 --- /dev/null +++ b/dlls/localui/ui_Lt.rc @@ -0,0 +1,59 @@ +/* + * Lithuanian resources for localui + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Pridėti vietinį prievadą" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Įveskite pridedamo prievado vardą:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "Gerai", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Atsisakyti", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Konfigūruoti LPT prievadą" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Laukimo laikas (sekundėmis)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Perdavimo pakartojimas:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "Gerai", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Atsisakyti", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Vietinis prievadas" + IDS_INVALIDNAME "'%s' yra netinkamas prievado vardas" + IDS_PORTEXISTS "Prievadas %s jau egzistuoja" + IDS_NOTHINGTOCONFIG "Šis prievadas neturi parinkčių konfigūravimui" +} + +#pragma code_page(default)

1 0

Aurimas Fišeras : msvfw32: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 3c4cbd4dca29f70fc4fb134fd23f983e62174fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4cbd4dca29f70fc4fb134fd… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 10:58:47 2009 +0300 msvfw32: Add Lithuanian translation. --- dlls/msvfw32/msvfw32_Lt.rc | 56 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Lt.rc b/dlls/msvfw32/msvfw32_Lt.rc new file mode 100644 index 0000000..21b9902 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Lt.rc @@ -0,0 +1,56 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 192, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Vaizdų glaudinimas" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Gerai",IDOK,129,2,54,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,129,18,54,14 + + LTEXT "&Metodas:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Kon&figūruoti...",882,129,36,54,14 + PUSHBUTTON "&Apie...",883,129,52,54,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Glaudinimo &kokybė:",886,9,34,80,8 + + CONTROL "&Rakt. kadras kas",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "kadrų",889,103,62,26,10 + + CONTROL "&Duomenų sparta",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sek",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Pilni kadrai (neglaudinti)" +} + +#pragma code_page(default) diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index 512f341..a24ab3c 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -27,6 +27,7 @@ #include "msvfw32_Fr.rc" #include "msvfw32_Hu.rc" #include "msvfw32_Ko.rc" +#include "msvfw32_Lt.rc" #include "msvfw32_Nl.rc" #include "msvfw32_No.rc" #include "msvfw32_Pl.rc"

1 0

Aurimas Fišeras : msi: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: a66dc8f981c55a059c4d100fdcbc7b290179b613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66dc8f981c55a059c4d100fd… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 10:14:40 2009 +0300 msi: Add Lithuanian translation. --- dlls/msi/msi.rc | 1 + dlls/msi/msi_Lt.rc | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index ffcb0c1..89d524c 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -38,6 +38,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "msi_Hu.rc" #include "msi_It.rc" #include "msi_Ko.rc" +#include "msi_Lt.rc" #include "msi_Nl.rc" #include "msi_No.rc" #include "msi_Pl.rc" diff --git a/dlls/msi/msi_Lt.rc b/dlls/msi/msi_Lt.rc new file mode 100644 index 0000000..769d2c0 --- /dev/null +++ b/dlls/msi/msi_Lt.rc @@ -0,0 +1,39 @@ +/* + * Lithuanian resources for MSI + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 4 "Nepavyko atverti nurodyto diegimo paketo. Patikrinkite failo kelią ir mėginkite dar kartą." + 5 "kelias %s nerastas" + 9 "įdėkite diską %s" + 10 "blogi parametrai" + 11 "įveskite aplanką, kuris turi %s" + 12 "trūksta diegimo šaltinio komponentui" + 13 "trūksta tinklo disko komponentui" + 14 "komponentas iš:" + 15 "parinkite aplanką, kuris turi %s" +} + +#pragma code_page(default)

1 0

Stefan Dösinger : wined3d: GLSL 1. 20 includes gl_FragData[] syntax.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 95788401af0f299ba7189b8a3f412a74b18b0713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95788401af0f299ba7189b8a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:17:45 2009 +0200 wined3d: GLSL 1.20 includes gl_FragData[] syntax. This means we don't have to enable ARB_draw_buffers explicitly. --- dlls/wined3d/glsl_shader.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e065296..035844a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -189,10 +189,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ "Fragment shader was successfully compiled to run on hardware.\n" - "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported", "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ - "WARNING: 0:2: extension 'GL_ARB_draw_buffers' is not supported\n" /* MacOS ati */ }; if (!TRACE_ON(d3d_shader) && !FIXME_ON(d3d_shader)) return; @@ -1258,9 +1256,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx >= GL_LIMITS(buffers)) WARN("Write to render target %u, only %d supported\n", reg->idx, GL_LIMITS(buffers)); - if (GL_SUPPORT(ARB_DRAW_BUFFERS)) sprintf(register_name, "gl_FragData[%u]", reg->idx); - /* On older cards with GLSL support like the GeforceFX there's only one buffer. */ - else sprintf(register_name, "gl_FragColor"); + sprintf(register_name, "gl_FragData[%u]", reg->idx); break; case WINED3DSPR_RASTOUT: @@ -3647,9 +3643,6 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, shader_addline(buffer, "#version 120\n"); - if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { - shader_addline(buffer, "#extension GL_ARB_draw_buffers : enable\n"); - } if(GL_SUPPORT(ARB_SHADER_TEXTURE_LOD) && reg_maps->usestexldd) { shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); } @@ -3676,17 +3669,10 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, if (reg_maps->shader_version.major < 2) { /* Some older cards like GeforceFX ones don't support multiple buffers, so also not gl_FragData */ - if(GL_SUPPORT(ARB_DRAW_BUFFERS)) - shader_addline(buffer, "gl_FragData[0] = R0;\n"); - else - shader_addline(buffer, "gl_FragColor = R0;\n"); + shader_addline(buffer, "gl_FragData[0] = R0;\n"); } - if(GL_SUPPORT(ARB_DRAW_BUFFERS)) { - fragcolor = "gl_FragData[0]"; - } else { - fragcolor = "gl_FragColor"; - } + fragcolor = "gl_FragData[0]"; if(args->srgb_correction) { shader_addline(buffer, "tmp0.xyz = pow(%s.xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", fragcolor, srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high,

1 0

Aurimas Fišeras : msvidc32: Add Lithuanian translation .
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 1c8361485488fb3627aefd0d96d592ff16753bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8361485488fb3627aefd0d9… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 11:03:17 2009 +0300 msvidc32: Add Lithuanian translation. --- dlls/msvidc32/msvidc32_Lt.rc | 30 ++++++++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Lt.rc b/dlls/msvidc32/msvidc32_Lt.rc new file mode 100644 index 0000000..f83bce3 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Lt.rc @@ -0,0 +1,30 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 vaizdo kodekas" +} + +#pragma code_page(default) diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index f7f7630..68c8dbf 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -25,6 +25,7 @@ #include "msvidc32_En.rc" #include "msvidc32_Hu.rc" #include "msvidc32_Ko.rc" +#include "msvidc32_Lt.rc" #include "msvidc32_Nl.rc" #include "msvidc32_No.rc" #include "msvidc32_Pl.rc"

1 0

Aurimas Fišeras : msrle32: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 555184fea1fc9995214808a857883fdc0727fb08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=555184fea1fc9995214808a85… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 10:29:41 2009 +0300 msrle32: Add Lithuanian translation. --- dlls/msrle32/msrle_Lt.rc | 33 +++++++++++++++++++++++++++++++++ dlls/msrle32/rsrc.rc | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/msrle_Lt.rc b/dlls/msrle32/msrle_Lt.rc new file mode 100644 index 0000000..26e661b --- /dev/null +++ b/dlls/msrle32/msrle_Lt.rc @@ -0,0 +1,33 @@ +/* + * Lithuanian resource file for MS-RLE + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE vaizdo kodekas" + IDS_ABOUT "Wine MS-RLE vaizdo kodekas\nAutoriaus teisės Michael Günnewig, 2002" +} + +#pragma code_page(default) diff --git a/dlls/msrle32/rsrc.rc b/dlls/msrle32/rsrc.rc index 6d3ff95..09d2cf2 100644 --- a/dlls/msrle32/rsrc.rc +++ b/dlls/msrle32/rsrc.rc @@ -42,6 +42,7 @@ #include "msrle_It.rc" #include "msrle_Ja.rc" #include "msrle_Ko.rc" +#include "msrle_Lt.rc" #include "msrle_Nl.rc" #include "msrle_No.rc" #include "msrle_Pl.rc"

1 0

Aurimas Fišeras : iccvid: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 7f68ffe557167083939e287597ef45ec6d241896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f68ffe557167083939e28759… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 09:52:11 2009 +0300 iccvid: Add Lithuanian translation. --- dlls/iccvid/iccvid_Lt.rc | 30 ++++++++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Lt.rc b/dlls/iccvid/iccvid_Lt.rc new file mode 100644 index 0000000..b5157e8 --- /dev/null +++ b/dlls/iccvid/iccvid_Lt.rc @@ -0,0 +1,30 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak vaizdo kodekas" + IDS_DESCRIPTION "Cinepak vaizdo kodekas" +} + +#pragma code_page(default) diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index e751220..6a1955c 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -25,6 +25,7 @@ #include "iccvid_Fr.rc" #include "iccvid_Hu.rc" #include "iccvid_Ko.rc" +#include "iccvid_Lt.rc" #include "iccvid_Nl.rc" #include "iccvid_No.rc" #include "iccvid_Pl.rc"

1 0

Stefan Dösinger : d3d9: Add a SGN test.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 2364ce08e541783521c89dbb43eb5c67f54fe991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2364ce08e541783521c89dbb4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 17 19:20:02 2009 +0200 d3d9: Add a SGN test. --- dlls/d3d9/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 22 +++++++++++++--- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d83a586..410246b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10278,6 +10278,57 @@ static void loop_index_test(IDirect3DDevice9 *device) { IDirect3DVertexShader9_Release(shader); } +static void sgn_test(IDirect3DDevice9 *device) { + const DWORD shader_code[] = { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position o0 */ + 0x05000051, 0xa00f0000, 0xbf000000, 0x00000000, 0x3f000000, 0x41400000, /* def c0, -0.5, 0.0, 0.5, 12.0 */ + 0x05000051, 0xa00f0001, 0x3fc00000, 0x00000000, 0x00000000, 0x00000000, /* def c1, 1.5, 0.0, 0.0, 0.0 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000022, 0x800f0000, 0xa0e40000, /* sgn r0, c0 */ + 0x03000002, 0xd00f0000, 0x80e40000, 0xa0e40001, /* add oD0, r0, c1 */ + 0x0000ffff /* end */ + }; + IDirect3DVertexShader9 *shader; + HRESULT hr; + DWORD color; + const float quad[] = { + -1.0, -1.0, 0.1, + 1.0, -1.0, 0.1, + -1.0, 1.0, 0.1, + 1.0, 1.0, 0.1 + }; + + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x008000ff, 1), + "sgn test returned color 0x%08x, expected 0x008000ff\n", color); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); + IDirect3DVertexShader9_Release(shader); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -10389,6 +10440,7 @@ START_TEST(visual) test_mova(device_ptr); loop_index_test(device_ptr); sincos_test(device_ptr); + sgn_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { test_vshader_input(device_ptr); test_vshader_float16(device_ptr); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c886195..324f029 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2319,16 +2319,30 @@ static void shader_hw_sgn(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - FIXME("Emulated SGN untested\n"); /* If SRC > 0.0, -SRC < SRC = TRUE, otherwise false. * if SRC < 0.0, SRC < -SRC = TRUE. If neither is true, src = 0.0 */ if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) { shader_addline(buffer, "SLT %s, -%s, %s;\n", dst_name, src_name, src_name); } else { - shader_addline(buffer, "SLT TB, -%s, %s;\n", src_name, src_name); - shader_addline(buffer, "SLT TC, %s, -%s;\n", src_name, src_name); - shader_addline(buffer, "ADD %s, TB, -TC;\n", dst_name); + /* src contains TA? Write to the dest first. This won't overwrite our destination. + * Then use TA, and calculate the final result + * + * Not reading from TA? Store the first result in TA to avoid overwriting the + * destination if src reg = dst reg + */ + if(strstr(src_name, "TA")) + { + shader_addline(buffer, "SLT %s, %s, -%s;\n", dst_name, src_name, src_name); + shader_addline(buffer, "SLT TA, -%s, %s;\n", src_name, src_name); + shader_addline(buffer, "ADD %s, %s, -TA;\n", dst_name, dst_name); + } + else + { + shader_addline(buffer, "SLT TA, -%s, %s;\n", src_name, src_name); + shader_addline(buffer, "SLT %s, %s, -%s;\n", dst_name, src_name, src_name); + shader_addline(buffer, "ADD %s, TA, -%s;\n", dst_name, dst_name); + } } }

1 0

Stefan Dösinger : wined3d: XXXC CC doesn' t work even with NV_FP2 on.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 77820d5ea576836ce31e0167c14213ac318c7990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77820d5ea576836ce31e0167c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:39:32 2009 +0200 wined3d: XXXC CC doesn't work even with NV_FP2 on. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 29e55c6..a43ad77 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2526,7 +2526,7 @@ static void shader_hw_breakc(const struct wined3d_shader_instruction *ins) } else { - shader_addline(buffer, "SUBC CC, %s, %s;\n", src_name0, src_name1); + shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); shader_addline(buffer, "BRK (%s.x);\n", comp); } } @@ -2566,7 +2566,7 @@ static void shader_hw_ifc(const struct wined3d_shader_instruction *ins) } else { - shader_addline(buffer, "SUBC CC, %s, %s;\n", src_name0, src_name1); + shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); shader_addline(buffer, "IF %s.x;\n", comp); } }

1 0