diff options
author | Kristian Høgsberg <krh@redhat.com> | 2008-02-22 18:06:19 -0500 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-02-22 21:44:00 -0500 |
commit | dd1d66fc4ab5d7064113a2017a431c3461598b91 (patch) | |
tree | e09343282afaeddb69547133097a435981239b56 /src/mesa/drivers/dri/i915/intel_render.c | |
parent | c99fa92ff84e927c82e1231d96921fda9a2b0852 (diff) |
intel: Merge intel_context.c from i915 and i965.
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_render.c')
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_render.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_render.c b/src/mesa/drivers/dri/i915/intel_render.c index bcf50324b1..5e6500cfa1 100644 --- a/src/mesa/drivers/dri/i915/intel_render.c +++ b/src/mesa/drivers/dri/i915/intel_render.c @@ -39,6 +39,7 @@ #include "tnl/t_context.h" #include "tnl/t_vertex.h" +#include "tnl/t_pipeline.h" #include "intel_screen.h" #include "intel_context.h" @@ -234,7 +235,7 @@ intel_run_render(GLcontext * ctx, struct tnl_pipeline_stage *stage) return GL_FALSE; /* finished the pipe */ } -const struct tnl_pipeline_stage _intel_render_stage = { +static const struct tnl_pipeline_stage _intel_render_stage = { "intel render", NULL, NULL, @@ -242,3 +243,20 @@ const struct tnl_pipeline_stage _intel_render_stage = { NULL, intel_run_render /* run */ }; + +const struct tnl_pipeline_stage *intel_pipeline[] = { + &_tnl_vertex_transform_stage, + &_tnl_vertex_cull_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, +#if 1 + &_intel_render_stage, /* ADD: unclipped rastersetup-to-dma */ +#endif + &_tnl_render_stage, + 0, +}; |