#include "main/glheader.h"
-#include "main/imports.h"
+
#include "main/context.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/state.h"
#include "main/viewport.h"
#include "util/simple_list.h"
+#include "util/u_memory.h"
#include "tnl.h"
#include "t_context.h"
insert_at_tail( tnl->_ShineTabList, s );
}
- /* plug in the VBO drawing function */
- vbo_set_draw_func(ctx, _tnl_draw_prims);
-
_math_init_transformation();
_math_init_translate();
+ /* Keep our list of tnl_vertex_array inputs */
+ _tnl_init_inputs(&tnl->draw_arrays);
+
return GL_TRUE;
}
*/
tnl->render_inputs_bitset = BITFIELD64_BIT(_TNL_ATTRIB_POS);
- if (!fp || (fp->InputsRead & VARYING_BIT_COL0)) {
+ if (!fp || (fp->info.inputs_read & VARYING_BIT_COL0)) {
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_COLOR0);
}
for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
if (ctx->Texture._EnabledCoordUnits & (1 << i) ||
- (fp && fp->InputsRead & VARYING_BIT_TEX(i))) {
+ (fp && fp->info.inputs_read & VARYING_BIT_TEX(i)) ||
+ _mesa_ati_fragment_shader_enabled(ctx)) {
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_TEX(i));
}
}
if (ctx->Fog.Enabled
- || (fp != NULL && (fp->InputsRead & VARYING_BIT_FOGC) != 0)) {
+ || (fp != NULL && (fp->info.inputs_read & VARYING_BIT_FOGC) != 0)) {
/* Either fixed-function fog or a fragment program needs fog coord.
*/
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_FOG);
}
- if (ctx->Polygon.FrontMode != GL_FILL ||
+ if (ctx->Polygon.FrontMode != GL_FILL ||
ctx->Polygon.BackMode != GL_FILL)
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_EDGEFLAG);
if (vp) {
GLuint i;
for (i = 0; i < MAX_VARYING; i++) {
- if (vp->OutputsWritten & BITFIELD64_BIT(VARYING_SLOT_VAR0 + i)) {
+ if (vp->info.outputs_written &
+ BITFIELD64_BIT(VARYING_SLOT_VAR0 + i)) {
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_GENERIC(i));
}
}
#if 0
if (ctx->Light.ColorMaterialEnabled) {
- _mesa_update_color_material( ctx,
+ _mesa_update_color_material( ctx,
ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );
}
#endif