From 94a7cd42ed13d1f644ef5ac4d0e8aa614083541e Mon Sep 17 00:00:00 2001 From: Tobias Jakobi Date: Thu, 26 Mar 2009 03:47:58 +0100 Subject: [PATCH] wined3d: Simplify sampler_texmatrix using pow2Matrix_identity. --- dlls/wined3d/state.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2aa2b78cd36..47a94a0c66b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3290,8 +3290,7 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, W } static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - BOOL texIsPow2 = FALSE; - DWORD sampler = state - STATE_SAMPLER(0); + const DWORD sampler = state - STATE_SAMPLER(0); IWineD3DBaseTexture *texture = stateblock->textures[sampler]; TRACE("state %#x, stateblock %p, context %p\n", state, stateblock, context); @@ -3305,21 +3304,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W * misc pipeline */ if(sampler < MAX_TEXTURES) { - UINT texture_dimensions = IWineD3DBaseTexture_GetTextureDimensions(texture); - - if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) - { - if(((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0 || - ((IWineD3DTextureImpl *)texture)->baseTexture.pow2Matrix[5] != 1.0 ) { - texIsPow2 = TRUE; - } - } - else if (texture_dimensions == GL_TEXTURE_CUBE_MAP_ARB) - { - if(((IWineD3DCubeTextureImpl *)texture)->baseTexture.pow2Matrix[0] != 1.0) { - texIsPow2 = TRUE; - } - } + const BOOL texIsPow2 = !((IWineD3DBaseTextureImpl *)texture)->baseTexture.pow2Matrix_identity; if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) { -- 2.11.4.GIT