July 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Remove some dead code.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: e27734779c5e817684dda62e9a0e837ff84f59e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27734779c5e817684dda62e9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 17:43:57 2008 -0500 wined3d: Remove some dead code. --- dlls/wined3d/state.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d86fb6e..106fb55 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4473,42 +4473,12 @@ static void ffp_fragment_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_in if (GL_SUPPORT(ARB_TEXTURE_ENV_DOT3)) pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3; - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | - WINED3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA; - } - if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAP; - } else if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - /* Bump mapping is supported already in NV_TEXTURE_SHADER, but that extension does - * not support 3D textures. This asks for trouble if an app uses both bump mapping - * and 3D textures. It also allows us to keep the code simpler by having texture - * shaders constantly enabled. - */ - pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAP; - /* TODO: Luminance bump map? */ } -#if 0 - /* FIXME: Add - pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE - WINED3DTEXOPCAPS_PREMODULATE */ -#endif - pCaps->MaxTextureBlendStages = GL_LIMITS(texture_stages); pCaps->MaxSimultaneousTextures = GL_LIMITS(textures); - - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; - } - - /* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ -#if 0 - if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; -#endif - } static HRESULT ffp_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Separate texture_activate_dimensions.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 197f472ea8d15bb77362fa55524e4eeae3049827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197f472ea8d15bb77362fa555… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 17:25:23 2008 -0500 wined3d: Separate texture_activate_dimensions. This creates an nvts version of this function, and removes the nvts code from the original one. The nvts version is used by the nvts pipeline implementation, the original one by the nvrc-only, atifs and ffp one. --- dlls/wined3d/nvidia_texture_shader.c | 79 +++++++++++++++++--- dlls/wined3d/utils.c | 139 +++++++++++++--------------------- 2 files changed, 120 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=197f472ea8d15bb77362f…

1 0

Stefan Dösinger : wined3d: Give nv* fixed function stuff its own state template.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 88ae2fe14a72141fc42b66267596dce7feb294cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ae2fe14a72141fc42b66267… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 18:31:34 2008 -0500 wined3d: Give nv* fixed function stuff its own state template. --- dlls/wined3d/nvidia_texture_shader.c | 374 +++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 117 +++-------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 402 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88ae2fe14a72141fc42b6…

1 0

Stefan Dösinger : wined3d: Move shader constant affecting states to the misc pipeline.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 38934fe70d7ffd2353351a7986346f4a205adc1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38934fe70d7ffd2353351a798… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 16:54:06 2008 -0500 wined3d: Move shader constant affecting states to the misc pipeline. As long as we have the shader constants in misc, it is best to keep all the code that affects shader constants, like bumpenvmat setting, in there as well. --- dlls/wined3d/state.c | 75 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38934fe70d7ffd2353351…

1 0

Stefan Dösinger : wined3d: WINED3DTSS_TEXCOORDINDEX belongs to the vertex pipeline.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 84d39a95e5af50746999af5804a05d4210c8fba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d39a95e5af50746999af580… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 16:33:40 2008 -0500 wined3d: WINED3DTSS_TEXCOORDINDEX belongs to the vertex pipeline. --- dlls/wined3d/state.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84d39a95e5af50746999a…

1 0

Stefan Dösinger : wined3d: Give the nvts/ nvrc code its own pipeline implementation.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 86b033bbb94c46ee6ad2ed30f8188c965a27fee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b033bbb94c46ee6ad2ed30f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 16:15:18 2008 -0500 wined3d: Give the nvts/nvrc code its own pipeline implementation. This code creates the structures and the pipeline selection, as well as the caps filling. It does not yet move the actual code around, since this will be a bigger task. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/directx.c | 7 ++- dlls/wined3d/nvidia_texture_shader.c | 119 ++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 19 +----- dlls/wined3d/wined3d_private.h | 4 + 5 files changed, 133 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 61acef9..d09e88b 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -19,6 +19,7 @@ C_SRCS = \ drawprim.c \ glsl_shader.c \ indexbuffer.c \ + nvidia_texture_shader.c \ palette.c \ pixelshader.c \ query.c \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0a6cec3..4b38291 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2894,8 +2894,13 @@ static const struct fragment_pipeline *select_fragment_implementation(UINT Adapt select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode); if(ps_selected_mode == SHADER_ATI) { return &atifs_fragment_pipeline; + } else if(GL_SUPPORT(NV_REGISTER_COMBINERS) && GL_SUPPORT(NV_TEXTURE_SHADER2)) { + return &nvts_fragment_pipeline; + } else if(GL_SUPPORT(NV_REGISTER_COMBINERS)) { + return &nvrc_fragment_pipeline; + } else { + return &ffp_fragment_pipeline; } - return &ffp_fragment_pipeline; } /* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c new file mode 100644 index 0000000..5058ab4 --- /dev/null +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -0,0 +1,119 @@ +/* + * Fixed function pipeline replacement using GL_NV_register_combiners + * and GL_NV_texture_shader + * + * Copyright 2006 Henri Verbeet + * Copyright 2008 Stefan D�singer(for CodeWeavers) + * + * 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 + */ +#include "config.h" + +#include <math.h> +#include <stdio.h> + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +#define GLINFO_LOCATION (*gl_info) +static void nvrc_enable(IWineD3DDevice *iface, BOOL enable) { } + +static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { + if(enable) { + glEnable(GL_TEXTURE_SHADER_NV); + checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); + } else { + glDisable(GL_TEXTURE_SHADER_NV); + checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); + } +} + +static void nvrc_fragment_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct fragment_caps *pCaps) { + pCaps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | + WINED3DTEXOPCAPS_ADDSIGNED | + WINED3DTEXOPCAPS_ADDSIGNED2X | + WINED3DTEXOPCAPS_MODULATE | + WINED3DTEXOPCAPS_MODULATE2X | + WINED3DTEXOPCAPS_MODULATE4X | + WINED3DTEXOPCAPS_SELECTARG1 | + WINED3DTEXOPCAPS_SELECTARG2 | + WINED3DTEXOPCAPS_DISABLE | + WINED3DTEXOPCAPS_BLENDDIFFUSEALPHA | + WINED3DTEXOPCAPS_BLENDTEXTUREALPHA | + WINED3DTEXOPCAPS_BLENDFACTORALPHA | + WINED3DTEXOPCAPS_BLENDCURRENTALPHA | + WINED3DTEXOPCAPS_LERP | + WINED3DTEXOPCAPS_SUBTRACT | + WINED3DTEXOPCAPS_ADDSMOOTH | + WINED3DTEXOPCAPS_MULTIPLYADD | + WINED3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR | + WINED3DTEXOPCAPS_MODULATECOLOR_ADDALPHA | + WINED3DTEXOPCAPS_BLENDTEXTUREALPHAPM | + WINED3DTEXOPCAPS_DOTPRODUCT3 | + WINED3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR | + WINED3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA; + + if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { + /* Bump mapping is supported already in NV_TEXTURE_SHADER, but that extension does + * not support 3D textures. This asks for trouble if an app uses both bump mapping + * and 3D textures. It also allows us to keep the code simpler by having texture + * shaders constantly enabled. + */ + pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAP; + /* TODO: Luminance bump map? */ + } + +#if 0 + /* FIXME: Add + pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE + WINED3DTEXOPCAPS_PREMODULATE */ +#endif + + pCaps->MaxTextureBlendStages = GL_LIMITS(texture_stages); + pCaps->MaxSimultaneousTextures = GL_LIMITS(textures); + + pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; + + /* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ +#if 0 + if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) + pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; +#endif +} + +static HRESULT nvrc_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static void nvrc_fragment_free(IWineD3DDevice *iface) {} + +/* Two fixed function pipeline implementations using GL_NV_register_combiners and + * GL_NV_texture_shader. The nvts_fragment_pipeline assumes that both extensions + * are available(geforce 3 and newer), while nvrc_fragment_pipeline uses only the + * register combiners extension(Pre-GF3). + */ +const struct fragment_pipeline nvts_fragment_pipeline = { + nvts_enable, + nvrc_fragment_get_caps, + nvrc_fragment_alloc, + nvrc_fragment_free, + ffp_fragmentstate_template +}; + +const struct fragment_pipeline nvrc_fragment_pipeline = { + nvrc_enable, + nvrc_fragment_get_caps, + nvrc_fragment_alloc, + nvrc_fragment_free, + ffp_fragmentstate_template +}; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d1d64fe..56fe01b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4311,7 +4311,7 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { {0 /* Terminate */, { 0, 0 }}, }; -static const struct StateEntryTemplate ffp_fragmentstate_template[] = { +const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop }}, { STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG1), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop }}, { STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG2), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop }}, @@ -4465,20 +4465,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { #undef GLINFO_LOCATION #define GLINFO_LOCATION (*gl_info) -static void nvts_enable(IWineD3DDevice *iface, BOOL enable) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - if(enable) { - glEnable(GL_TEXTURE_SHADER_NV); - checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else { - glDisable(GL_TEXTURE_SHADER_NV); - checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); - } - } -} +static void ffp_enable(IWineD3DDevice *iface, BOOL enable) { } static void ffp_fragment_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct fragment_caps *pCaps) { pCaps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | @@ -4556,7 +4543,7 @@ static void ffp_fragment_free(IWineD3DDevice *iface) {} #undef GLINFO_LOCATION const struct fragment_pipeline ffp_fragment_pipeline = { - nvts_enable, + ffp_enable, ffp_fragment_get_caps, ffp_fragment_alloc, ffp_fragment_free, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5c067ed..05952d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,6 +560,10 @@ extern const struct StateEntryTemplate misc_state_template[]; extern const struct StateEntryTemplate ffp_vertexstate_template[]; extern const struct fragment_pipeline ffp_fragment_pipeline; extern const struct fragment_pipeline atifs_fragment_pipeline; +extern const struct fragment_pipeline nvts_fragment_pipeline; +extern const struct fragment_pipeline nvrc_fragment_pipeline; + +extern const struct StateEntryTemplate ffp_fragmentstate_template[]; /* temporary */ /* "Base" state table */ void compile_state_table(struct StateEntry *StateTable,

1 0

Stefan Dösinger : wined3d: Simplify the fragment pipeline selection.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 7c216b8ab507e5658fe48ab68f46994903975e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c216b8ab507e5658fe48ab68… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 15:48:45 2008 -0500 wined3d: Simplify the fragment pipeline selection. This should do the same as the existing code, but it is more obvious. --- dlls/wined3d/directx.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a88f443..0a6cec3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2892,13 +2892,10 @@ static const struct fragment_pipeline *select_fragment_implementation(UINT Adapt int ps_selected_mode; select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode); - if (ps_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_ARB) { - return &ffp_fragment_pipeline; - } else if (ps_selected_mode != SHADER_NONE && !GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + if(ps_selected_mode == SHADER_ATI) { return &atifs_fragment_pipeline; - } else { - return &ffp_fragment_pipeline; } + return &ffp_fragment_pipeline; } /* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true

1 0

Stefan Dösinger : wined3d: Move fixed function texture dimension updates to the fragment pipeline.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 51e64b3fe95afb3246c8690d9ea1e7b4c38ce2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e64b3fe95afb3246c8690d9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 12:06:58 2008 -0500 wined3d: Move fixed function texture dimension updates to the fragment pipeline. This is a further separation of the sampler state, and a preparation to move the nv texture shader stuff to its own pipeline implementation. --- dlls/wined3d/ati_fragment_shader.c | 8 ++++++++ dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/utils.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 6fc0aa4..a41f686 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -958,6 +958,14 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT01), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), set_bumpmat }}, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT10), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), set_bumpmat }}, {STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), set_bumpmat }}, + { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }}, + { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }}, + { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }}, + { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }}, + { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }}, + { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }}, + { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }}, + { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }}, {0 /* Terminate */, { 0, 0 }}, }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b96f80f..d1d64fe 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2430,10 +2430,6 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont glEnable(stateblock->textureDimensions[sampler]); checkGLcall("glEnable(stateblock->textureDimensions[sampler])"); } else if(sampler < stateblock->lowest_disabled_stage) { - if(!isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) { - texture_activate_dimensions(sampler, stateblock, context); - } - if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && sampler == 0) { /* If color keying is enabled update the alpha test, it depends on the existence * of a color key in stage 0 @@ -2444,10 +2440,6 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } else if(mapped_stage < GL_LIMITS(textures)) { if(sampler < stateblock->lowest_disabled_stage) { /* TODO: What should I do with pixel shaders here ??? */ - if(!isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) { - texture_activate_dimensions(sampler, stateblock, context); - } - if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && sampler == 0) { /* If color keying is enabled update the alpha test, it depends on the existence * of a color key in stage 0 @@ -4460,6 +4452,14 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, pixelshader }}, { STATE_RENDER(WINED3DRS_BORDERCOLOR), { STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }}, { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }}, + { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }}, + { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }}, + { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }}, + { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }}, + { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }}, + { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }}, + { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }}, + { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }}, {0 /* Terminate */, { 0, 0 }}, }; #undef GLINFO_LOCATION diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5a02717..71833d5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3498,4 +3498,20 @@ void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock } } } + +void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + DWORD sampler = state - STATE_SAMPLER(0); + DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[sampler]; + + /* No need to enable / disable anything here for unused samplers. The tex_colorop + * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop + * will take care of this business + */ + if(mapped_stage == -1 || mapped_stage >= GL_LIMITS(textures)) return; + if(sampler >= stateblock->lowest_disabled_stage) return; + if(use_ps(stateblock->wineD3DDevice)) return; + if(isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; + + texture_activate_dimensions(sampler, stateblock, context); +} #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d5352ea..5c067ed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1733,6 +1733,7 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTURE void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst); void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, BOOL transformed, DWORD coordtype); void texture_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); +void sampler_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height); GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain);

1 0

Stefan Dösinger : wined3d: NP2 coordinate adjustment is a vertex operation.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: d3c29b706394e13ed9949d814f92b747609686db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c29b706394e13ed9949d814… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 3 13:26:06 2008 -0500 wined3d: NP2 coordinate adjustment is a vertex operation. When a sampler is changed and unconditional NP2 textures are not supported, the texture matrix may need adjustment. The sampler state function checks for that, and calls the texture transform setting function in that case. However, samplers are a misc state, and the texture transform flags a vertex state. Thus split up the code and move the matrix changes to the vertex side. --- dlls/wined3d/state.c | 66 +++++++++++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3e45942..b96f80f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2344,6 +2344,38 @@ static void tex_bumpenvloffset(DWORD state, IWineD3DStateBlockImpl *stateblock, } } +static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + BOOL texIsPow2 = FALSE; + DWORD sampler = state - STATE_SAMPLER(0); + + if(!stateblock->textures[sampler]) return; + /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates + * IWineD3DBaseTexture::ApplyStateChanges multiplies the set matrix with a fixup matrix. Before the + * scaling is reapplied or removed, the texture matrix has to be reapplied + * + * The mapped stage is alrady active because the sampler() function below, which is part of the + * misc pipeline + */ + if(!GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) && sampler < MAX_TEXTURES) { + if(stateblock->textureDimensions[sampler] == GL_TEXTURE_2D || + stateblock->textureDimensions[sampler] == GL_TEXTURE_RECTANGLE_ARB) { + if(((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0 || + ((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[5] != 1.0 ) { + texIsPow2 = TRUE; + } + } else if(stateblock->textureDimensions[sampler] == GL_TEXTURE_CUBE_MAP_ARB) { + if(((IWineD3DCubeTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0) { + texIsPow2 = TRUE; + } + } + + if(texIsPow2 || context->lastWasPow2Texture[sampler]) { + context->lastWasPow2Texture[sampler] = texIsPow2; + transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stateblock->wineD3DDevice->texUnitMap[sampler]), stateblock, context); + } + } +} + static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD sampler = state - STATE_SAMPLER(0); DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[sampler]; @@ -2375,31 +2407,6 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } if(stateblock->textures[sampler]) { - BOOL texIsPow2 = FALSE; - - /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates - * IWineD3DBaseTexture::ApplyStateChanges multiplies the set matrix with a fixup matrix. Before the - * scaling is reapplied or removed, the texture matrix has to be reapplied - */ - if(!GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) && sampler < MAX_TEXTURES) { - if(stateblock->textureDimensions[sampler] == GL_TEXTURE_2D || - stateblock->textureDimensions[sampler] == GL_TEXTURE_RECTANGLE_ARB) { - if(((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0 || - ((IWineD3DTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[5] != 1.0 ) { - texIsPow2 = TRUE; - } - } else if(stateblock->textureDimensions[sampler] == GL_TEXTURE_CUBE_MAP_ARB) { - if(((IWineD3DCubeTextureImpl *) stateblock->textures[sampler])->baseTexture.pow2Matrix[0] != 1.0) { - texIsPow2 = TRUE; - } - } - - if(texIsPow2 || context->lastWasPow2Texture[sampler]) { - context->lastWasPow2Texture[sampler] = texIsPow2; - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stateblock->wineD3DDevice->texUnitMap[sampler]), stateblock, context); - } - } - IWineD3DBaseTexture_PreLoad(stateblock->textures[sampler]); IWineD3DBaseTexture_ApplyStateChanges(stateblock->textures[sampler], stateblock->textureState[sampler], stateblock->samplerState[sampler]); @@ -4300,6 +4307,15 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSCALE_B), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, { STATE_RENDER(WINED3DRS_POINTSCALE_C), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }}, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }}, + /* Samplers for NP2 texture matrix adjustions */ + { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texmatrix }}, + { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texmatrix }}, + { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texmatrix }}, + { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texmatrix }}, + { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texmatrix }}, + { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texmatrix }}, + { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texmatrix }}, + { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texmatrix }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Juan Lang : crypt32: Don' t expect ImageGetCertificateData to succeed when Certificate is NULL.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: e5e551dfbe0723927c6fed89d4d6ff265bddaf4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e551dfbe0723927c6fed89d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 11 08:54:45 2008 -0700 crypt32: Don't expect ImageGetCertificateData to succeed when Certificate is NULL. --- dlls/crypt32/object.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 4184e6c..3eb8988 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -413,10 +413,10 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { - DWORD len; + DWORD len = 0; ret = ImageGetCertificateData(file, 0, NULL, &len); - if (ret) + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { WIN_CERTIFICATE *winCert = HeapAlloc(GetProcessHeap(), 0, len);

1 0