KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update some type names

This commit is contained in:
Brian Paul 2004-11-26 13:34:45 +00:00
parent c5f9aa7750
commit 59651a076d
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/shader/nvvertexec.c
View File

@ -176,7 +176,7 @@ _mesa_init_vp_per_primitive_registers(GLcontext *ctx)
* For debugging. Dump the current vertex program machine registers. * For debugging. Dump the current vertex program machine registers.
*/ */
void void
_mesa_dump_vp_state( const struct vertex_program_state *state ) _mesa_dump_vp_state( const struct gl_vertex_program_state *state )
{ {
int i; int i;
_mesa_printf("VertexIn:\n"); _mesa_printf("VertexIn:\n");
@ -228,7 +228,7 @@ _mesa_dump_vp_state( const struct vertex_program_state *state )
*/ */
static INLINE const GLfloat * static INLINE const GLfloat *
get_register_pointer( const struct vp_src_register *source, get_register_pointer( const struct vp_src_register *source,
const struct vertex_program_state *state ) const struct gl_vertex_program_state *state )
{ {
if (source->RelAddr) { if (source->RelAddr) {
const GLint reg = source->Index + state->AddressReg[0]; const GLint reg = source->Index + state->AddressReg[0];
@ -274,7 +274,7 @@ get_register_pointer( const struct vp_src_register *source,
*/ */
static INLINE void static INLINE void
fetch_vector4( const struct vp_src_register *source, fetch_vector4( const struct vp_src_register *source,
const struct vertex_program_state *state, const struct gl_vertex_program_state *state,
GLfloat result[4] ) GLfloat result[4] )
{ {
const GLfloat *src = get_register_pointer(source, state); const GLfloat *src = get_register_pointer(source, state);
@ -300,7 +300,7 @@ fetch_vector4( const struct vp_src_register *source,
*/ */
static INLINE void static INLINE void
fetch_vector1( const struct vp_src_register *source, fetch_vector1( const struct vp_src_register *source,
const struct vertex_program_state *state, const struct gl_vertex_program_state *state,
GLfloat result[4] ) GLfloat result[4] )
{ {
const GLfloat *src = get_register_pointer(source, state); const GLfloat *src = get_register_pointer(source, state);
@ -319,7 +319,7 @@ fetch_vector1( const struct vp_src_register *source,
*/ */
static void static void
store_vector4( const struct vp_dst_register *dest, store_vector4( const struct vp_dst_register *dest,
struct vertex_program_state *state, struct gl_vertex_program_state *state,
const GLfloat value[4] ) const GLfloat value[4] )
{ {
GLfloat *dst; GLfloat *dst;
@ -377,7 +377,7 @@ store_vector4( const struct vp_dst_register *dest,
void void
_mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program) _mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program)
{ {
struct vertex_program_state *state = &ctx->VertexProgram; struct gl_vertex_program_state *state = &ctx->VertexProgram;
const struct vp_instruction *inst; const struct vp_instruction *inst;
ctx->_CurrentProgram = GL_VERTEX_PROGRAM_ARB; /* or NV, doesn't matter */ ctx->_CurrentProgram = GL_VERTEX_PROGRAM_ARB; /* or NV, doesn't matter */

2
src/mesa/shader/nvvertexec.h
View File

@ -38,6 +38,6 @@ extern void
_mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program); _mesa_exec_vertex_program(GLcontext *ctx, const struct vertex_program *program);
extern void extern void
_mesa_dump_vp_state( const struct vertex_program_state *state ); _mesa_dump_vp_state( const struct gl_vertex_program_state *state );
#endif #endif

2
src/mesa/shader/shaderobjects.c
View File

@ -78,11 +78,13 @@ _mesa_LinkProgramARB (GLhandleARB programObj)
{ {
} }
#if 0
GLboolean GLboolean
_mesa_use_program_object( GLcontext *ctx, struct gl_program_object *pobj ) _mesa_use_program_object( GLcontext *ctx, struct gl_program_object *pobj )
{ {
return GL_FALSE; return GL_FALSE;
} }
#endif
void GLAPIENTRY void GLAPIENTRY
_mesa_UseProgramObjectARB (GLhandleARB programObj) _mesa_UseProgramObjectARB (GLhandleARB programObj)