fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

For the time being, interpolate Z in shade_quad() rather in the shader.

Browse source 
This was causing trouble for the i915 driver.
This commit is contained in:
Brian 2007-08-23 13:24:06 -06:00
parent c990d0fd57
commit ef7c250900
2 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/mesa/pipe/softpipe/sp_quad_fs.c
View file

@ -55,6 +55,34 @@ quad_shade_stage(struct quad_stage *qs)
return (struct quad_shade_stage *) qs;
}
/**
* Compute quad's attribute values by linear interpolation.
*
* Push into the fp:
*
* INPUT[attr] = MAD COEF_A0[attr], COEF_DADX[attr], INPUT_WPOS.xxxx
* INPUT[attr] = MAD INPUT[attr], COEF_DADY[attr], INPUT_WPOS.yyyy
*/
static INLINE void
linterp_z(const struct tgsi_interp_coef *coef,
struct tgsi_exec_vector *pos)
{
uint ch = 2;
uint j;
for (j = 0; j < QUAD_SIZE; j++) {
const float x = pos->xyzw[0].f[j];
const float y = pos->xyzw[1].f[j];
pos->xyzw[ch].f[j] = (coef->a0[ch] +
coef->dadx[ch] * x +
coef->dady[ch] * y);
}
}
/* This should be done by the fragment shader execution unit (code
* generated from the decl instructions). Do it here for now.
*/
@ -101,6 +129,9 @@ shade_quad(
machine.Inputs[0].xyzw[1].f[2] = fy + 1.0f;
machine.Inputs[0].xyzw[1].f[3] = fy + 1.0f;
/* interp Z */
linterp_z(&quad->coef[0], &machine.Inputs[0]);
/* run shader */
tgsi_exec_machine_run( &machine );
@ -110,6 +141,7 @@ shade_quad(
&machine.Outputs[1].xyzw[0].f[0],
sizeof( quad->outputs.color ) );
#if 0
if( softpipe->need_z ) {
/* XXX temporary */
memcpy(
@ -117,6 +149,17 @@ shade_quad(
&machine.Outputs[0].xyzw[2],
sizeof( quad->outputs.depth ) );
}
#else
{
uint i;
for (i = 0; i < 4; i++) {
quad->outputs.depth[i] = machine.Inputs[0].xyzw[2].f[i];
#if 0
printf("output z %f\n", quad->outputs.depth[i]);
#endif
}
}
#endif
/* shader may cull fragments */
if( quad->mask ) {

5
src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
View file

@ -52,6 +52,9 @@ map_register_file_index(
GLuint mapped_index;
GLuint i;
assert(processor == TGSI_PROCESSOR_FRAGMENT
|| processor == TGSI_PROCESSOR_VERTEX);
switch( file ) {
case TGSI_FILE_INPUT:
/*
@ -616,6 +619,7 @@ tgsi_mesa_compile_fp_program(
/*
* Copy fragment z if the shader does not write it.
*/
#if 0
if( !(program->Base.OutputsWritten & (1 << FRAG_RESULT_DEPR)) ) {
fullinst = tgsi_default_full_instruction();
@ -639,6 +643,7 @@ tgsi_mesa_compile_fp_program(
maxTokens - ti );
preamble_size++;
}
#endif
for( i = 0; i < program->Base.NumInstructions; i++ ) {
if( compile_instruction(