Mesa (master): mesa: remove the redundant check
Yuanhan Liu
yliu at kemper.freedesktop.org
Thu Nov 3 02:27:32 UTC 2011
Module: Mesa
Branch: master
Commit: d9f05ac828986a2fcdca9fcae29d76f79847d8d3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9f05ac828986a2fcdca9fcae29d76f79847d8d3
Author: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Date: Fri Oct 21 11:24:18 2011 +0800
mesa: remove the redundant check
Signed-off-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/main/texparam.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index a242448..6da730d 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -394,12 +394,11 @@ set_tex_parameteri(struct gl_context *ctx,
return GL_FALSE;
}
ASSERT(comp < 4);
- if (swz >= 0) {
- flush(ctx);
- texObj->Swizzle[comp] = params[0];
- set_swizzle_component(&texObj->_Swizzle, comp, swz);
- return GL_TRUE;
- }
+
+ flush(ctx);
+ texObj->Swizzle[comp] = params[0];
+ set_swizzle_component(&texObj->_Swizzle, comp, swz);
+ return GL_TRUE;
}
goto invalid_pname;
More information about the mesa-commit
mailing list