From ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 28 Jun 2013 16:47:15 +0200 Subject: fontconfig mesa git update 28 June 2013 fontconfig commit 197d06c49b01413303f2c92130594daa4fcaa6ad mesa commit 24b05ff1581b612ab6dbf4937fa4b644b4e61379 --- mesalib/src/mesa/state_tracker/st_cb_texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesalib/src/mesa/state_tracker/st_cb_texture.c') diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 68c334ed8..c167744f4 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -734,7 +734,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims, const uint bytesPerRow = width * util_format_get_blocksize(src_format); GLuint row, slice; - for (slice = 0; slice < depth; slice++) { + for (slice = 0; slice < (unsigned) depth; slice++) { if (gl_target == GL_TEXTURE_1D_ARRAY) { /* 1D array textures. * We need to convert gallium coords to GL coords. @@ -747,7 +747,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims, else { ubyte *slice_map = map; - for (row = 0; row < height; row++) { + for (row = 0; row < (unsigned) height; row++) { GLvoid *src = _mesa_image_address3d(unpack, pixels, width, height, format, type, slice, row, 0); @@ -1625,7 +1625,7 @@ st_AllocTextureStorage(struct gl_context *ctx, GLuint ptWidth, ptHeight, ptDepth, ptLayers, bindings; enum pipe_format fmt; GLint level; - int num_samples = texImage->NumSamples; + GLuint num_samples = texImage->NumSamples; assert(levels > 0); -- cgit v1.2.3