summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-08-07 22:05:11 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-08-07 22:05:11 +0000
commit94f494e780b8dc920c773189d458ccd733f39b27 (patch)
treef49231c34d83bd70dde3d6b6ee1c22a65c2e9446
parentebc9f221b2f02a0256cd7c5426155933e50ab3b7 (diff)
removed some now bogus assertions (due to Klaus's latest optimization)
-rw-r--r--src/mesa/swrast/s_texture.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 2f39dc5f51..3d8b41de60 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -1,4 +1,4 @@
-/* $Id: s_texture.c,v 1.36 2001/08/07 17:26:10 brianp Exp $ */
+/* $Id: s_texture.c,v 1.37 2001/08/07 22:05:11 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -875,8 +875,6 @@ opt_sample_rgb_2d( GLcontext *ctx, GLuint texUnit,
(void) lambda;
ASSERT(tObj->WrapS==GL_REPEAT);
ASSERT(tObj->WrapT==GL_REPEAT);
- ASSERT(tObj->MinFilter==GL_NEAREST);
- ASSERT(tObj->MagFilter==GL_NEAREST);
ASSERT(img->Border==0);
ASSERT(img->Format==GL_RGB);
@@ -918,8 +916,6 @@ opt_sample_rgba_2d( GLcontext *ctx, GLuint texUnit,
(void) lambda;
ASSERT(tObj->WrapS==GL_REPEAT);
ASSERT(tObj->WrapT==GL_REPEAT);
- ASSERT(tObj->MinFilter==GL_NEAREST);
- ASSERT(tObj->MagFilter==GL_NEAREST);
ASSERT(img->Border==0);
ASSERT(img->Format==GL_RGBA);