diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/arbparse.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/nvvertexec.c | 15 |
2 files changed, 11 insertions, 14 deletions
diff --git a/src/mesa/main/arbparse.c b/src/mesa/main/arbparse.c index e510f96976..eb3cf9c11c 100644 --- a/src/mesa/main/arbparse.c +++ b/src/mesa/main/arbparse.c @@ -2603,12 +2603,13 @@ grammar_load_from_text (const GLubyte * text) /** * checks if a null-terminated text matches given grammar * returns 0 on error (call grammar_get_last_error to retrieve the error text) - * returns 1 on success, the prod points to newly allocated buffer with production and size - * is filled with the production size + * returns 1 on success, the prod points to newly allocated buffer with + * production and size is filled with the production size * * \param id - The grammar returned from grammar_load_from_text() * \param text - The program string - * \param production - The return parameter for the binary array holding the parsed results + * \param production - The return parameter for the binary array holding the + * parsed results * \param size - The return parameter for the size of production * * \return 1 on sucess, 0 on parser error @@ -3071,8 +3072,6 @@ parse_clipplane_num (GLcontext * ctx, GLubyte ** inst, } - - /** * \return 0 on front face, 1 on back face */ @@ -3089,6 +3088,7 @@ parse_face_type (GLubyte ** inst) return 0; } + /** * Given a matrix and a modifier token on the binary array, return tokens * that _mesa_fetch_state() [program.c] can understand. diff --git a/src/mesa/main/nvvertexec.c b/src/mesa/main/nvvertexec.c index f3034ea699..d73f82b973 100644 --- a/src/mesa/main/nvvertexec.c +++ b/src/mesa/main/nvvertexec.c @@ -64,23 +64,20 @@ _mesa_init_vp_registers(GLcontext *ctx) } /* The program parameters aren't touched */ - /* XXX: This should be moved to glBegin() time, but its safe (and slow!) - * here - Karl - */ + /* XXX: This should be moved to glBegin() time, but its safe (and slow!) + * here - Karl + */ if (ctx->VertexProgram.Current->Parameters) { - /* Grab the state */ _mesa_load_state_parameters(ctx, ctx->VertexProgram.Current->Parameters); - /* And copy it into the program state */ + /* And copy it into the program state */ for (i=0; i<ctx->VertexProgram.Current->Parameters->NumParameters; i++) { MEMCPY(ctx->VertexProgram.Parameters[i], - &ctx->VertexProgram.Current->Parameters->Parameters[i].Values, - 4*sizeof(GLfloat)); + &ctx->VertexProgram.Current->Parameters->Parameters[i].Values, + 4*sizeof(GLfloat)); } - } - } |