s/_swrast_exec_nv_fragment_program/_swrast_exec_fragment_program/
This commit is contained in:
@@ -1319,8 +1319,12 @@ init_machine( GLcontext *ctx, struct fp_machine *machine,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the current fragment program, operating on the given span.
|
||||||
|
*/
|
||||||
void
|
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;
|
const struct fragment_program *program = ctx->FragmentProgram.Current;
|
||||||
GLuint i;
|
GLuint i;
|
||||||
|
@@ -1,9 +1,8 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Mesa 3-D graphics library
|
* 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
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
* copy of this software and associated documentation files (the "Software"),
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
@@ -32,7 +31,7 @@
|
|||||||
|
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
_swrast_exec_nv_fragment_program( GLcontext *ctx, struct sw_span *span );
|
_swrast_exec_fragment_program( GLcontext *ctx, struct sw_span *span );
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -1016,7 +1016,7 @@ _swrast_write_rgba_span( GLcontext *ctx, struct sw_span *span)
|
|||||||
if (span->interpMask & SPAN_SPEC) {
|
if (span->interpMask & SPAN_SPEC) {
|
||||||
interpolate_specular(ctx, span);
|
interpolate_specular(ctx, span);
|
||||||
}
|
}
|
||||||
_swrast_exec_nv_fragment_program(ctx, span);
|
_swrast_exec_fragment_program(ctx, span);
|
||||||
monoColor = GL_FALSE;
|
monoColor = GL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1268,7 +1268,7 @@ _swrast_write_texture_span( GLcontext *ctx, struct sw_span *span)
|
|||||||
* gives a potential speed-up.
|
* gives a potential speed-up.
|
||||||
*/
|
*/
|
||||||
if (ctx->FragmentProgram.Enabled)
|
if (ctx->FragmentProgram.Enabled)
|
||||||
_swrast_exec_nv_fragment_program( ctx, span );
|
_swrast_exec_fragment_program( ctx, span );
|
||||||
else
|
else
|
||||||
_swrast_texture_span( ctx, span );
|
_swrast_texture_span( ctx, span );
|
||||||
|
|
||||||
@@ -1335,7 +1335,7 @@ _swrast_write_texture_span( GLcontext *ctx, struct sw_span *span)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ctx->FragmentProgram.Enabled)
|
if (ctx->FragmentProgram.Enabled)
|
||||||
_swrast_exec_nv_fragment_program( ctx, span );
|
_swrast_exec_fragment_program( ctx, span );
|
||||||
else
|
else
|
||||||
_swrast_texture_span( ctx, span );
|
_swrast_texture_span( ctx, span );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user