summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_atom.c2
-rw-r--r--src/mesa/state_tracker/st_atom_array.c22
-rw-r--r--src/mesa/state_tracker/st_cb_rasterpos.c6
-rw-r--r--src/mesa/state_tracker/st_draw.c4
-rw-r--r--src/mesa/state_tracker/st_draw.h2
-rw-r--r--src/mesa/state_tracker/st_draw_feedback.c4
6 files changed, 20 insertions, 20 deletions
diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index 6f06d64d202..65ac5170fdf 100644
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -120,7 +120,7 @@ static void check_program_state( struct st_context *st )
static void check_attrib_edgeflag(struct st_context *st)
{
- const struct gl_client_array **arrays = st->ctx->Array._DrawArrays;
+ const struct gl_vertex_array **arrays = st->ctx->Array._DrawArrays;
GLboolean vertdata_edgeflags, edgeflag_culls_prims, edgeflags_enabled;
struct gl_program *vp = st->ctx->VertexProgram._Current;
diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index e5b949fbaec..5ab10de83a2 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -310,9 +310,9 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
return PIPE_FORMAT_NONE; /* silence compiler warning */
}
-static const struct gl_client_array *
+static const struct gl_vertex_array *
get_client_array(const struct st_vertex_program *vp,
- const struct gl_client_array **arrays,
+ const struct gl_vertex_array **arrays,
int attr)
{
const GLuint mesaAttr = vp->index_to_input[attr];
@@ -329,7 +329,7 @@ get_client_array(const struct st_vertex_program *vp,
static GLboolean
is_interleaved_arrays(const struct st_vertex_program *vp,
const struct st_vp_variant *vpv,
- const struct gl_client_array **arrays)
+ const struct gl_vertex_array **arrays)
{
GLuint attr;
const struct gl_buffer_object *firstBufObj = NULL;
@@ -338,7 +338,7 @@ is_interleaved_arrays(const struct st_vertex_program *vp,
GLboolean userSpaceBuffer = GL_FALSE;
for (attr = 0; attr < vpv->num_inputs; attr++) {
- const struct gl_client_array *array;
+ const struct gl_vertex_array *array;
const struct gl_buffer_object *bufObj;
GLsizei stride;
@@ -444,7 +444,7 @@ static boolean
setup_interleaved_attribs(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vpv,
- const struct gl_client_array **arrays,
+ const struct gl_vertex_array **arrays,
struct pipe_vertex_buffer *vbuffer,
struct pipe_vertex_element velements[])
{
@@ -458,7 +458,7 @@ setup_interleaved_attribs(struct st_context *st,
* Init bufobj and stride.
*/
if (vpv->num_inputs) {
- const struct gl_client_array *array;
+ const struct gl_vertex_array *array;
array = get_client_array(vp, arrays, 0);
assert(array);
@@ -492,7 +492,7 @@ setup_interleaved_attribs(struct st_context *st,
usingVBO = _mesa_is_bufferobj(bufobj);
for (attr = 0; attr < vpv->num_inputs;) {
- const struct gl_client_array *array;
+ const struct gl_vertex_array *array;
unsigned src_offset;
unsigned src_format;
@@ -557,7 +557,7 @@ static boolean
setup_non_interleaved_attribs(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vpv,
- const struct gl_client_array **arrays,
+ const struct gl_vertex_array **arrays,
struct pipe_vertex_buffer vbuffer[],
struct pipe_vertex_element velements[],
unsigned *num_vbuffers)
@@ -569,7 +569,7 @@ setup_non_interleaved_attribs(struct st_context *st,
for (attr = 0; attr < vpv->num_inputs;) {
const GLuint mesaAttr = vp->index_to_input[attr];
- const struct gl_client_array *array;
+ const struct gl_vertex_array *array;
struct gl_buffer_object *bufobj;
GLsizei stride;
unsigned src_format;
@@ -587,7 +587,7 @@ setup_non_interleaved_attribs(struct st_context *st,
if (_mesa_is_bufferobj(bufobj)) {
/* Attribute data is in a VBO.
- * Recall that for VBOs, the gl_client_array->Ptr field is
+ * Recall that for VBOs, the gl_vertex_array->Ptr field is
* really an offset from the start of the VBO, not a pointer.
*/
struct st_buffer_object *stobj = st_buffer_object(bufobj);
@@ -640,7 +640,7 @@ setup_non_interleaved_attribs(struct st_context *st,
static void update_array(struct st_context *st)
{
struct gl_context *ctx = st->ctx;
- const struct gl_client_array **arrays = ctx->Array._DrawArrays;
+ const struct gl_vertex_array **arrays = ctx->Array._DrawArrays;
const struct st_vertex_program *vp;
const struct st_vp_variant *vpv;
struct pipe_vertex_buffer vbuffer[PIPE_MAX_SHADER_INPUTS];
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index 5dda0e2c8b7..85184540553 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -59,8 +59,8 @@ struct rastpos_stage
struct gl_context *ctx; /**< Rendering context */
/* vertex attrib info we can setup once and re-use */
- struct gl_client_array array[VERT_ATTRIB_MAX];
- const struct gl_client_array *arrays[VERT_ATTRIB_MAX];
+ struct gl_vertex_array array[VERT_ATTRIB_MAX];
+ const struct gl_vertex_array *arrays[VERT_ATTRIB_MAX];
struct _mesa_prim prim;
};
@@ -221,7 +221,7 @@ st_RasterPos(struct gl_context *ctx, const GLfloat v[4])
struct st_context *st = st_context(ctx);
struct draw_context *draw = st_get_draw_context(st);
struct rastpos_stage *rs;
- const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays;
+ const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays;
if (!st->draw)
return;
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index e9f25b625fd..c1a1d2d1419 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -71,7 +71,7 @@
* only interested in per-vertex data. See bug 38626.
*/
static GLboolean
-all_varyings_in_vbos(const struct gl_client_array *arrays[])
+all_varyings_in_vbos(const struct gl_vertex_array *arrays[])
{
GLuint i;
@@ -187,7 +187,7 @@ st_draw_vbo(struct gl_context *ctx,
struct st_context *st = st_context(ctx);
struct pipe_index_buffer ibuffer = {0};
struct pipe_draw_info info;
- const struct gl_client_array **arrays = ctx->Array._DrawArrays;
+ const struct gl_vertex_array **arrays = ctx->Array._DrawArrays;
unsigned i;
/* Mesa core state should have been validated already */
diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h
index fc863819c7e..2c69ca4c478 100644
--- a/src/mesa/state_tracker/st_draw.h
+++ b/src/mesa/state_tracker/st_draw.h
@@ -39,7 +39,7 @@
struct _mesa_index_buffer;
struct _mesa_prim;
-struct gl_client_array;
+struct gl_vertex_array;
struct gl_context;
struct st_context;
diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c
index 6cc7dd77701..fac83b97d9c 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -131,7 +131,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
struct pipe_index_buffer ibuffer;
struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS] = {NULL};
struct pipe_transfer *ib_transfer = NULL;
- const struct gl_client_array **arrays = ctx->Array._DrawArrays;
+ const struct gl_vertex_array **arrays = ctx->Array._DrawArrays;
GLuint attr, i;
const GLubyte *low_addr = NULL;
const void *mapped_indices = NULL;
@@ -188,7 +188,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
if (bufobj && bufobj->Name) {
/* Attribute data is in a VBO.
- * Recall that for VBOs, the gl_client_array->Ptr field is
+ * Recall that for VBOs, the gl_vertex_array->Ptr field is
* really an offset from the start of the VBO, not a pointer.
*/
struct st_buffer_object *stobj = st_buffer_object(bufobj);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 22:19:19 +0000