AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't update span->array->z[] values from SLANG_FRAGMENT_FIXED_FRAGDEPTH.

Browse Source 
This restores the behaviour of Mesa 6.5.1, fixing a regression in 6.5.2.
See bug 9345.  Revisit someday...
This commit is contained in:
Brian
2006-12-16 11:17:41 -07:00
parent 6ec4a03b9f
commit b497a0cb7c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/swrast/s_arbshader.c
+12 -10
View File
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
* Version: 6.6
* Version: 6.5.3
*
* Copyright (C) 2006 Brian Paul All Rights Reserved.
*
@@ -103,18 +103,20 @@ _swrast_exec_arbshader(GLcontext *ctx, SWspan *span)
span->writeAll = GL_FALSE;
}
else {
GLboolean zWritten = GL_FALSE; /* temp hack (bug 9345) */
(**pro).UpdateFixedVarying(pro, SLANG_FRAGMENT_FIXED_FRAGCOLOR,
vec, 0, 4 * sizeof(GLfloat), GL_FALSE);
COPY_4V(span->array->color.sz4.rgba[i], vec);
(**pro).UpdateFixedVarying(pro, SLANG_FRAGMENT_FIXED_FRAGDEPTH, vec, 0,
sizeof (GLfloat), GL_FALSE);
if (vec[0] <= 0.0f)
span->array->z[i] = 0;
else if (vec[0] >= 1.0f)
span->array->z[i] = ctx->DrawBuffer->_DepthMax;
else
span->array->z[i] = IROUND(vec[0] * ctx->DrawBuffer->_DepthMaxF);
if (zWritten) {
(**pro).UpdateFixedVarying(pro, SLANG_FRAGMENT_FIXED_FRAGDEPTH,
vec, 0, sizeof (GLfloat), GL_FALSE);
if (vec[0] <= 0.0f)
span->array->z[i] = 0;
else if (vec[0] >= 1.0f)
span->array->z[i] = ctx->DrawBuffer->_DepthMax;
else
span->array->z[i] = IROUND(vec[0] * ctx->DrawBuffer->_DepthMaxF);
}
}
}
}