fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st_draw_vertices() no longer needs attribs[] array parameter

Browse source
This commit is contained in:
Brian 2007-09-25 16:56:35 -06:00
parent ccff14de0d
commit 0dfa5506a3
4 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/state_tracker/st_cb_clear.c
View file

@ -223,10 +223,6 @@ draw_quad(GLcontext *ctx,
float x0, float y0, float x1, float y1, GLfloat z,
const GLfloat color[4])
{
static const GLuint attribs[2] = {
0, /* pos */
3 /* color */
};
GLfloat verts[4][2][4]; /* four verts, two attribs, XYZW */
GLuint i;
@ -253,7 +249,7 @@ draw_quad(GLcontext *ctx,
verts[i][1][3] = color[3];
}
st_draw_vertices(ctx, PIPE_PRIM_QUADS, 4, (float *) verts, 2, attribs);
st_draw_vertices(ctx, PIPE_PRIM_QUADS, 4, (float *) verts, 2);
}

13
src/mesa/state_tracker/st_cb_drawpixels.c
View file

@ -312,10 +312,6 @@ static void
draw_quad(GLcontext *ctx, GLfloat x0, GLfloat y0, GLfloat z,
GLfloat x1, GLfloat y1)
{
static const GLuint attribs[2] = {
0, /* pos */
8 /* tex0 */
};
GLfloat verts[4][2][4]; /* four verts, two attribs, XYZW */
GLuint i;
@ -351,7 +347,7 @@ draw_quad(GLcontext *ctx, GLfloat x0, GLfloat y0, GLfloat z,
verts[i][1][3] = 1.0; /*Q*/
}
st_draw_vertices(ctx, PIPE_PRIM_QUADS, 4, (float *) verts, 2, attribs);
st_draw_vertices(ctx, PIPE_PRIM_QUADS, 4, (float *) verts, 2);
}
@ -359,11 +355,6 @@ static void
draw_quad_colored(GLcontext *ctx, GLfloat x0, GLfloat y0, GLfloat z,
GLfloat x1, GLfloat y1, const GLfloat *color)
{
static const GLuint attribs[3] = {
0, /* pos */
1, /* color */
8 /* tex0 */
};
GLfloat verts[4][3][4]; /* four verts, three attribs, XYZW */
GLuint i;
@ -403,7 +394,7 @@ draw_quad_colored(GLcontext *ctx, GLfloat x0, GLfloat y0, GLfloat z,
verts[i][2][3] = 1.0; /*Q*/
}
st_draw_vertices(ctx, PIPE_PRIM_QUADS, 4, (float *) verts, 3, attribs);
st_draw_vertices(ctx, PIPE_PRIM_QUADS, 4, (float *) verts, 3);
}

5
src/mesa/state_tracker/st_draw.c
View file

@ -316,7 +316,7 @@ st_draw_vbo(GLcontext *ctx,
void
st_draw_vertices(GLcontext *ctx, unsigned prim,
unsigned numVertex, float *verts,
unsigned numAttribs, const unsigned attribs[])
unsigned numAttribs)
{
const float width = ctx->DrawBuffer->Width;
const float height = ctx->DrawBuffer->Height;
@ -328,7 +328,6 @@ st_draw_vertices(GLcontext *ctx, unsigned prim,
unsigned i;
assert(numAttribs > 0);
assert(attribs[0] == 0); /* position */
/* convert to clip coords */
for (i = 0; i < numVertex; i++) {
@ -356,7 +355,7 @@ st_draw_vertices(GLcontext *ctx, unsigned prim,
velement.vertex_buffer_index = 0;
velement.src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
velement.dst_offset = 0;
pipe->set_vertex_element(pipe, i/**attribs[i]**/, &velement);
pipe->set_vertex_element(pipe, i, &velement);
}
/* draw */

2
src/mesa/state_tracker/st_draw.h
View file

@ -62,7 +62,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
void
st_draw_vertices(GLcontext *ctx, unsigned prim,
unsigned numVertex, float *verts,
unsigned numAttribs, const unsigned attribs[]);
unsigned numAttribs);
#endif