Mesa (master): st/mesa: fix indentation
Brian Paul
brianp at kemper.freedesktop.org
Mon Nov 7 21:25:14 UTC 2011
Module: Mesa
Branch: master
Commit: 33ca21fc3ca78d9e93d2a750b6da3505346d2b86
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=33ca21fc3ca78d9e93d2a750b6da3505346d2b86
Author: Morgan Armand <morgan.devel at gmail.com>
Date: Mon Nov 7 19:38:13 2011 +0100
st/mesa: fix indentation
Signed-off-by: Brian Paul <brianp at vmware.com>
---
src/mesa/state_tracker/st_atom_texture.c | 11 +++++------
src/mesa/state_tracker/st_cb_drawpixels.c | 6 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index 3115a25..008e9bd 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -267,14 +267,13 @@ update_vertex_textures(struct st_context *st)
GLboolean retval;
GLuint texUnit;
- texUnit = vprog->Base.SamplerUnits[su];
+ texUnit = vprog->Base.SamplerUnits[su];
- retval = update_single_texture(st, &sampler_view, texUnit);
- if (retval == GL_FALSE)
- continue;
-
- st->state.num_vertex_textures = su + 1;
+ retval = update_single_texture(st, &sampler_view, texUnit);
+ if (retval == GL_FALSE)
+ continue;
+ st->state.num_vertex_textures = su + 1;
}
pipe_sampler_view_reference(&st->state.sampler_vertex_views[su], sampler_view);
}
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 1c44d0d..8c49f8d 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1135,10 +1135,10 @@ st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,
assert(0);
}
- sv[1] = st_create_texture_sampler_view_format(st->pipe, pt,
+ sv[1] = st_create_texture_sampler_view_format(st->pipe, pt,
stencil_format);
- num_sampler_view++;
- }
+ num_sampler_view++;
+ }
draw_textured_quad(ctx, x, y, ctx->Current.RasterPos[2],
width, height,
More information about the mesa-commit
mailing list