i915: Use _tnl_RenderClippedPolygon and _tnl_RenderClippedLine
_tnl_RenderClippedPolygon and _tnl_RenderClippedLine already do most of what we want so use them. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
parent
303895655c
commit
bcf650496f
|
@ -891,18 +891,11 @@ intelRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint n)
|
||||||
{
|
{
|
||||||
struct intel_context *intel = intel_context(ctx);
|
struct intel_context *intel = intel_context(ctx);
|
||||||
TNLcontext *tnl = TNL_CONTEXT(ctx);
|
TNLcontext *tnl = TNL_CONTEXT(ctx);
|
||||||
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
|
|
||||||
GLuint prim = intel->render_primitive;
|
GLuint prim = intel->render_primitive;
|
||||||
|
|
||||||
/* Render the new vertices as an unclipped polygon.
|
/* Render the new vertices as an unclipped polygon.
|
||||||
*/
|
*/
|
||||||
{
|
_tnl_RenderClippedPolygon(ctx, elts, n);
|
||||||
GLuint *tmp = VB->Elts;
|
|
||||||
VB->Elts = (GLuint *) elts;
|
|
||||||
tnl->Driver.Render.PrimTabElts[GL_POLYGON] (ctx, 0, n,
|
|
||||||
PRIM_BEGIN | PRIM_END);
|
|
||||||
VB->Elts = tmp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Restore the render primitive
|
/* Restore the render primitive
|
||||||
*/
|
*/
|
||||||
|
@ -910,14 +903,6 @@ intelRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint n)
|
||||||
tnl->Driver.Render.PrimitiveNotify(ctx, prim);
|
tnl->Driver.Render.PrimitiveNotify(ctx, prim);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
intelRenderClippedLine(struct gl_context * ctx, GLuint ii, GLuint jj)
|
|
||||||
{
|
|
||||||
TNLcontext *tnl = TNL_CONTEXT(ctx);
|
|
||||||
|
|
||||||
tnl->Driver.Render.Line(ctx, ii, jj);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
intelFastRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint n)
|
intelFastRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint n)
|
||||||
{
|
{
|
||||||
|
@ -1044,7 +1029,7 @@ intelChooseRenderState(struct gl_context * ctx)
|
||||||
else {
|
else {
|
||||||
tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
|
tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
|
||||||
tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
|
tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
|
||||||
tnl->Driver.Render.ClippedLine = intelRenderClippedLine;
|
tnl->Driver.Render.ClippedLine = _tnl_RenderClippedLine;
|
||||||
tnl->Driver.Render.ClippedPolygon = intelRenderClippedPoly;
|
tnl->Driver.Render.ClippedPolygon = intelRenderClippedPoly;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue