This series is: Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
On Fri, Feb 12, 2016 at 10:45 AM, Brian Paul <bri...@vmware.com> wrote:
> Rename to 'tex_attr' to be a bit more clear.
> ---
> src/mesa/state_tracker/st_cb_drawtex.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_cb_drawtex.c
> b/src/mesa/state_tracker/st_cb_drawtex.c
> index d36d59b..0fb54ce 100644
> --- a/src/mesa/state_tracker/st_cb_drawtex.c
> +++ b/src/mesa/state_tracker/st_cb_drawtex.c
> @@ -152,7 +152,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y,
> GLfloat z,
>
> const GLfloat x0 = x, y0 = y, x1 = x + width, y1 = y + height;
> GLfloat *vbuf = NULL;
> - GLuint attr;
> + GLuint tex_attr;
>
> u_upload_alloc(st->uploader, 0,
> numAttribs * 4 * 4 * sizeof(GLfloat), 4,
> @@ -192,10 +192,10 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat
> y, GLfloat z,
> SET_ATTRIB(3, 1, c[0], c[1], c[2], c[3]);
> semantic_names[1] = TGSI_SEMANTIC_COLOR;
> semantic_indexes[1] = 0;
> - attr = 2;
> + tex_attr = 2;
> }
> else {
> - attr = 1;
> + tex_attr = 1;
> }
>
> /* texcoords */
> @@ -212,17 +212,17 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat
> y, GLfloat z,
> const GLfloat t1 = (obj->CropRect[1] + obj->CropRect[3]) / ht;
>
> /*printf("crop texcoords: %g, %g .. %g, %g\n", s0, t0, s1, t1);*/
> - SET_ATTRIB(0, attr, s0, t0, 0.0f, 1.0f); /* lower left */
> - SET_ATTRIB(1, attr, s1, t0, 0.0f, 1.0f); /* lower right */
> - SET_ATTRIB(2, attr, s1, t1, 0.0f, 1.0f); /* upper right */
> - SET_ATTRIB(3, attr, s0, t1, 0.0f, 1.0f); /* upper left */
> + SET_ATTRIB(0, tex_attr, s0, t0, 0.0f, 1.0f); /* lower left */
> + SET_ATTRIB(1, tex_attr, s1, t0, 0.0f, 1.0f); /* lower right */
> + SET_ATTRIB(2, tex_attr, s1, t1, 0.0f, 1.0f); /* upper right */
> + SET_ATTRIB(3, tex_attr, s0, t1, 0.0f, 1.0f); /* upper left */
>
> - semantic_names[attr] = st->needs_texcoord_semantic ?
> + semantic_names[tex_attr] = st->needs_texcoord_semantic ?
> TGSI_SEMANTIC_TEXCOORD : TGSI_SEMANTIC_GENERIC;
> /* XXX: should this use semantic index i instead of 0 ? */
> - semantic_indexes[attr] = 0;
> + semantic_indexes[tex_attr] = 0;
>
> - attr++;
> + tex_attr++;
> }
> }
>
> --
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
