summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/nouveau/nv10_state_frag.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_frag.c b/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
index c007c6c6bc2..e78eac353bd 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
@@ -135,7 +135,7 @@ get_input_source(struct combiner_state *rc, int source)
/* Get the RC input mapping for the specified texture_env_combine
* operand, possibly inverted or biased. */
#define INVERT 0x1
-#define HALF_BIAS 0x2
+#define NORMALIZE 0x2
static uint32_t
get_input_mapping(struct combiner_state *rc, int operand, int flags)
@@ -148,12 +148,12 @@ get_input_mapping(struct combiner_state *rc, int operand, int flags)
map |= RC_IN_USAGE(ALPHA);
if (is_negative_operand(operand) == !(flags & INVERT))
- map |= flags & HALF_BIAS ?
- RC_IN_MAPPING(HALF_BIAS_NEGATE) :
+ map |= flags & NORMALIZE ?
+ RC_IN_MAPPING(EXPAND_NEGATE) :
RC_IN_MAPPING(UNSIGNED_INVERT);
else
- map |= flags & HALF_BIAS ?
- RC_IN_MAPPING(HALF_BIAS_NORMAL) :
+ map |= flags & NORMALIZE ?
+ RC_IN_MAPPING(EXPAND_NORMAL) :
RC_IN_MAPPING(UNSIGNED_IDENTITY);
return map;
@@ -270,12 +270,10 @@ setup_combiner(struct combiner_state *rc)
case GL_DOT3_RGB:
case GL_DOT3_RGBA:
- INPUT_ARG(rc, A, 0, HALF_BIAS);
- INPUT_ARG(rc, B, 1, HALF_BIAS);
+ INPUT_ARG(rc, A, 0, NORMALIZE);
+ INPUT_ARG(rc, B, 1, NORMALIZE);
- rc->out = RC_OUT_DOT_AB | RC_OUT_SCALE_4;
-
- assert(!rc->logscale);
+ rc->out = RC_OUT_DOT_AB;
break;
default: