projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300/compiler: fix scons build
[mesa.git]
/
src
/
mesa
/
tnl
/
t_pipeline.c
diff --git
a/src/mesa/tnl/t_pipeline.c
b/src/mesa/tnl/t_pipeline.c
index 2a0ed8852a2b027ba986da59cc85b199622d1308..36fcd074cd90456c0e48cd304052601f60a6963d 100644
(file)
--- a/
src/mesa/tnl/t_pipeline.c
+++ b/
src/mesa/tnl/t_pipeline.c
@@
-28,7
+28,6
@@
#include "main/glheader.h"
#include "main/context.h"
#include "main/imports.h"
#include "main/glheader.h"
#include "main/context.h"
#include "main/imports.h"
-#include "main/state.h"
#include "main/mtypes.h"
#include "t_context.h"
#include "main/mtypes.h"
#include "t_context.h"
@@
-48,7
+47,7
@@
void _tnl_install_pipeline( GLcontext *ctx,
*/
for (i = 0 ; i < MAX_PIPELINE_STAGES && stages[i] ; i++) {
struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
*/
for (i = 0 ; i < MAX_PIPELINE_STAGES && stages[i] ; i++) {
struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
-
MEMCPY
(s, stages[i], sizeof(*s));
+
memcpy
(s, stages[i], sizeof(*s));
if (s->create)
s->create(ctx, s);
}
if (s->create)
s->create(ctx, s);
}
@@
-86,10
+85,6
@@
static GLuint check_input_changes( GLcontext *ctx )
}
}
}
}
- if (tnl->pipeline.input_changes &&
- tnl->Driver.NotifyInputChanges)
- tnl->Driver.NotifyInputChanges( ctx, tnl->pipeline.input_changes );
-
return tnl->pipeline.input_changes;
}
return tnl->pipeline.input_changes;
}
@@
-199,11
+194,11
@@
const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
&_tnl_vertex_transform_stage,
&_tnl_normal_transform_stage,
&_tnl_lighting_stage,
&_tnl_vertex_transform_stage,
&_tnl_normal_transform_stage,
&_tnl_lighting_stage,
- &_tnl_fog_coordinate_stage,
&_tnl_texgen_stage,
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
&_tnl_vertex_program_stage,
&_tnl_texgen_stage,
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
&_tnl_vertex_program_stage,
+ &_tnl_fog_coordinate_stage,
&_tnl_render_stage,
NULL
};
&_tnl_render_stage,
NULL
};