tgsi: Fix POSITION and FACE fragment shader inputs.

This commit is contained in:
Michal Krol 2009-11-23 10:49:41 +01:00
parent b7590cde4a
commit cc35a454da
2 changed files with 42 additions and 36 deletions

View file

@ -1832,20 +1832,37 @@ typedef void (* eval_coef_func)(
unsigned chan ); unsigned chan );
static void static void
exec_declaration( exec_declaration(struct tgsi_exec_machine *mach,
struct tgsi_exec_machine *mach, const struct tgsi_full_declaration *decl)
const struct tgsi_full_declaration *decl )
{ {
if( mach->Processor == TGSI_PROCESSOR_FRAGMENT ) { if (mach->Processor == TGSI_PROCESSOR_FRAGMENT) {
if( decl->Declaration.File == TGSI_FILE_INPUT ) { if (decl->Declaration.File == TGSI_FILE_INPUT) {
unsigned first, last, mask; uint first, last, mask;
eval_coef_func eval;
first = decl->DeclarationRange.First; first = decl->DeclarationRange.First;
last = decl->DeclarationRange.Last; last = decl->DeclarationRange.Last;
mask = decl->Declaration.UsageMask; mask = decl->Declaration.UsageMask;
switch( decl->Declaration.Interpolate ) { if (decl->Semantic.SemanticName == TGSI_SEMANTIC_POSITION) {
assert(decl->Semantic.SemanticIndex == 0);
assert(first == last);
assert(mask = TGSI_WRITEMASK_XYZW);
mach->Inputs[first] = mach->QuadPos;
} else if (decl->Semantic.SemanticName == TGSI_SEMANTIC_FACE) {
uint i;
assert(decl->Semantic.SemanticIndex == 0);
assert(first == last);
for (i = 0; i < QUAD_SIZE; i++) {
mach->Inputs[first].xyzw[0].f[i] = mach->Face;
}
} else {
eval_coef_func eval;
uint i, j;
switch (decl->Declaration.Interpolate) {
case TGSI_INTERPOLATE_CONSTANT: case TGSI_INTERPOLATE_CONSTANT:
eval = eval_constant_coef; eval = eval_constant_coef;
break; break;
@ -1859,26 +1876,14 @@ exec_declaration(
break; break;
default: default:
assert( 0 ); assert(0);
return; return;
} }
if( mask == TGSI_WRITEMASK_XYZW ) { for (j = 0; j < NUM_CHANNELS; j++) {
unsigned i, j; if (mask & (1 << j)) {
for (i = first; i <= last; i++) {
for( i = first; i <= last; i++ ) { eval(mach, i, j);
for( j = 0; j < NUM_CHANNELS; j++ ) {
eval( mach, i, j );
}
}
}
else {
unsigned i, j;
for( j = 0; j < NUM_CHANNELS; j++ ) {
if( mask & (1 << j) ) {
for( i = first; i <= last; i++ ) {
eval( mach, i, j );
} }
} }
} }

View file

@ -232,6 +232,7 @@ struct tgsi_exec_machine
/* FRAGMENT processor only. */ /* FRAGMENT processor only. */
const struct tgsi_interp_coef *InterpCoefs; const struct tgsi_interp_coef *InterpCoefs;
struct tgsi_exec_vector QuadPos; struct tgsi_exec_vector QuadPos;
float Face; /**< +1 if front facing, -1 if back facing */
/* Conditional execution masks */ /* Conditional execution masks */
uint CondMask; /**< For IF/ELSE/ENDIF */ uint CondMask; /**< For IF/ELSE/ENDIF */