wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Aurimas Fišeras : msi: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

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

Aurimas Fišeras : msrle32: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

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 : localui: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

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 : iccvid: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

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

Aurimas Fišeras : localspl: Add Lithuanian translation .
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 1631a6750d82fd283b324d91450dbf63aa38072e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1631a6750d82fd283b324d914… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 09:47:38 2009 +0300 localspl: Add Lithuanian translation. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Lt.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 71c1e46..8d0563f 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -41,6 +41,7 @@ #include "spl_De.rc" #include "spl_Fr.rc" #include "spl_Ko.rc" +#include "spl_Lt.rc" #include "spl_Nl.rc" #include "spl_No.rc" #include "spl_Pl.rc" diff --git a/dlls/localspl/spl_Lt.rc b/dlls/localspl/spl_Lt.rc new file mode 100644 index 0000000..321ab06 --- /dev/null +++ b/dlls/localspl/spl_Lt.rc @@ -0,0 +1,32 @@ +/* + * Lithuanian resources for localspl + * + * 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_LOCALPORT "Vietinis prievadas" + IDS_LOCALMONITOR "Vietinis monitorius" +} + +#pragma code_page(default)

1 0

Aurimas Fišeras : mpr: Add Lithuanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: d7434fea990b61394bbf4347ad46eb6ec8b2613e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7434fea990b61394bbf4347a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Jun 19 20:36:25 2009 +0300 mpr: Add Lithuanian translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Lt.rc | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index e9f0cfb..adc0d72 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -36,6 +36,7 @@ #include "mpr_It.rc" #include "mpr_Ja.rc" #include "mpr_Ko.rc" +#include "mpr_Lt.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" #include "mpr_Pl.rc" diff --git a/dlls/mpr/mpr_Lt.rc b/dlls/mpr/mpr_Lt.rc new file mode 100644 index 0000000..aa5dd14 --- /dev/null +++ b/dlls/mpr/mpr_Lt.rc @@ -0,0 +1,51 @@ +/* + * MPR dll resources + * + * 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_ENTIRENETWORK "Visas tinklas" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Įveskite tinklo slaptažodį" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Įveskite savo naudotojo vardą ir slaptažodį:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Įgaliot. serv.", -1, 40, 26, 50, 10 +/* LTEXT "Sritis", -1, 40, 46, 50, 10 */ + LTEXT "Naudotojas", -1, 40, 66, 50, 10 + LTEXT "Slaptažodis", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Į&rašyti šį slaptažodį (nesaugu)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default)

1 0

Stefan Dösinger : wined3d: GLSL 1. 20 includes gl_FragData[] syntax.
by Alexandre Julliard 22 Jun '09

22 Jun '09

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

Stefan Dösinger : wined3d: Advertise SM 3. 0 in ARB if the extensions are available.
by Alexandre Julliard 22 Jun '09

22 Jun '09

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

Stefan Dösinger : wined3d: Enable Shader Model 2. 0 in ARB.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e211a0b4a432013b76c1398fc99985951f98dc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e211a0b4a432013b76c1398fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:27:04 2009 +0200 wined3d: Enable Shader Model 2.0 in ARB. If the needed constants are available, we can support all vs_2_0 and ps_2_0 requirements with the plain ARB extensions. We cannot however, run SM 2.0a or SM 2.0b. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cab4bf7..fbd56a0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4124,15 +4124,33 @@ 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)) { - pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); - TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); + /* Shader Model 2.0 requires at least 256 vertex shader constants */ + if(GL_LIMITS(vshader_constantsF) >= 256) + { + pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); + TRACE_(d3d_caps)("Hardware vertex shader version 2.0 enabled (ARB_PROGRAM)\n"); + } + else + { + pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); + TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); + } pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - 1; } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { - pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); + /* Shader Model 2.0 requires at least 32 pixel shader constants */ + if(GL_LIMITS(vshader_constantsF) >= 32) + { + pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); + TRACE_(d3d_caps)("Hardware pixel shader version 2.0 enabled (ARB_PROGRAM)\n"); + } + else + { + pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); + TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); + } pCaps->PixelShader1xMaxValue = 8.0; - TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); }

1 0

Stefan Dösinger : wined3d: Make the ARB index offset work with emulated MOVA.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e1c6b73e2d4ab7b656b024d43ab22d99ed6066b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c6b73e2d4ab7b656b024d43… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jun 19 05:25:48 2009 +0200 wined3d: Make the ARB index offset work with emulated MOVA. --- dlls/wined3d/arb_program_shader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a43ad77..cab4bf7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1520,6 +1520,10 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ABS TA%s, %s;\n", write_mask, src0_param); shader_addline(buffer, "ADD TA%s, TA, mova_const.x;\n", write_mask); shader_addline(buffer, "FLR TA%s, TA;\n", write_mask); + if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) + { + shader_addline(buffer, "ADD TA%s, TA, helper_const.z;\n", write_mask); + } shader_addline(buffer, "MUL A0_SHADOW%s, TA, A0_SHADOW;\n", write_mask); ((struct shader_arb_ctx_priv *)ins->ctx->backend_data)->addr_reg[0] = '\0';

1 0

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 June 2009