merge from master

[mesa.git] / src / mesa / drivers / x11 / xm_tri.c

diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index d08fd8f8161017737a391f96e59a191110ea4725..289ce11be62b335a50b2241b56039b3c8843965a 100644 (file)
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -1617,10 +1617,9 @@ get_triangle_func(GLcontext *ctx)
          }
       }
    }
+#endif /* CHAN_BITS == 8 */
 
-#else
    return (swrast_tri_func) NULL;
-#endif /* CHAN_BITS == 8 */
 }