]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
UNMERGE
authorhavoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Thu, 16 Sep 2010 08:45:34 +0000 (08:45 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:00:15 +0000 (22:00 +0200)
on D3D9 renderer do not allow textures to be uploaded with a size smaller than 2xN or Nx2 because the REF rasterizer refuses these (which makes PIX debugging hard)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10463 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=ff37132b0137d1e241c185a73e18d6fbc3c3cdb3

gl_textures.c

index 0d8c0feb5898d1b1e10bb714228bed65b5efe1d6..c7ec81f91456a5ed69e6ace27c67a1d1c3c28095 100644 (file)
@@ -493,25 +493,6 @@ static void GL_Texture_CalcImageSize(int texturetype, int flags, int miplevel, i
 {
        int picmip = 0, maxsize = 0, width2 = 1, height2 = 1, depth2 = 1, miplevels = 1;
 
-       switch(vid.renderpath)
-       {
-       case RENDERPATH_GL11:
-       case RENDERPATH_GL13:
-       case RENDERPATH_GL20:
-       case RENDERPATH_CGGL:
-       case RENDERPATH_D3D10:
-       case RENDERPATH_D3D11:
-               break;
-       case RENDERPATH_D3D9:
-               // for some reason the REF rasterizer (and hence the PIX debugger) does not like small textures...
-               if (indepth == 1)
-               {
-                       width2 = max(width2, 2);
-                       height2 = max(height2, 2);
-               }
-               break;
-       }
-
        switch (texturetype)
        {
        default: