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

Stefan Dösinger : wined3d: Use GL_ARB_texture_non_power_of_two emulation.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: c088edeae7fed4645fa3f34fb5bacc1eeaa87706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c088edeae7fed4645fa3f34fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 18:59:10 2008 -0500 wined3d: Use GL_ARB_texture_non_power_of_two emulation. ATI cards prior to the radeon HD series did not have unconditional non power of two support. So far we've used texture_rectangle for that, or created a bigger power of two texture with padding. This had the disadvantage that we had to correct the coordinates, which causes extreme problems with shaders(doesn't work, pretty much). Both the MacOS and the fglrx driver have support for GL_ARB_texture_non_power_of_two, and run it on the hardware as long as we stay within the texture_rectangle limitations. This allows us to have conditional non power of two textures with normalized coordinates. This patch adds an internal extension, and the code creates a regular GL_TEXTURE_2D texture with NP2 size, but refuses mipmapping, filtering and texture_rectangle incompatible operations. This makes np2 textures work with shaders on fglrx and macos. --- dlls/wined3d/basetexture.c | 58 +++++++++++++++++++++++++------------ dlls/wined3d/cubetexture.c | 8 +++++ dlls/wined3d/device.c | 16 +++++++++- dlls/wined3d/directx.c | 39 +++++++++++++++---------- dlls/wined3d/state.c | 8 +++++ dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 8 +++++ dlls/wined3d/volumetexture.c | 8 +++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_gl.h | 3 ++ include/wine/wined3d_interface.h | 8 +++++ 11 files changed, 121 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c088edeae7fed4645fa3f…

1 0

Stefan Dösinger : wined3d: Correct the D3DTOP_LERP parameter order.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: a0cc79f0bf6f0b2617ea58e591646679af156f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0cc79f0bf6f0b2617ea58e59… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 7 17:22:00 2008 -0500 wined3d: Correct the D3DTOP_LERP parameter order. --- dlls/wined3d/ati_fragment_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 3dc3d2a..8989aa6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -593,9 +593,9 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G debug_register(arg2), debug_argmod(argmod2), debug_register(arg0), debug_argmod(argmod0)); GL_EXTCALL(glColorFragmentOp3ATI(GL_LERP_ATI, dstreg, GL_NONE, GL_NONE, + arg0, GL_NONE, argmod0, arg1, GL_NONE, argmod1, - arg2, GL_NONE, argmod2, - arg0, GL_NONE, argmod0)); + arg2, GL_NONE, argmod2)); break; case WINED3DTOP_BUMPENVMAP:

1 0

Stefan Dösinger : wined3d: Fix the MULTIPLYADD parameter orders in atifs.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 5b846adffd5e140fc9e973600cc418f34ffe032e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b846adffd5e140fc9e973600… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 7 17:06:33 2008 -0500 wined3d: Fix the MULTIPLYADD parameter orders in atifs. --- dlls/wined3d/ati_fragment_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 12e40ae..3dc3d2a 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -577,13 +577,13 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G case WINED3DTOP_MULTIPLYADD: TRACE("glColorFragmentOp3ATI(GL_MAD_ATI, %s, GL_NONE, GL_NONE, %s, GL_NONE, %s, %s, GL_NONE, %s, %s, GL_NONE, %s)\n", debug_register(dstreg), - debug_register(arg0), debug_argmod(argmod0), + debug_register(arg1), debug_argmod(argmod1), debug_register(arg2), debug_argmod(argmod2), - debug_register(arg1), debug_argmod(argmod1)); + debug_register(arg0), debug_argmod(argmod0)); GL_EXTCALL(glColorFragmentOp3ATI(GL_MAD_ATI, dstreg, GL_NONE, GL_NONE, - arg0, GL_NONE, argmod0, + arg1, GL_NONE, argmod1, arg2, GL_NONE, argmod2, - arg1, GL_NONE, argmod1)); + arg0, GL_NONE, argmod0)); break; case WINED3DTOP_LERP: @@ -735,13 +735,13 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G case WINED3DTOP_MULTIPLYADD: TRACE("glAlphaFragmentOp3ATI(GL_MAD_ATI, %s, GL_NONE, %s, GL_NONE, %s, %s, GL_NONE, %s, %s, GL_NONE, %s)\n", debug_register(dstreg), - debug_register(arg0), debug_argmod(argmod0), + debug_register(arg1), debug_argmod(argmod1), debug_register(arg2), debug_argmod(argmod2), - debug_register(arg1), debug_argmod(argmod1)); + debug_register(arg0), debug_argmod(argmod0)); GL_EXTCALL(glAlphaFragmentOp3ATI(GL_MAD_ATI, dstreg, GL_NONE, - arg0, GL_NONE, argmod0, + arg1, GL_NONE, argmod1, arg2, GL_NONE, argmod2, - arg1, GL_NONE, argmod1)); + arg0, GL_NONE, argmod0)); break; case WINED3DTOP_LERP:

1 0

Stefan Dösinger : d3d9: Unset the vertex shader in the compare_instructions test.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 3a224fe289ec1b107e6661427276ebfde16a3443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a224fe289ec1b107e6661427… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 7 17:00:49 2008 -0500 d3d9: Unset the vertex shader in the compare_instructions test. --- dlls/d3d9/tests/visual.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fdba43b..a63d5e3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5813,6 +5813,8 @@ void test_compare_instructions(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); color = getPixelColor(device, 160, 360); ok(color == 0x00FF00FF, "Compare test: Quad 1(sge vec) returned color 0x%08x, expected 0x00FF00FF\n", color);

1 0

Stefan Dösinger : wined3d: Move an VBO support check to the state template.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 55ab14a4ed241523680b901b0157caedb57daf0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ab14a4ed241523680b901b0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 16:46:21 2008 -0500 wined3d: Move an VBO support check to the state template. --- dlls/wined3d/state.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6550aa3..1237611 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3728,13 +3728,11 @@ static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } static void indexbuffer(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - if(GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { - if(stateblock->streamIsUP || stateblock->pIndexData == NULL ) { - GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); - } else { - IWineD3DIndexBufferImpl *ib = (IWineD3DIndexBufferImpl *) stateblock->pIndexData; - GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, ib->vbo)); - } + if(stateblock->streamIsUP || stateblock->pIndexData == NULL ) { + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); + } else { + IWineD3DIndexBufferImpl *ib = (IWineD3DIndexBufferImpl *) stateblock->pIndexData; + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, ib->vbo)); } } @@ -3818,7 +3816,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, 0 }, - { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, 0 }, + { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }, 0 }, { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }, 0 }, { STATE_RENDER(WINED3DRS_ZENABLE), { STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, 0 },

1 0

Stefan Dösinger : wined3d: Remove GL_EXT_vertex_weighting stubs.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: e5f42f91b6a69e1a0d0898936cdd5e4fece5d618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f42f91b6a69e1a0d0898936… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 16:26:33 2008 -0500 wined3d: Remove GL_EXT_vertex_weighting stubs. --- dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 16 ---------------- include/wine/wined3d_gl.h | 18 ------------------ 3 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 24a26d0..bb559aa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -112,7 +112,6 @@ static const struct { {"GL_EXT_texture_lod", EXT_TEXTURE_LOD, 0 }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS, 0 }, {"GL_EXT_vertex_shader", EXT_VERTEX_SHADER, 0 }, - {"GL_EXT_vertex_weighting", EXT_VERTEX_WEIGHTING, 0 }, {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS, 0 }, /* NV */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index abbeeb2..f665c05 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2864,8 +2864,6 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { } if (GL_SUPPORT(ARB_VERTEX_BLEND)) { glDisableClientState(GL_WEIGHT_ARRAY_ARB); - } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { - glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); } unloadTexCoords(stateblock); } @@ -3099,20 +3097,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte showfixme = FALSE; } } - } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { - /* FIXME("TODO\n");*/ -#if 0 - - GL_EXTCALL(glVertexWeightPointerEXT)( - WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType), - WINED3D_ATR_GLTYPE(sd->u.s.blendWeights.dwType), - sd->u.s.blendWeights.dwStride, - sd->u.s.blendWeights.lpData + stateblock->loadBaseVertexIndex * sd->u.s.blendWeights.dwStride); - checkGLcall("glVertexWeightPointerEXT(numBlends, ...)"); - glEnableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); - checkGLcall("glEnableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT)"); -#endif - } else { /* TODO: support blends in drawStridedSlow * No need to write a FIXME here, this is done after the general vertex decl decoding diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 58f0cbc..405ea68 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2450,23 +2450,6 @@ typedef void (WINE_GLAPI * PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint #define GL_INCR_WRAP_EXT 0x8507 #define GL_DECR_WRAP_EXT 0x8508 #endif -/* GL_EXT_vertex_weighting */ -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif /* GL_NV_half_float */ #ifndef GL_NV_half_float @@ -3346,7 +3329,6 @@ typedef enum _GL_SupportedExt { EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_SRGB, - EXT_VERTEX_WEIGHTING, EXT_GPU_PROGRAM_PARAMETERS, /* NVIDIA */ NV_HALF_FLOAT,

1 0

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

18 Jul '08

Module: wine Branch: master Commit: dc203d36c99e772acb70046b9d967e951decd2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc203d36c99e772acb70046b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 16:37:47 2008 -0500 wined3d: Remove more dead code. The opengl extension mentioned in that code was never finished, and as far as I know there is no way to make use of tangent data in the d3d fixed function pipeline as well. --- dlls/wined3d/state.c | 42 ++---------------------------------------- 1 files changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f665c05..6550aa3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3133,44 +3133,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte } #endif -#if 0 /* tangents ----------------------------------------------*/ - if (sd->u.s.tangent.lpData || sd->u.s.tangent.VBO || - sd->u.s.binormal.lpData || sd->u.s.binormal.VBO) { - /* TODO: tangents*/ - if (GL_SUPPORT(EXT_COORDINATE_FRAME) { - if (sd->u.s.tangent.lpData || sd->u.s.tangent.VBO) { - glEnable(GL_TANGENT_ARRAY_EXT); - (GL_EXTCALL)(TangentPointerEXT)( - WINED3D_ATR_GLTYPE(sd->u.s.tangent.dwType), - sd->u.s.tangent.dwStride, - sd->u.s.tangent.lpData + stateblock->loadBaseVertexIndex * sd->u.s.tangent.dwStride); - } else { - glDisable(GL_TANGENT_ARRAY_EXT); - } - if (sd->u.s.binormal.lpData || sd->u.s.binormal.VBO) { - glEnable(GL_BINORMAL_ARRAY_EXT); - (GL_EXTCALL)(BinormalPointerEXT)( - WINED3D_ATR_GLTYPE(sd->u.s.binormal.dwType), - sd->u.s.binormal.dwStride, - sd->u.s.binormal.lpData + stateblock->loadBaseVertexIndex * sd->u.s.binormal.dwStride); - } else{ - glDisable(GL_BINORMAL_ARRAY_EXT); - } - - } else { - /* don't bother falling back to 'slow' as we don't support software tangents and binormals yet . */ - /* FIXME: fixme once */ - TRACE("Hardware support for tangents and binormals is not avaiable, tangents and binormals disabled.\n"); - } - } else { - if (GL_SUPPORT(EXT_COORDINATE_FRAME) { - /* make sure fog is disabled */ - glDisable(GL_TANGENT_ARRAY_EXT); - glDisable(GL_BINORMAL_ARRAY_EXT); - } - } -#endif - /* Point Size ----------------------------------------------*/ if (sd->u.s.pSize.lpData || sd->u.s.pSize.VBO) { @@ -3427,8 +3389,8 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { FIXME("Tweening is only valid with vertex shaders\n"); } - if (!useVertexShaderFunction && (BUFFER_OR_DATA(tangent) || BUFFER_OR_DATA(binormal))) { - FIXME("Tangent and binormal bump mapping is only valid with vertex shaders\n"); + if (!useVertexShaderFunction && BUFFER_OR_DATA(binormal)) { + FIXME("Binormal bump mapping is only valid with vertex shaders\n"); } if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) { FIXME("Extended attributes are only valid with vertex shaders\n");

1 0

Stefan Dösinger : wined3d: Move the vertexblend support check to the template.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: ebc77732c1484d1b1cab9ad5cec84fb9c63918a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc77732c1484d1b1cab9ad5c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 16:21:26 2008 -0500 wined3d: Move the vertexblend support check to the template. --- dlls/wined3d/state.c | 65 +++++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index db3beea..abbeeb2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2628,6 +2628,25 @@ static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateblock, W } } +static void state_vertexblend_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + static BOOL once = FALSE; + + switch(stateblock->renderState[WINED3DRS_VERTEXBLEND]) { + case WINED3DVBF_1WEIGHTS: + case WINED3DVBF_2WEIGHTS: + case WINED3DVBF_3WEIGHTS: + if(!once) { + once = TRUE; + /* TODO: Implement vertex blending in drawStridedSlow */ + FIXME("Vertex blending enabled, but not supported by hardware\n"); + } + break; + + case WINED3DVBF_TWEENING: + WARN("Tweening not supported yet\n"); + } +} + static void state_vertexblend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { WINED3DVERTEXBLENDFLAGS val = stateblock->renderState[WINED3DRS_VERTEXBLEND]; @@ -2635,42 +2654,29 @@ static void state_vertexblend(DWORD state, IWineD3DStateBlockImpl *stateblock, W case WINED3DVBF_1WEIGHTS: case WINED3DVBF_2WEIGHTS: case WINED3DVBF_3WEIGHTS: - if(GL_SUPPORT(ARB_VERTEX_BLEND)) { - glEnable(GL_VERTEX_BLEND_ARB); - checkGLcall("glEnable(GL_VERTEX_BLEND_ARB)"); + glEnable(GL_VERTEX_BLEND_ARB); + checkGLcall("glEnable(GL_VERTEX_BLEND_ARB)"); - /* D3D adds one more matrix which has weight (1 - sum(weights)). This is enabled at context - * creation with enabling GL_WEIGHT_SUM_UNITY_ARB. - */ - GL_EXTCALL(glVertexBlendARB(stateblock->renderState[WINED3DRS_VERTEXBLEND] + 1)); - - if(!stateblock->wineD3DDevice->vertexBlendUsed) { - int i; - for(i = 1; i < GL_LIMITS(blends); i++) { - if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(i)))) { - transform_worldex(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(i)), stateblock, context); - } + /* D3D adds one more matrix which has weight (1 - sum(weights)). This is enabled at context + * creation with enabling GL_WEIGHT_SUM_UNITY_ARB. + */ + GL_EXTCALL(glVertexBlendARB(stateblock->renderState[WINED3DRS_VERTEXBLEND] + 1)); + + if(!stateblock->wineD3DDevice->vertexBlendUsed) { + int i; + for(i = 1; i < GL_LIMITS(blends); i++) { + if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(i)))) { + transform_worldex(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(i)), stateblock, context); } - stateblock->wineD3DDevice->vertexBlendUsed = TRUE; - } - } else { - static BOOL once = FALSE; - if(!once) { - once = TRUE; - /* TODO: Implement vertex blending in drawStridedSlow */ - FIXME("Vertex blending enabled, but not supported by hardware\n"); } + stateblock->wineD3DDevice->vertexBlendUsed = TRUE; } break; case WINED3DVBF_DISABLE: case WINED3DVBF_0WEIGHTS: /* for Indexed vertex blending - not supported */ - if(GL_SUPPORT(ARB_VERTEX_BLEND)) { - glDisable(GL_VERTEX_BLEND_ARB); - checkGLcall("glDisable(GL_VERTEX_BLEND_ARB)"); - } else { - TRACE("Vertex blending disabled\n"); - } + glDisable(GL_VERTEX_BLEND_ARB); + checkGLcall("glDisable(GL_VERTEX_BLEND_ARB)"); break; case WINED3DVBF_TWEENING: @@ -4330,7 +4336,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_SPECULARMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, 0 }, { STATE_RENDER(WINED3DRS_AMBIENTMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, 0 }, { STATE_RENDER(WINED3DRS_EMISSIVEMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, 0 }, - { STATE_RENDER(WINED3DRS_VERTEXBLEND), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }, 0 }, + { STATE_RENDER(WINED3DRS_VERTEXBLEND), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }, ARB_VERTEX_BLEND }, + { STATE_RENDER(WINED3DRS_VERTEXBLEND), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend_w }, 0 }, { STATE_RENDER(WINED3DRS_POINTSIZE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext }, EXT_POINT_PARAMETERS },

1 0

Stefan Dösinger : wined3d: Check for ATI_ENVMAP_BUMPMAP in the template.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: f981afd7d316612a821891d2ec92dc7155175be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f981afd7d316612a821891d2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 16:14:00 2008 -0500 wined3d: Check for ATI_ENVMAP_BUMPMAP in the template. Note that GL_ATI_envmap_bumpmap is not the same as GL_ATI_fragment_shader. envmap_bumpmap is used together with the regular opengl ffp pipeline and is not used (other than for pixelformats) if GL_ATI_fragment_shader is used. --- dlls/wined3d/state.c | 91 ++++++++++++++++++++++++------------------------- 1 files changed, 45 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f981afd7d316612a82189…

1 0

Stefan Dösinger : wined3d: Only register the np2 texture fixup if needed.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 8bb11dad76623ef01e52c5504ece1107dddd1e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb11dad76623ef01e52c5504… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 16:07:00 2008 -0500 wined3d: Only register the np2 texture fixup if needed. --- dlls/wined3d/state.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9caa24b..32916d3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2355,7 +2355,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W * 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(sampler < MAX_TEXTURES) { if(stateblock->textureDimensions[sampler] == GL_TEXTURE_2D || stateblock->textureDimensions[sampler] == GL_TEXTURE_RECTANGLE_ARB) { if(((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0 || @@ -4345,14 +4345,25 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_arb }, ARB_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_ext }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_w }, 0 }, - /* Samplers for NP2 texture matrix adjustions */ + /* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported, + * so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states. + * otherwise, register sampler_texmatrix, which takes care of updating the texture matrix + */ + { STATE_SAMPLER(0), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texmatrix }, 0 }, + { STATE_SAMPLER(1), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texmatrix }, 0 }, + { STATE_SAMPLER(2), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texmatrix }, 0 }, + { STATE_SAMPLER(3), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texmatrix }, 0 }, + { STATE_SAMPLER(4), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texmatrix }, 0 }, + { STATE_SAMPLER(5), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texmatrix }, 0 }, + { STATE_SAMPLER(6), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texmatrix }, 0 }, + { STATE_SAMPLER(7), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texmatrix }, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0