diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:03:42 -0700 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:09:42 -0700 |
commit | 0072acd447dc6be652e63752e50215c3105322c8 (patch) | |
tree | 847d1763b54772d336a04e606f8248291c3092b7 /src/mesa/tnl/t_vertex.h | |
parent | 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff) | |
parent | ca2b2ac131933b4171b519813df1aaa3a81621cd (diff) |
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Diffstat (limited to 'src/mesa/tnl/t_vertex.h')
-rw-r--r-- | src/mesa/tnl/t_vertex.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mesa/tnl/t_vertex.h b/src/mesa/tnl/t_vertex.h index 2dfd7b57f0..252f2f7c29 100644 --- a/src/mesa/tnl/t_vertex.h +++ b/src/mesa/tnl/t_vertex.h @@ -78,43 +78,43 @@ extern const struct tnl_format_info _tnl_format_info[EMIT_MAX]; /* Interpolate between two vertices to produce a third: */ -extern void _tnl_interp( GLcontext *ctx, +extern void _tnl_interp( struct gl_context *ctx, GLfloat t, GLuint edst, GLuint eout, GLuint ein, GLboolean force_boundary ); /* Copy colors from one vertex to another: */ -extern void _tnl_copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc ); +extern void _tnl_copy_pv( struct gl_context *ctx, GLuint edst, GLuint esrc ); /* Extract a named attribute from a hardware vertex. Will have to * reverse any viewport transformation, swizzling or other conversions * which may have been applied: */ -extern void _tnl_get_attr( GLcontext *ctx, const void *vertex, GLenum attrib, +extern void _tnl_get_attr( struct gl_context *ctx, const void *vertex, GLenum attrib, GLfloat *dest ); /* Complementary to the above. */ -extern void _tnl_set_attr( GLcontext *ctx, void *vout, GLenum attrib, +extern void _tnl_set_attr( struct gl_context *ctx, void *vout, GLenum attrib, const GLfloat *src ); -extern void *_tnl_get_vertex( GLcontext *ctx, GLuint nr ); +extern void *_tnl_get_vertex( struct gl_context *ctx, GLuint nr ); -extern GLuint _tnl_install_attrs( GLcontext *ctx, +extern GLuint _tnl_install_attrs( struct gl_context *ctx, const struct tnl_attr_map *map, GLuint nr, const GLfloat *vp, GLuint unpacked_size ); -extern void _tnl_free_vertices( GLcontext *ctx ); +extern void _tnl_free_vertices( struct gl_context *ctx ); -extern void _tnl_init_vertices( GLcontext *ctx, +extern void _tnl_init_vertices( struct gl_context *ctx, GLuint vb_size, GLuint max_vertex_size ); -extern void *_tnl_emit_vertices_to_buffer( GLcontext *ctx, +extern void *_tnl_emit_vertices_to_buffer( struct gl_context *ctx, GLuint start, GLuint end, void *dest ); @@ -124,23 +124,23 @@ extern void *_tnl_emit_vertices_to_buffer( GLcontext *ctx, * the same functionality. */ -extern void *_tnl_emit_indexed_vertices_to_buffer( GLcontext *ctx, +extern void *_tnl_emit_indexed_vertices_to_buffer( struct gl_context *ctx, const GLuint *elts, GLuint start, GLuint end, void *dest ); -extern void _tnl_build_vertices( GLcontext *ctx, +extern void _tnl_build_vertices( struct gl_context *ctx, GLuint start, GLuint end, GLuint newinputs ); -extern void _tnl_invalidate_vertices( GLcontext *ctx, GLuint newinputs ); +extern void _tnl_invalidate_vertices( struct gl_context *ctx, GLuint newinputs ); -extern void _tnl_invalidate_vertex_state( GLcontext *ctx, GLuint new_state ); +extern void _tnl_invalidate_vertex_state( struct gl_context *ctx, GLuint new_state ); -extern void _tnl_notify_pipeline_output_change( GLcontext *ctx ); +extern void _tnl_notify_pipeline_output_change( struct gl_context *ctx ); #define GET_VERTEX_STATE(ctx) &(TNL_CONTEXT(ctx)->clipspace) @@ -153,29 +153,29 @@ void _tnl_register_fastpath( struct tnl_clipspace *vtx, /* t_vertex_generic.c -- Internal functions for t_vertex.c */ -void _tnl_generic_copy_pv_extras( GLcontext *ctx, +void _tnl_generic_copy_pv_extras( struct gl_context *ctx, GLuint dst, GLuint src ); -void _tnl_generic_interp_extras( GLcontext *ctx, +void _tnl_generic_interp_extras( struct gl_context *ctx, GLfloat t, GLuint dst, GLuint out, GLuint in, GLboolean force_boundary ); -void _tnl_generic_copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc ); +void _tnl_generic_copy_pv( struct gl_context *ctx, GLuint edst, GLuint esrc ); -void _tnl_generic_interp( GLcontext *ctx, +void _tnl_generic_interp( struct gl_context *ctx, GLfloat t, GLuint edst, GLuint eout, GLuint ein, GLboolean force_boundary ); -void _tnl_generic_emit( GLcontext *ctx, +void _tnl_generic_emit( struct gl_context *ctx, GLuint count, GLubyte *v ); -void _tnl_generate_hardwired_emit( GLcontext *ctx ); +void _tnl_generate_hardwired_emit( struct gl_context *ctx ); /* t_vertex_sse.c -- Internal functions for t_vertex.c */ -void _tnl_generate_sse_emit( GLcontext *ctx ); +void _tnl_generate_sse_emit( struct gl_context *ctx ); #endif |