summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_nvfragprog.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-07-20 16:49:57 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-07-20 16:49:57 +0000
commit122629f27925a9dc50029bebc5079f87f416a7e1 (patch)
treef8800f9e5f4fff6bbd6c6496d5c74f8685b63372 /src/mesa/swrast/s_nvfragprog.c
parent459db7bd72131e63ed7687956819c4d0520972dd (diff)
Some structure renaming. Prefix vertex/fragment-related structs with
"gl_" to match other structs.
Diffstat (limited to 'src/mesa/swrast/s_nvfragprog.c')
-rw-r--r--src/mesa/swrast/s_nvfragprog.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c
index 7c59a2bb59..fa16a41e28 100644
--- a/src/mesa/swrast/s_nvfragprog.c
+++ b/src/mesa/swrast/s_nvfragprog.c
@@ -106,7 +106,7 @@ static INLINE const GLfloat *
get_register_pointer( GLcontext *ctx,
const struct prog_src_register *source,
const struct fp_machine *machine,
- const struct fragment_program *program )
+ const struct gl_fragment_program *program )
{
const GLfloat *src;
switch (source->File) {
@@ -153,7 +153,7 @@ static void
fetch_vector4( GLcontext *ctx,
const struct prog_src_register *source,
const struct fp_machine *machine,
- const struct fragment_program *program,
+ const struct gl_fragment_program *program,
GLfloat result[4] )
{
const GLfloat *src = get_register_pointer(ctx, source, machine, program);
@@ -323,7 +323,7 @@ static void
fetch_vector1( GLcontext *ctx,
const struct prog_src_register *source,
const struct fp_machine *machine,
- const struct fragment_program *program,
+ const struct gl_fragment_program *program,
GLfloat result[4] )
{
const GLfloat *src = get_register_pointer(ctx, source, machine, program);
@@ -477,7 +477,7 @@ store_vector4( const struct prog_instruction *inst,
static void
init_machine_deriv( GLcontext *ctx,
const struct fp_machine *machine,
- const struct fragment_program *program,
+ const struct gl_fragment_program *program,
const struct sw_span *span, char xOrY,
struct fp_machine *dMachine )
{
@@ -588,7 +588,7 @@ init_machine_deriv( GLcontext *ctx,
*/
static GLboolean
execute_program( GLcontext *ctx,
- const struct fragment_program *program, GLuint maxInst,
+ const struct gl_fragment_program *program, GLuint maxInst,
struct fp_machine *machine, const struct sw_span *span,
GLuint column )
{
@@ -1381,7 +1381,7 @@ execute_program( GLcontext *ctx,
static void
init_machine( GLcontext *ctx, struct fp_machine *machine,
- const struct fragment_program *program,
+ const struct gl_fragment_program *program,
const struct sw_span *span, GLuint col )
{
GLuint inputsRead = program->Base.InputsRead;
@@ -1452,7 +1452,7 @@ init_machine( GLcontext *ctx, struct fp_machine *machine,
void
_swrast_exec_fragment_program( GLcontext *ctx, struct sw_span *span )
{
- const struct fragment_program *program = ctx->FragmentProgram._Current;
+ const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
GLuint i;
ctx->_CurrentProgram = GL_FRAGMENT_PROGRAM_ARB; /* or NV, doesn't matter */