summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-02-19 12:41:21 -0700
committerBrian Paul <brianp@vmware.com>2010-02-19 12:43:47 -0700
commit984b72ad5f47cda8e141dc38524f6a0598dcc541 (patch)
treed02fcf1a8e99632b5de930a275ca3ad9fadc0f58
parentda43aa84c8abc13bb8a2c8d0af57471862881523 (diff)
mesa: remove abs/negate from fetch_vector1ui()
This function is only used for the NV unpack instructions. Negate/abs make no sense and removing the code fixes Windows compiler warnings. Found by Karl Schultz.
-rw-r--r--src/mesa/shader/prog_execute.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 3b51f986e8..a1c20a325e 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -356,20 +356,7 @@ fetch_vector1ui(const struct prog_src_register *source,
const struct gl_program_machine *machine)
{
const GLuint *src = (GLuint *) get_src_register_pointer(source, machine);
- GLuint result;
-
- ASSERT(src);
-
- result = src[GET_SWZ(source->Swizzle, 0)];
-
- if (source->Abs) {
- result = FABSF(result);
- }
- if (source->Negate) {
- result = -result;
- }
-
- return result;
+ return src[GET_SWZ(source->Swizzle, 0)];
}