[Mesa-dev] [PATCH 13/17] st/mesa: remove unused st parameter in init_velement_lowered

Marek Olšák maraeo at gmail.com
Mon May 1 12:53:02 UTC 2017


From: Marek Olšák <marek.olsak at amd.com>

---
 src/mesa/state_tracker/st_atom_array.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index 3e6e3c1..f873460 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -367,22 +367,21 @@ static void init_velement(struct pipe_vertex_element *velement,
                           int src_offset, int format,
                           int instance_divisor, int vbo_index)
 {
    velement->src_offset = src_offset;
    velement->src_format = format;
    velement->instance_divisor = instance_divisor;
    velement->vertex_buffer_index = vbo_index;
    assert(velement->src_format);
 }
 
-static void init_velement_lowered(struct st_context *st,
-                                  const struct st_vertex_program *vp,
+static void init_velement_lowered(const struct st_vertex_program *vp,
                                   struct pipe_vertex_element *velements,
                                   int src_offset, int format,
                                   int instance_divisor, int vbo_index,
                                   int nr_components, GLboolean doubles,
                                   GLuint *attr_idx)
 {
    int idx = *attr_idx;
    if (doubles) {
       int lower_format;
 
@@ -510,21 +509,21 @@ setup_interleaved_attribs(struct st_context *st,
       src_offset = (unsigned) (array->Ptr - low_addr);
       assert(array->_ElementSize ==
              _mesa_bytes_per_vertex_attrib(array->Size, array->Type));
 
       src_format = st_pipe_vertex_format(array->Type,
                                          array->Size,
                                          array->Format,
                                          array->Normalized,
                                          array->Integer);
 
-      init_velement_lowered(st, vp, velements, src_offset, src_format,
+      init_velement_lowered(vp, velements, src_offset, src_format,
                             array->InstanceDivisor, 0,
                             array->Size, array->Doubles, &attr);
    }
 
    /*
     * Return the vbuffer info and setup user-space attrib info, if needed.
     */
    if (num_inputs == 0) {
       /* just defensive coding here */
       vbuffer.buffer.resource = NULL;
@@ -632,21 +631,21 @@ setup_non_interleaved_attribs(struct st_context *st,
 
       /* common-case setup */
       vbuffer[bufidx].stride = stride; /* in bytes */
 
       src_format = st_pipe_vertex_format(array->Type,
                                          array->Size,
                                          array->Format,
                                          array->Normalized,
                                          array->Integer);
 
-      init_velement_lowered(st, vp, velements, 0, src_format,
+      init_velement_lowered(vp, velements, 0, src_format,
                             array->InstanceDivisor, bufidx,
                             array->Size, array->Doubles, &attr);
    }
 
    set_vertex_attribs(st, vbuffer, num_vbuffers, velements, num_inputs);
 }
 
 void st_update_array(struct st_context *st)
 {
    struct gl_context *ctx = st->ctx;
-- 
2.7.4



More information about the mesa-dev mailing list