diff --git a/src/swrenderer/drawers/r_draw_span32.h b/src/swrenderer/drawers/r_draw_span32.h
index dcd43312fc..a48ec844b6 100644
--- a/src/swrenderer/drawers/r_draw_span32.h
+++ b/src/swrenderer/drawers/r_draw_span32.h
@@ -86,9 +86,6 @@ namespace swrenderer
 			texdata.ystep = args.TextureVStep();
 			texdata.xfrac = args.TextureUPos();
 			texdata.yfrac = args.TextureVPos();
-			texdata.yshift = 32 - texdata.ybits;
-			texdata.xshift = texdata.yshift - texdata.xbits;
-			texdata.xmask = ((1 << texdata.xbits) - 1) << texdata.ybits;
 			
 			texdata.source = (const uint32_t*)args.TexturePixels();
 			
@@ -111,7 +108,11 @@ namespace swrenderer
 				}
 			}
 
-			bool is_nearest_filter = !((magnifying && r_magfilter) || (!magnifying && r_minfilter));
+			texdata.yshift = 32 - texdata.ybits;
+			texdata.xshift = texdata.yshift - texdata.xbits;
+			texdata.xmask = ((1 << texdata.xbits) - 1) << texdata.ybits;
+
+			bool is_nearest_filter = (magnifying && !r_magfilter) || (!magnifying && !r_minfilter);
 			bool is_64x64 = texdata.xbits == 6 && texdata.ybits == 6;
 			
 			auto shade_constants = args.ColormapConstants();
diff --git a/src/swrenderer/drawers/r_draw_span32_sse2.h b/src/swrenderer/drawers/r_draw_span32_sse2.h
index 68d68ec82d..8a4e28608a 100644
--- a/src/swrenderer/drawers/r_draw_span32_sse2.h
+++ b/src/swrenderer/drawers/r_draw_span32_sse2.h
@@ -86,9 +86,6 @@ namespace swrenderer
 			texdata.ystep = args.TextureVStep();
 			texdata.xfrac = args.TextureUPos();
 			texdata.yfrac = args.TextureVPos();
-			texdata.yshift = 32 - texdata.ybits;
-			texdata.xshift = texdata.yshift - texdata.xbits;
-			texdata.xmask = ((1 << texdata.xbits) - 1) << texdata.ybits;
 			
 			texdata.source = (const uint32_t*)args.TexturePixels();
 			
@@ -111,7 +108,11 @@ namespace swrenderer
 				}
 			}
 
-			bool is_nearest_filter = !((magnifying && r_magfilter) || (!magnifying && r_minfilter));
+			texdata.yshift = 32 - texdata.ybits;
+			texdata.xshift = texdata.yshift - texdata.xbits;
+			texdata.xmask = ((1 << texdata.xbits) - 1) << texdata.ybits;
+
+			bool is_nearest_filter = (magnifying && !r_magfilter) || (!magnifying && !r_minfilter);
 			bool is_64x64 = texdata.xbits == 6 && texdata.ybits == 6;
 			
 			auto shade_constants = args.ColormapConstants();