r300/compiler: Standardize the number of bits used by swizzle fields

Swizzles are now defined everywhere as a field with 12 bits that contains
4 channels worth of meaningful information.  Any channel that is unused is
set to RC_SWIZZLE_UNUSED.  This change is necessary because rgb instructions
and alpha instructions were initializing channels that would never be used
(channel 3 for rgb and channels 1-3 for alpha) with 0 (aka RC_SWIZZLE_X).
This made it impossible to use generic helper functions for swizzles,
because sometimes a channel value of 0 meant unused and other times it
meant RC_SWIZZLE_X.

All hacks that tried to guess how many channels were relevant have
also been removed.

1 files changed, 2 insertions, 20 deletions

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c
index 5905d26e52..68874795b8 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.c
@@ -211,27 +211,9 @@ struct rc_pair_instruction_source * rc_pair_get_src(
 	struct rc_pair_instruction * pair_inst,
 	struct rc_pair_instruction_arg * arg)
 {
-	unsigned int i, type;
-	unsigned int channels = 0;
+	unsigned int type;
 
-	for(i = 0; i < 3; i++) {
-		if (arg == pair_inst->RGB.Arg + i) {
-			channels = 3;
-			break;
-		}
-	}
-
-	if (channels == 0) {
-		for (i = 0; i < 3; i++) {
-			if (arg == pair_inst->Alpha.Arg + i) {
-				channels = 1;
-				break;
-			}
-		}
-	}
-
-	assert(channels > 0);
-	type = rc_source_type_swz(arg->Swizzle, channels);
+	type = rc_source_type_swz(arg->Swizzle);
 
 	if (type & RC_SOURCE_RGB) {
 		return &pair_inst->RGB.Src[arg->Source];