Stefan Dösinger : wined3d: 1x1 texures have a power of two size.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 196c88cfc4ad4d14a8e6091aa59111aa511ee31b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=196c88cfc4ad4d14a8e6091aa5...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Fri Apr 12 14:12:40 2013 +0200

wined3d: 1x1 texures have a power of two size.

---

 dlls/wined3d/texture.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 9bf4c2e..5b83d4a 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -965,15 +965,13 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he
             && !(format->id == WINED3DFMT_P8_UINT && gl_info->supported[EXT_PALETTED_TEXTURE]
             && wined3d_settings.rendertargetlock_mode == RTL_READTEX))
     {
-        if (width != 1 || height != 1)
-            texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT;
-
         texture->pow2_matrix[0] = (float)width;
         texture->pow2_matrix[5] = (float)height;
         texture->pow2_matrix[10] = 1.0f;
         texture->pow2_matrix[15] = 1.0f;
         texture->target = GL_TEXTURE_RECTANGLE_ARB;
         texture->flags |= WINED3D_TEXTURE_COND_NP2;
+        texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT;
 
         if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING)
             texture->min_mip_lookup = minMipLookup_noMip;