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

mesa: handle vertex program enabled case also in texenvprogram.c

Browse source
This commit is contained in:
Keith Whitwell 2008-10-04 12:41:56 +01:00
parent 1680ef8696
commit 0370d6b359
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/main/texenvprogram.c
View file

@ -204,7 +204,7 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
{
GLuint fp_inputs = 0;
if (1) {
if (!ctx->VertexProgram._Enabled) {
GLuint varying_inputs = ctx->varying_vp_inputs;
/* First look at what values may be computed by the generated
@ -232,14 +232,13 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
}
else {
/* calculate from vp->outputs */
GLuint vp_outputs = 0;
GLuint vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;
fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY)
<< VERT_RESULT_TEX0)
>> FRAG_ATTRIB_TEX0);
fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) >> VERT_RESULT_TEX0)
<< FRAG_ATTRIB_TEX0);
}
return fp_inputs;