projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARB prog lexer: Fix lexer to eat both DOS and Unix line endings
[mesa.git]
/
src
/
mesa
/
tnl
/
t_vb_fog.c
diff --git
a/src/mesa/tnl/t_vb_fog.c
b/src/mesa/tnl/t_vb_fog.c
index f6518500d80da421871dd5176584c4d7c38f3b12..f3a7bd49f40189a4ca81ebc92e0365a9d315138a 100644
(file)
--- a/
src/mesa/tnl/t_vb_fog.c
+++ b/
src/mesa/tnl/t_vb_fog.c
@@
-26,12
+26,12
@@
*/
*/
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "macros.h"
-#include "imports.h"
-#include "mtypes.h"
+#include "
main/
glheader.h"
+#include "
main/
colormac.h"
+#include "
main/
context.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
imports.h"
+#include "m
ain/m
types.h"
#include "math/m_xform.h"
#include "math/m_xform.h"
@@
-41,7
+41,6
@@
struct fog_stage_data {
GLvector4f fogcoord; /* has actual storage allocated */
struct fog_stage_data {
GLvector4f fogcoord; /* has actual storage allocated */
- GLvector4f input; /* points into VB->EyePtr Z values */
};
#define FOG_STAGE_DATA(stage) ((struct fog_stage_data *)stage->privatePtr)
};
#define FOG_STAGE_DATA(stage) ((struct fog_stage_data *)stage->privatePtr)
@@
-91,7
+90,8
@@
init_static_data( void )
* evaluating the GL_LINEAR, GL_EXP or GL_EXP2 fog function.
* Fog coordinates are distances from the eye (typically between the
* near and far clip plane distances).
* evaluating the GL_LINEAR, GL_EXP or GL_EXP2 fog function.
* Fog coordinates are distances from the eye (typically between the
* near and far clip plane distances).
- * Note the fog (eye Z) coords may be negative so we use ABS(z) below.
+ * Note that fogcoords may be negative, if eye z is source absolute
+ * value must be taken earlier.
* Fog blend factors are in the range [0,1].
*/
static void
* Fog blend factors are in the range [0,1].
*/
static void
@@
-148,11
+148,11
@@
run_fog_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
struct fog_stage_data *store = FOG_STAGE_DATA(stage);
GLvector4f *input;
struct fog_stage_data *store = FOG_STAGE_DATA(stage);
GLvector4f *input;
- if (!ctx->Fog.Enabled || ctx->VertexProgram._Current)
- return GL_TRUE;
+ if (!ctx->Fog.Enabled)
+ return GL_TRUE;
- if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT) {
+ if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT
&& !ctx->VertexProgram._Current
) {
GLuint i;
GLfloat *coord;
/* Fog is computed from vertex or fragment Z values */
GLuint i;
GLfloat *coord;
/* Fog is computed from vertex or fragment Z values */
@@
-169,13
+169,10
@@
run_fog_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
*/
input = &store->fogcoord;
*/
input = &store->fogcoord;
- /* NOTE: negate plane here so we get positive fog coords! */
- /* NOTE2: this doesn't always work (tests/fog - all frag depth fog
- coords will be negative). */
- plane[0] = -m[2];
- plane[1] = -m[6];
- plane[2] = -m[10];
- plane[3] = -m[14];
+ plane[0] = m[2];
+ plane[1] = m[6];
+ plane[2] = m[10];
+ plane[3] = m[14];
/* Full eye coords weren't required, just calculate the
* eye Z values.
*/
/* Full eye coords weren't required, just calculate the
* eye Z values.
*/
@@
-189,12
+186,12
@@
run_fog_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
NOTE should avoid going through array twice */
coord = input->start;
for (i = 0; i < input->count; i++) {
NOTE should avoid going through array twice */
coord = input->start;
for (i = 0; i < input->count; i++) {
-
input->data[i][0]
= FABSF(*coord);
+
*coord
= FABSF(*coord);
STRIDE_F(coord, input->stride);
}
}
else {
STRIDE_F(coord, input->stride);
}
}
else {
- /* fog coordinates = eye Z coordinates
(use ABS later)
*/
+ /* fog coordinates = eye Z coordinates
- need to copy for ABS
*/
input = &store->fogcoord;
if (VB->EyePtr->size < 2)
input = &store->fogcoord;
if (VB->EyePtr->size < 2)
@@
-249,7
+246,6
@@
alloc_fog_data(GLcontext *ctx, struct tnl_pipeline_stage *stage)
return GL_FALSE;
_mesa_vector4f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
return GL_FALSE;
_mesa_vector4f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
- _mesa_vector4f_init( &store->input, 0, NULL );
if (!inited)
init_static_data();
if (!inited)
init_static_data();