diff options
| -rw-r--r-- | src/mesa/swrast/s_nvfragprog.c | 6 | ||||
| -rw-r--r-- | src/mesa/swrast/s_nvfragprog.h | 7 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.c | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c index ace531e0e2a..4083581ab05 100644 --- a/src/mesa/swrast/s_nvfragprog.c +++ b/src/mesa/swrast/s_nvfragprog.c @@ -1319,8 +1319,12 @@ init_machine( GLcontext *ctx, struct fp_machine *machine, } + +/** + * Execute the current fragment program, operating on the given span. + */ void -_swrast_exec_nv_fragment_program( GLcontext *ctx, struct sw_span *span ) +_swrast_exec_fragment_program( GLcontext *ctx, struct sw_span *span ) { const struct fragment_program *program = ctx->FragmentProgram.Current; GLuint i; diff --git a/src/mesa/swrast/s_nvfragprog.h b/src/mesa/swrast/s_nvfragprog.h index 749acbc0599..ac5a15fe9bc 100644 --- a/src/mesa/swrast/s_nvfragprog.h +++ b/src/mesa/swrast/s_nvfragprog.h @@ -1,9 +1,8 @@ - /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -32,7 +31,7 @@ extern void -_swrast_exec_nv_fragment_program( GLcontext *ctx, struct sw_span *span ); +_swrast_exec_fragment_program( GLcontext *ctx, struct sw_span *span ); #endif diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index cdd97f613a1..801595d970c 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1016,7 +1016,7 @@ _swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span) if (span->interpMask & SPAN_SPEC) { interpolate_specular(ctx, span); } - _swrast_exec_nv_fragment_program(ctx, span); + _swrast_exec_fragment_program(ctx, span); monoColor = GL_FALSE; } @@ -1268,7 +1268,7 @@ _swrast_write_texture_span( GLcontext *ctx, struct sw_span *span) * gives a potential speed-up. */ if (ctx->FragmentProgram.Enabled) - _swrast_exec_nv_fragment_program( ctx, span ); + _swrast_exec_fragment_program( ctx, span ); else _swrast_texture_span( ctx, span ); @@ -1335,7 +1335,7 @@ _swrast_write_texture_span( GLcontext *ctx, struct sw_span *span) } if (ctx->FragmentProgram.Enabled) - _swrast_exec_nv_fragment_program( ctx, span ); + _swrast_exec_fragment_program( ctx, span ); else _swrast_texture_span( ctx, span ); } |