summaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-01-30 08:09:25 -0700
committerBrian <[email protected]>2007-01-30 08:09:25 -0700
commit8be177a694c6910781da25134ff52b6bd4c6a6e3 (patch)
treeffeac2fa879c53458ea6b65ac8d0b675a7e27a00 /src/mesa/glapi
parent832417f31e81b415894414621500b7aef328652b (diff)
parenta4ddd64f3659b9db7719d3746c1469ece6bb44c5 (diff)
s/params/pointer/ for glGetVertexAttribPointer
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/gl_API.xml2
-rw-r--r--src/mesa/glapi/glapitemp.h12
-rw-r--r--src/mesa/glapi/glprocs.h12
3 files changed, 17 insertions, 9 deletions
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index b45da17ea91..5f15e5fb04e 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -5318,7 +5318,7 @@
<glx ignore="true"/>
</function>
- <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervARB">
+ <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV">
<param name="index" type="GLuint"/>
<param name="pname" type="GLenum"/>
<param name="pointer" type="GLvoid **" output="true"/>
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index a7c4f4950a2..62407968ccc 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4865,14 +4865,19 @@ KEYWORD1 void KEYWORD2 NAME(GetTrackMatrixivNV)(GLenum target, GLuint address, G
DISPATCH(GetTrackMatrixivNV, (target, address, pname, params), (F, "glGetTrackMatrixivNV(0x%x, %d, 0x%x, %p);\n", target, address, pname, (const void *) params));
}
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid ** pointer)
+{
+ DISPATCH(GetVertexAttribPointervNV, (index, pname, pointer), (F, "glGetVertexAttribPointerv(%d, 0x%x, %p);\n", index, pname, (const void *) pointer));
+}
+
KEYWORD1 void KEYWORD2 NAME(GetVertexAttribPointervARB)(GLuint index, GLenum pname, GLvoid ** pointer)
{
- DISPATCH(GetVertexAttribPointervNV, (index, pname, params), (F, "glGetVertexAttribPointervARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+ DISPATCH(GetVertexAttribPointervNV, (index, pname, pointer), (F, "glGetVertexAttribPointervARB(%d, 0x%x, %p);\n", index, pname, (const void *) pointer));
}
-KEYWORD1 void KEYWORD2 NAME(GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** params)
+KEYWORD1 void KEYWORD2 NAME(GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer)
{
- DISPATCH(GetVertexAttribPointervNV, (index, pname, params), (F, "glGetVertexAttribPointervNV(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+ DISPATCH(GetVertexAttribPointervNV, (index, pname, pointer), (F, "glGetVertexAttribPointervNV(%d, 0x%x, %p);\n", index, pname, (const void *) pointer));
}
KEYWORD1 void KEYWORD2 NAME(GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params)
@@ -6577,6 +6582,7 @@ static _glapi_proc UNUSED_TABLE_NAME[] = {
TABLE_ENTRY(BindProgramARB),
TABLE_ENTRY(DeleteProgramsARB),
TABLE_ENTRY(GenProgramsARB),
+ TABLE_ENTRY(GetVertexAttribPointerv),
TABLE_ENTRY(GetVertexAttribPointervARB),
TABLE_ENTRY(IsProgramARB),
TABLE_ENTRY(PointParameteri),
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 905c65862d1..190d9ed149b 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -1086,6 +1086,7 @@ static const char gl_string_table[] =
"glBindProgramARB\0"
"glDeleteProgramsARB\0"
"glGenProgramsARB\0"
+ "glGetVertexAttribPointerv\0"
"glGetVertexAttribPointervARB\0"
"glIsProgramARB\0"
"glPointParameteri\0"
@@ -2229,11 +2230,12 @@ static const glprocs_table_t static_functions[] = {
NAME_FUNC_OFFSET(18432, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
NAME_FUNC_OFFSET(18452, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
NAME_FUNC_OFFSET(18469, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
- NAME_FUNC_OFFSET(18498, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
- NAME_FUNC_OFFSET(18513, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
- NAME_FUNC_OFFSET(18531, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
- NAME_FUNC_OFFSET(18550, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
- NAME_FUNC_OFFSET(18574, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+ NAME_FUNC_OFFSET(18495, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+ NAME_FUNC_OFFSET(18524, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+ NAME_FUNC_OFFSET(18539, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+ NAME_FUNC_OFFSET(18557, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+ NAME_FUNC_OFFSET(18576, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+ NAME_FUNC_OFFSET(18600, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
};
span class="hl opt">; }; struct virgl_indexbuf { unsigned offset; unsigned index_size; /**< size of an index, in bytes */ struct pipe_resource *buffer; /**< the actual buffer */ const void *user_buffer; /**< pointer to a user buffer if buffer == NULL */ }; static inline struct virgl_surface *virgl_surface(struct pipe_surface *surf) { return (struct virgl_surface *)surf; } static inline void virgl_encoder_write_dword(struct virgl_cmd_buf *state, uint32_t dword) { state->buf[state->cdw++] = dword; } static inline void virgl_encoder_write_qword(struct virgl_cmd_buf *state, uint64_t qword) { memcpy(state->buf + state->cdw, &qword, sizeof(uint64_t)); state->cdw += 2; } static inline void virgl_encoder_write_block(struct virgl_cmd_buf *state, const uint8_t *ptr, uint32_t len) { int x; memcpy(state->buf + state->cdw, ptr, len); x = (len % 4); if (x) { uint8_t *mp = (uint8_t *)(state->buf + state->cdw); mp += len; memset(mp, 0, x); } state->cdw += (len + 3) / 4; } extern int virgl_encode_blend_state(struct virgl_context *ctx, uint32_t handle, const struct pipe_blend_state *blend_state); extern int virgl_encode_rasterizer_state(struct virgl_context *ctx, uint32_t handle, const struct pipe_rasterizer_state *state); extern int virgl_encode_shader_state(struct virgl_context *ctx, uint32_t handle, uint32_t type, const struct pipe_stream_output_info *so_info, uint32_t cs_req_local_mem, const struct tgsi_token *tokens); int virgl_encode_stream_output_info(struct virgl_context *ctx, uint32_t handle, uint32_t type, const struct pipe_shader_state *shader); int virgl_encoder_set_so_targets(struct virgl_context *ctx, unsigned num_targets, struct pipe_stream_output_target **targets, unsigned append_bitmask); int virgl_encoder_create_so_target(struct virgl_context *ctx, uint32_t handle, struct virgl_resource *res, unsigned buffer_offset, unsigned buffer_size); int virgl_encode_clear(struct virgl_context *ctx, unsigned buffers, const union pipe_color_union *color, double depth, unsigned stencil); int virgl_encode_bind_object(struct virgl_context *ctx, uint32_t handle, uint32_t object); int virgl_encode_delete_object(struct virgl_context *ctx, uint32_t handle, uint32_t object); int virgl_encoder_set_framebuffer_state(struct virgl_context *ctx, const struct pipe_framebuffer_state *state); int virgl_encoder_set_viewport_states(struct virgl_context *ctx, int start_slot, int num_viewports, const struct pipe_viewport_state *states); int virgl_encoder_draw_vbo(struct virgl_context *ctx, const struct pipe_draw_info *info); int virgl_encoder_create_surface(struct virgl_context *ctx, uint32_t handle, struct virgl_resource *res, const struct pipe_surface *templat); int virgl_encoder_flush_frontbuffer(struct virgl_context *ctx, struct virgl_resource *res); int virgl_encoder_create_vertex_elements(struct virgl_context *ctx, uint32_t handle, unsigned num_elements, const struct pipe_vertex_element *element); int virgl_encoder_set_vertex_buffers(struct virgl_context *ctx, unsigned num_buffers, const struct pipe_vertex_buffer *buffers); int virgl_encoder_inline_write(struct virgl_context *ctx, struct virgl_resource *res, unsigned level, unsigned usage, const struct pipe_box *box, const void *data, unsigned stride, unsigned layer_stride); int virgl_encode_sampler_state(struct virgl_context *ctx, uint32_t handle, const struct pipe_sampler_state *state); int virgl_encode_sampler_view(struct virgl_context *ctx, uint32_t handle, struct virgl_resource *res, const struct pipe_sampler_view *state); int virgl_encode_set_sampler_views(struct virgl_context *ctx, uint32_t shader_type, uint32_t start_slot, uint32_t num_views, struct virgl_sampler_view **views); int virgl_encode_bind_sampler_states(struct virgl_context *ctx, uint32_t shader_type, uint32_t start_slot, uint32_t num_handles, uint32_t *handles); int virgl_encoder_set_index_buffer(struct virgl_context *ctx, const struct virgl_indexbuf *ib); uint32_t virgl_object_assign_handle(void); int virgl_encoder_write_constant_buffer(struct virgl_context *ctx, uint32_t shader, uint32_t index, uint32_t size, const void *data); int virgl_encoder_set_uniform_buffer(struct virgl_context *ctx, uint32_t shader, uint32_t index, uint32_t offset, uint32_t length, struct virgl_resource *res); int virgl_encode_dsa_state(struct virgl_context *ctx, uint32_t handle, const struct pipe_depth_stencil_alpha_state *dsa_state); int virgl_encoder_set_stencil_ref(struct virgl_context *ctx, const struct pipe_stencil_ref *ref); int virgl_encoder_set_blend_color(struct virgl_context *ctx, const struct pipe_blend_color *color); int virgl_encoder_set_scissor_state(struct virgl_context *ctx, unsigned start_slot, int num_scissors, const struct pipe_scissor_state *ss); void virgl_encoder_set_polygon_stipple(struct virgl_context *ctx, const struct pipe_poly_stipple *ps); void virgl_encoder_set_sample_mask(struct virgl_context *ctx, unsigned sample_mask); void virgl_encoder_set_min_samples(struct virgl_context *ctx, unsigned min_samples); void virgl_encoder_set_clip_state(struct virgl_context *ctx, const struct pipe_clip_state *clip); int virgl_encode_resource_copy_region(struct virgl_context *ctx, struct virgl_resource *dst_res, unsigned dst_level, unsigned dstx, unsigned dsty, unsigned dstz, struct virgl_resource *src_res, unsigned src_level, const struct pipe_box *src_box); int virgl_encode_blit(struct virgl_context *ctx, struct virgl_resource *dst_res, struct virgl_resource *src_res, const struct pipe_blit_info *blit); int virgl_encoder_create_query(struct virgl_context *ctx, uint32_t handle, uint query_type, uint query_index, struct virgl_resource *res, uint32_t offset); int virgl_encoder_begin_query(struct virgl_context *ctx, uint32_t handle); int virgl_encoder_end_query(struct virgl_context *ctx, uint32_t handle); int virgl_encoder_get_query_result(struct virgl_context *ctx, uint32_t handle, boolean wait); int virgl_encoder_render_condition(struct virgl_context *ctx, uint32_t handle, boolean condition, enum pipe_render_cond_flag mode); int virgl_encoder_set_sub_ctx(struct virgl_context *ctx, uint32_t sub_ctx_id); int virgl_encoder_create_sub_ctx(struct virgl_context *ctx, uint32_t sub_ctx_id); int virgl_encoder_destroy_sub_ctx(struct virgl_context *ctx, uint32_t sub_ctx_id); int virgl_encode_bind_shader(struct virgl_context *ctx, uint32_t handle, uint32_t type); int virgl_encode_set_tess_state(struct virgl_context *ctx, const float outer[4], const float inner[2]); int virgl_encode_set_shader_buffers(struct virgl_context *ctx, enum pipe_shader_type shader, unsigned start_slot, unsigned count, const struct pipe_shader_buffer *buffers); int virgl_encode_set_shader_images(struct virgl_context *ctx, enum pipe_shader_type shader, unsigned start_slot, unsigned count, const struct pipe_image_view *images); int virgl_encode_set_hw_atomic_buffers(struct virgl_context *ctx, unsigned start_slot, unsigned count, const struct pipe_shader_buffer *buffers); int virgl_encode_memory_barrier(struct virgl_context *ctx, unsigned flags); int virgl_encode_launch_grid(struct virgl_context *ctx, const struct pipe_grid_info *grid_info); int virgl_encode_texture_barrier(struct virgl_context *ctx, unsigned flags); #endif