Fix MagFilter state for texunit 0
authorKeith Whitwell <keith@tungstengraphics.com>
Thu, 30 Dec 2004 14:21:46 +0000 (14:21 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Thu, 30 Dec 2004 14:21:46 +0000 (14:21 +0000)
src/mesa/drivers/dri/unichrome/via_state.c

index 547bf8b7ff7d1d4ce908e338ba502ae3974ad7ae..08056106140df6f09334b77b9d0accd304384967 100644 (file)
@@ -864,13 +864,17 @@ static void viaChooseTextureState(GLcontext *ctx)
                 break;
             }
 
-           if (texObj->MagFilter) {
+           switch (texObj->MagFilter) {
+           case GL_LINEAR:
                 vmesa->regHTXnTB_0 |= HC_HTXnFLSe_Linear |
                                       HC_HTXnFLTe_Linear;
-            }
-            else {
+               break;
+           case GL_NEAREST:
                 vmesa->regHTXnTB_0 |= HC_HTXnFLSe_Nearest |
                                       HC_HTXnFLTe_Nearest;
+               break;
+           default:
+              break;
             }
 
            vmesa->regHTXnMPMD_0 &= ~(HC_HTXnMPMD_SMASK | HC_HTXnMPMD_TMASK);
@@ -928,14 +932,16 @@ static void viaChooseTextureState(GLcontext *ctx)
             }
 
            switch(texObj->MagFilter) {
-               case GL_NEAREST:
-                   vmesa->regHTXnTB_1 |= HC_HTXnFLSs_Nearest |
-                                     HC_HTXnFLTs_Nearest;
-                   break;
-               case GL_LINEAR:
-                   vmesa->regHTXnTB_1 |= HC_HTXnFLSs_Linear |
-                                     HC_HTXnFLTs_Linear;
-                   break;
+           case GL_NEAREST:
+              vmesa->regHTXnTB_1 |= HC_HTXnFLSs_Nearest |
+                 HC_HTXnFLTs_Nearest;
+              break;
+           case GL_LINEAR:
+              vmesa->regHTXnTB_1 |= HC_HTXnFLSs_Linear |
+                 HC_HTXnFLTs_Linear;
+              break;
+           default:
+              break;
            }
            
            vmesa->regHTXnMPMD_1 &= ~(HC_HTXnMPMD_SMASK | HC_HTXnMPMD_TMASK);