move clip to r300 emit

diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index 4670c28a02fe99487f4f7e086624d96e750b5ae3..e8f0f89cf3fbee528f3d0c047f9fbe615e15940d 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -358,9 +358,11 @@ int r300EmitArrays(GLcontext * ctx)
                DECLARE_RENDERINPUTS(render_inputs_bitset);
                RENDERINPUTS_COPY(render_inputs_bitset, tnl->render_inputs_bitset);
 
+               vb->AttribPtr[VERT_ATTRIB_POS] = vb->ClipPtr;
+
                assert(RENDERINPUTS_TEST(render_inputs_bitset, _TNL_ATTRIB_POS));
                assert(RENDERINPUTS_TEST(render_inputs_bitset, _TNL_ATTRIB_NORMAL) == 0);
-               assert(RENDERINPUTS_TEST(render_inputs_bitset, _TNL_ATTRIB_COLOR0));
+               //assert(RENDERINPUTS_TEST(render_inputs_bitset, _TNL_ATTRIB_COLOR0));
 
                if (RENDERINPUTS_TEST(render_inputs_bitset, _TNL_ATTRIB_POS)) {
                        InputsRead |= 1 << VERT_ATTRIB_POS;

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 83999307b5607f634f16dd706dc766f2e80ec7f3..7770cbbacb528db32e4ca0ca8a360c3307659120 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -293,11 +293,10 @@ static GLboolean r300RunRender(GLcontext * ctx,
        TNLcontext *tnl = TNL_CONTEXT(ctx);
        struct vertex_buffer *vb = &tnl->vb;
 
+
        if (RADEON_DEBUG & DEBUG_PRIMS)
                fprintf(stderr, "%s\n", __FUNCTION__);
 
-       if (hw_tcl_on == GL_FALSE)
-         vb->AttribPtr[VERT_ATTRIB_POS] = vb->ClipPtr;
        r300UpdateShaders(rmesa);
        if (r300EmitArrays(ctx))
                return GL_TRUE;