January 2007 - Wine-Commits

Stefan Dösinger : wined3d: Remove dead NV_TEXTURE_SHADER code
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 60c9ea67510c3b9e109bf20227b47a024f64fa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c9ea67510c3b9e109bf2022… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:48:10 2007 +0100 wined3d: Remove dead NV_TEXTURE_SHADER code --- dlls/wined3d/utils.c | 82 ---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 83 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c1dceb3..94a29d2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1670,88 +1670,6 @@ void set_tex_op(IWineD3DDevice *iface, B case WINED3DTOP_BUMPENVMAP: { - if (GL_SUPPORT(NV_TEXTURE_SHADER)) { - /* - texture unit 0: GL_TEXTURE_2D - texture unit 1: GL_DOT_PRODUCT_NV - texture unit 2: GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV - texture unit 3: GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV - */ - float m[2][2]; - - union { - float f; - DWORD d; - } tmpvalue; - - tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT00]; - m[0][0] = tmpvalue.f; - tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT01]; - m[0][1] = tmpvalue.f; - tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT10]; - m[1][0] = tmpvalue.f; - tmpvalue.d = This->stateBlock->textureState[Stage][WINED3DTSS_BUMPENVMAT11]; - m[1][1] = tmpvalue.f; - - /*FIXME("Stage %d matrix is (%.2f,%.2f),(%.2f,%.2f)\n", Stage, m[0][0], m[0][1], m[1][0], m[1][0]);*/ - - if (!This->texture_shader_active) { - This->texture_shader_active = TRUE; - glEnable(GL_TEXTURE_SHADER_NV); - } - - /* - glEnable(GL_REGISTER_COMBINERS_NV); - glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 1); - glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_A_NV, GL_TEXTURE0_ARB, GL_SIGNED_IDENTITY_NV, GL_RGB); - glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_B_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_RGB); - glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_C_NV, GL_TEXTURE2_ARB, GL_SIGNED_IDENTITY_NV, GL_RGB); - glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, GL_VARIABLE_D_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_RGB); - glCombinerOutputNV (GL_COMBINER0_NV, GL_RGB, GL_DISCARD_NV, GL_DISCARD_NV, GL_PRIMARY_COLOR_NV, 0, 0, 0, 0, 0); - glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_A_NV, GL_TEXTURE0_ARB, GL_SIGNED_IDENTITY_NV, GL_ALPHA); - glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_B_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_ALPHA); - glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_C_NV, GL_TEXTURE2_ARB, GL_SIGNED_IDENTITY_NV, GL_ALPHA); - glCombinerInputNV (GL_COMBINER0_NV, GL_ALPHA, GL_VARIABLE_D_NV, GL_NONE, GL_UNSIGNED_INVERT_NV, GL_ALPHA); - glCombinerOutputNV (GL_COMBINER0_NV, GL_ALPHA, GL_DISCARD_NV, GL_DISCARD_NV, GL_PRIMARY_COLOR_NV, 0, 0, 0, 0, 0); - glDisable (GL_PER_STAGE_CONSTANTS_NV); - glCombinerParameteriNV (GL_COLOR_SUM_CLAMP_NV, 0); - glFinalCombinerInputNV (GL_VARIABLE_A_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB); - glFinalCombinerInputNV (GL_VARIABLE_B_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB); - glFinalCombinerInputNV (GL_VARIABLE_C_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB); - glFinalCombinerInputNV (GL_VARIABLE_D_NV, GL_PRIMARY_COLOR_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB); - glFinalCombinerInputNV (GL_VARIABLE_E_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB); - glFinalCombinerInputNV (GL_VARIABLE_F_NV, 0, GL_UNSIGNED_IDENTITY_NV, GL_RGB); - glFinalCombinerInputNV (GL_VARIABLE_G_NV, GL_PRIMARY_COLOR_NV, GL_UNSIGNED_IDENTITY_NV, GL_ALPHA); - */ - /* - int i; - for (i = 0; i < Stage; i++) { - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_ACTIVETEXTURE(i); - glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D); - checkGLcall("Activate texture.."); - } else if (i>0) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - } - } - */ - /* - GL_ACTIVETEXTURE(Stage - 1); - glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D); - */ - /* - GL_ACTIVETEXTURE(Stage); - checkGLcall("Activate texture.. to update const color"); - glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_OFFSET_TEXTURE_2D_NV); - checkGLcall("glTexEnv"); - glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + Stage - 1); - checkGLcall("glTexEnv"); - glTexEnvfv(GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, (float*)&m[0]); - checkGLcall("glTexEnv"); - */ - LEAVE_GL(); - return; - } } case WINED3DTOP_BUMPENVMAPLUMINANCE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0166637..5fe7c71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -576,7 +576,6 @@ typedef struct IWineD3DDeviceImpl #define IS_TRACKING 1 /* tracking_parm is tracking diffuse color */ #define NEEDS_TRACKING 2 /* Tracking needs to be enabled when needed */ #define NEEDS_DISABLE 3 /* Tracking needs to be disabled when needed*/ - BOOL texture_shader_active; /* TODO: Confirm use is correct */ BOOL last_was_notclipped; BOOL untransformed; BOOL last_was_pshader;

1 0

Stefan Dösinger : wined3d: Do not activate / deactivate texture dimensions twice.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: b07c48c499a0d452788e65fad3296d6a66876632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07c48c499a0d452788e65fad… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:44:55 2007 +0100 wined3d: Do not activate / deactivate texture dimensions twice. --- dlls/wined3d/state.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9ab7e62..bc2686f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1440,7 +1440,12 @@ static void tex_colorop(DWORD state, IWi return; } - if (mapped_stage != -1) activate_dimensions(stage, stateblock); + /* The sampler will also activate the correct texture dimensions, so no need to do it here + * if the sampler for this stage is dirty + */ + if(!isStateDirty(stateblock->wineD3DDevice, STATE_SAMPLER(stage))) { + if (mapped_stage != -1) activate_dimensions(stage, stateblock); + } /* Set the texture combiners */ if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { @@ -1816,7 +1821,9 @@ static void sampler(DWORD state, IWineD3 glEnable(stateblock->textureDimensions[sampler]); checkGLcall("glEnable(stateblock->textureDimensions[sampler])"); } else if(sampler < stateblock->lowest_disabled_stage) { - activate_dimensions(sampler, stateblock); + if(!isStateDirty(stateblock->wineD3DDevice, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) { + activate_dimensions(sampler, stateblock); + } if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && sampler == 0) { /* If color keying is enabled update the alpha test, it depends on the existence @@ -1827,10 +1834,10 @@ static void sampler(DWORD state, IWineD3 } } else if(sampler < GL_LIMITS(texture_stages)) { if(sampler < stateblock->lowest_disabled_stage) { - /* TODO: Check if the colorop is dirty to do that job - * TODO: What should I do with pixel shaders here ??? - */ - activate_dimensions(sampler, stateblock); + /* TODO: What should I do with pixel shaders here ??? */ + if(!isStateDirty(stateblock->wineD3DDevice, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) { + activate_dimensions(sampler, stateblock); + } } /* Otherwise tex_colorop disables the stage */ glBindTexture(GL_TEXTURE_1D, stateblock->wineD3DDevice->dummyTextureName[sampler]); checkGLcall("glBindTexture(GL_TEXTURE_1D, stateblock->wineD3DDevice->dummyTextureName[sampler])");

1 0

Stefan Dösinger : wined3d: D3D7 vertex buffers never change their declaration.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 70831d1d2dfcbe8353e597e57f0dc39b700534f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70831d1d2dfcbe8353e597e57… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:43:27 2007 +0100 wined3d: D3D7 vertex buffers never change their declaration. --- dlls/wined3d/vertexbuffer.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 181c244..da22469 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -165,6 +165,13 @@ inline BOOL WINAPI IWineD3DVertexBufferI WineDirect3DVertexStridedData strided; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + /* In d3d7 the vertex buffer declaration NEVER changes because it is stored in the d3d7 vertex buffer. + * Once we have our declaration there is no need to look it up again. + */ + if(((IWineD3DImpl *)device->wineD3D)->dxVersion == 7 && This->Flags & VBFLAG_HASDESC) { + return FALSE; + } + memset(&strided, 0, sizeof(strided)); /* There are certain vertex data types that need to be fixed up. The Vertex Buffers FVF doesn't * help finding them, only the vertex declaration or the device FVF can determine that at drawPrim

1 0

Stefan Dösinger : wined3d: Fix a capital letter in a parameter name.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 08c7b3947b9b982928c1b4f8a3d7fd5847737000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c7b3947b9b982928c1b4f8a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:40:28 2007 +0100 wined3d: Fix a capital letter in a parameter name. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1ad3425..9ab7e62 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1986,7 +1986,7 @@ static void transform_view(DWORD state, } } -static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateBlock) { +static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateblock) { WARN("World matrix 1 - 255 not supported yet\n"); }

1 0

Stefan Dösinger : wined3d: Add copyright statements to state.c.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 7fd246ebe3fcea47261c0a742f1e249412c3a1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd246ebe3fcea47261c0a742… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:38:00 2007 +0100 wined3d: Add copyright statements to state.c. --- dlls/wined3d/state.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e4d3549..1ad3425 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1,7 +1,13 @@ /* * Direct3D state management * - * Copyright 2006 Stefan D�singer for CodeWeavers + * Copyright 2002 Lionel Ulmer + * Copyright 2002-2005 Jason Edmeades + * Copyright 2003-2004 Raphael Junqueira + * Copyright 2004 Christian Costa + * Copyright 2005 Oliver Stieber + * Copyright 2006 Henri Verbeet + * Copyright 2006-2007 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

1 0

Stefan Dösinger : wined3d: Attempt to remove some tabs smuggled in by xcode.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: fe6165db19a60b21e0e30832aaf405de9f28b125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6165db19a60b21e0e30832a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:37:03 2007 +0100 wined3d: Attempt to remove some tabs smuggled in by xcode. --- dlls/wined3d/state.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fc6439c..e4d3549 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -81,9 +81,9 @@ static void state_lighting(DWORD state, * vertex declaration appplying function calls this function for updating */ - if(isStateDirty(stateblock->wineD3DDevice, STATE_VDECL)) { - return; - } + if(isStateDirty(stateblock->wineD3DDevice, STATE_VDECL)) { + return; + } normals = stateblock->wineD3DDevice->strided_streams.u.s.normal.lpData != NULL || stateblock->wineD3DDevice->strided_streams.u.s.normal.VBO != 0; @@ -664,7 +664,7 @@ static void state_fog(DWORD state, IWine /* DX 7 sdk: "If both render states(vertex and table fog) are set to valid modes, * the system will apply only pixel(=table) fog effects." */ - else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == D3DFOG_NONE) { + else if(stateblock->renderState[WINED3DRS_FOGTABLEMODE] == D3DFOG_NONE) { glHint(GL_FOG_HINT, GL_FASTEST); checkGLcall("glHint(GL_FOG_HINT, GL_FASTEST)"); stateblock->wineD3DDevice->last_was_foggy_shader = FALSE; @@ -1981,7 +1981,7 @@ static void transform_view(DWORD state, } static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateBlock) { - WARN("World matrix 1 - 255 not supported yet\n"); + WARN("World matrix 1 - 255 not supported yet\n"); } static const GLfloat invymat[16] = { @@ -2549,8 +2549,7 @@ static inline void handleStreams(IWineD3 */ TRACE("================ FVF ===================\n"); memset(dataLocations, 0, sizeof(*dataLocations)); - primitiveConvertToStridedData((IWineD3DDevice *) device, dataLocations, - &fixup); + primitiveConvertToStridedData((IWineD3DDevice *) device, dataLocations, &fixup); if(TRACE_ON(d3d)) { drawPrimitiveTraceDataLocations(dataLocations); }

1 0

Stefan Dösinger : wined3d: Do not warn about unsupported point sizes if the default values are set.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 953f8d7b37aede5a9626c822dd9617e9e9ff925f URL: http://source.winehq.org/git/wine.git/?a=commit;h=953f8d7b37aede5a9626c822d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:32:07 2007 +0100 wined3d: Do not warn about unsupported point sizes if the default values are set. --- 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 0e323cf..fc6439c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -929,17 +929,16 @@ static void state_psizemin(DWORD state, float f; } tmpvalue; + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { - tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, tmpvalue.f); checkGLcall("glPointParameterfARB(..."); } else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { - tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); checkGLcall("glPointParameterfEXT(...);"); - } else { - FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl\n"); + } else if(tmpvalue.f != 1.0) { + FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl, value is %f\n", tmpvalue.f); } } @@ -949,17 +948,16 @@ static void state_psizemax(DWORD state, float f; } tmpvalue; + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { - tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, tmpvalue.f); checkGLcall("glPointParameterfARB(..."); } else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { - tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); checkGLcall("glPointParameterfEXT(...);"); - } else { - FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl\n"); + } else if(tmpvalue.f != 64.0) { + FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl, value is %f\n", tmpvalue.f); } }

1 0

Stefan Dösinger : wined3d: Avoid false resultarg warnings.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 60ea760945179e2c71cbcfb1e5742592a2e6a2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ea760945179e2c71cbcfb1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:31:18 2007 +0100 wined3d: Avoid false resultarg warnings. --- dlls/wined3d/state.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f62db54..0e323cf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1725,6 +1725,10 @@ static void tex_bumpenvloffset(DWORD sta static void tex_resultarg(DWORD state, IWineD3DStateBlockImpl *stateblock) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; + if(stage >= GL_LIMITS(texture_stages)) { + return; + } + if(stateblock->textureState[stage][WINED3DTSS_RESULTARG] != D3DTA_CURRENT) { ERR("WINED3DTSS_RESULTARG not supported yet\n"); }

1 0

Stefan Dösinger : ddraw: Get some texture stage states from their equivalent sampler states.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: 3d14118fb7d49be07e35a2b1c1b403b689f9d1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d14118fb7d49be07e35a2b1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:29:55 2007 +0100 ddraw: Get some texture stage states from their equivalent sampler states. --- dlls/ddraw/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ba3154..62cfa50 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3975,10 +3975,48 @@ IDirect3DDeviceImpl_7_GetTextureStageSta if(!State) return DDERR_INVALIDPARAMS; - return IWineD3DDevice_GetTextureStageState(This->wineD3DDevice, - Stage, - TexStageStateType, - State); + switch(TexStageStateType) + { + /* Mipfilter is a sampler state with different values */ + case D3DTSS_MIPFILTER: + { + HRESULT hr; + WINED3DTEXTUREFILTERTYPE value; + + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_MIPFILTER, + &value); + switch(value) + { + case WINED3DTEXF_NONE: *State = D3DTFP_NONE; break; + case WINED3DTEXF_POINT: *State = D3DTFP_POINT; break; + case WINED3DTEXF_LINEAR: *State = D3DTFP_LINEAR; break; + default: + ERR("Unexpected mipfilter value %d\n", value); + *State = D3DTFP_NONE; + } + return hr; + } + + /* Minfilter is a sampler state too, equal values */ + case D3DTSS_MINFILTER: + return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_MINFILTER, + State); + /* Same for MAGFILTER */ + case D3DTSS_MAGFILTER: + return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_MAGFILTER, + State); + default: + return IWineD3DDevice_GetTextureStageState(This->wineD3DDevice, + Stage, + TexStageStateType, + State); + } } static HRESULT WINAPI

1 0

Stefan Dösinger : wined3d: Store the scissor rect in the stateblock.
by Alexandre Julliard Jan. 10, 2007

Jan. 10, 2007

Module: wine Branch: master Commit: d4b63bbd87a221c725aff56b300224e55aa1f0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b63bbd87a221c725aff56b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:28:42 2007 +0100 wined3d: Store the scissor rect in the stateblock. --- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/stateblock.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3300cdd..7b81f0e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3180,6 +3180,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl RECT windowRect; UINT winHeight; + This->updateStateBlock->set.scissorRect = TRUE; + This->updateStateBlock->changed.scissorRect = TRUE; + memcpy(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)); + + if(This->isRecordingState) { + TRACE("Recording... not performing anything\n"); + return WINED3D_OK; + } + GetClientRect(((IWineD3DSwapChainImpl *)This->swapchains[0])->win_handle, &windowRect); /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply * Warning2: Even in windowed mode the coords are relative to the window, not the screen @@ -3197,17 +3206,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_GetScissorRect(IWineD3DDevice *iface, RECT* pRect) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - GLint scissorBox[4]; - ENTER_GL(); - /** FIXME: Windows uses a top,left origin openGL uses a bottom Right? **/ - glGetIntegerv(GL_SCISSOR_BOX, scissorBox); - pRect->left = scissorBox[0]; - pRect->top = scissorBox[1]; - pRect->right = scissorBox[0] + scissorBox[2]; - pRect->bottom = scissorBox[1] + scissorBox[3]; + memcpy(pRect, &This->updateStateBlock->scissorRect, sizeof(pRect)); TRACE("(%p)Returning a Scissor Rect of %d:%d-%d:%d\n", This, pRect->left, pRect->top, pRect->right, pRect->bottom); - LEAVE_GL(); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dba9e8a..093c83d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -78,6 +78,7 @@ void stateblock_savedstates_copy( dest->vertexDecl = source->vertexDecl; dest->pixelShader = source->pixelShader; dest->vertexShader = source->vertexShader; + dest->scissorRect = dest->scissorRect; /* Fixed size arrays */ memcpy(dest->streamSource, source->streamSource, bsize * MAX_STREAMS); @@ -115,6 +116,7 @@ void stateblock_savedstates_set( states->vertexDecl = value; states->pixelShader = value; states->vertexShader = value; + states->scissorRect = value; /* Fixed size arrays */ memset(states->streamSource, value, bsize * MAX_STREAMS); @@ -168,6 +170,7 @@ void stateblock_copy( Dest->material = This->material; Dest->pixelShader = This->pixelShader; Dest->glsl_program = This->glsl_program; + memcpy(&Dest->scissorRect, &This->scissorRect, sizeof(Dest->scissorRect)); /* Fixed size arrays */ memcpy(Dest->vertexShaderConstantB, This->vertexShaderConstantB, sizeof(BOOL) * MAX_CONST_B); @@ -484,6 +487,14 @@ static HRESULT WINAPI IWineD3DStateBloc memcpy(&This->viewport, &targetStateBlock->viewport, sizeof(WINED3DVIEWPORT)); } + if(This->set.scissorRect && memcmp(&targetStateBlock->scissorRect, + &This->scissorRect, + sizeof(targetStateBlock->scissorRect))) + { + TRACE("Updating scissor rect\n"); + memcpy(&targetStateBlock->scissorRect, &This->scissorRect, sizeof(targetStateBlock->scissorRect)); + } + for (i = 0; i < MAX_STREAMS; i++) { if (This->set.streamSource[i] && ((This->streamStride[i] != targetStateBlock->streamStride[i]) || @@ -656,6 +667,9 @@ should really perform a delta so that on if (This->set.viewport && This->changed.viewport) IWineD3DDevice_SetViewport(pDevice, &This->viewport); + if (This->set.scissorRect && This->changed.scissorRect) + IWineD3DDevice_SetScissorRect(pDevice, &This->scissorRect); + /* TODO: Proper implementation using SetStreamSource offset (set to 0 for the moment)\n") */ for (i=0; i<MAX_STREAMS; i++) { if (This->set.streamSource[i] && This->changed.streamSource[i]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 323fa38..0166637 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1155,6 +1155,7 @@ typedef struct SAVEDSTATES { BOOL vertexShaderConstantsB[MAX_CONST_B]; BOOL vertexShaderConstantsI[MAX_CONST_I]; BOOL *vertexShaderConstantsF; + BOOL scissorRect; } SAVEDSTATES; typedef struct { @@ -1243,6 +1244,9 @@ struct IWineD3DStateBlockImpl /* Current GLSL Shader Program */ struct glsl_shader_prog_link *glsl_program; + + /* Scissor test rectangle */ + RECT scissorRect; }; extern void stateblock_savedstates_set(

1 0