From 2f1af8549de836673ed673a6a6cd3774ca00c821 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 5 Jul 2018 10:47:32 -0600 Subject: [PATCH] mesa: replace tabs with spaces in mipmap.c Trivial. --- src/mesa/main/mipmap.c | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 9b6eee4..88e6baa 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1470,9 +1470,9 @@ make_1d_mipmap(GLenum datatype, GLuint comps, GLint border, static void make_2d_mipmap(GLenum datatype, GLuint comps, GLint border, GLint srcWidth, GLint srcHeight, - const GLubyte *srcPtr, GLint srcRowStride, + const GLubyte *srcPtr, GLint srcRowStride, GLint dstWidth, GLint dstHeight, - GLubyte *dstPtr, GLint dstRowStride) + GLubyte *dstPtr, GLint dstRowStride) { const GLint bpt = bytes_per_pixel(datatype, comps); const GLint srcWidthNB = srcWidth - 2 * border; /* sizes w/out border */ @@ -1761,17 +1761,17 @@ _mesa_generate_mipmap_level(GLenum target, assert(srcHeight == 1); assert(dstHeight == 1); for (i = 0; i < dstDepth; i++) { - make_1d_mipmap(datatype, comps, border, - srcWidth, srcData[i], - dstWidth, dstData[i]); + make_1d_mipmap(datatype, comps, border, + srcWidth, srcData[i], + dstWidth, dstData[i]); } break; case GL_TEXTURE_2D_ARRAY_EXT: case GL_TEXTURE_CUBE_MAP_ARRAY: for (i = 0; i < dstDepth; i++) { - make_2d_mipmap(datatype, comps, border, - srcWidth, srcHeight, srcData[i], srcRowStride, - dstWidth, dstHeight, dstData[i], dstRowStride); + make_2d_mipmap(datatype, comps, border, + srcWidth, srcHeight, srcData[i], srcRowStride, + dstWidth, dstHeight, dstData[i], dstRowStride); } break; case GL_TEXTURE_RECTANGLE_NV: @@ -1800,7 +1800,7 @@ _mesa_next_mipmap_level_size(GLenum target, GLint border, *dstWidth = srcWidth; /* can't go smaller */ } - if ((srcHeight - 2 * border > 1) && + if ((srcHeight - 2 * border > 1) && target != GL_TEXTURE_1D_ARRAY_EXT && target != GL_PROXY_TEXTURE_1D_ARRAY_EXT) { *dstHeight = (srcHeight - 2 * border) / 2 + 2 * border; @@ -1944,9 +1944,9 @@ _mesa_prepare_mipmap_levels(struct gl_context *ctx, static void generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target, - struct gl_texture_object *texObj, - const struct gl_texture_image *srcImage, - GLuint maxLevel) + struct gl_texture_object *texObj, + const struct gl_texture_image *srcImage, + GLuint maxLevel) { GLuint level; GLenum datatype; @@ -1983,10 +1983,10 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target, dstDepth = dstImage->Depth; if (target == GL_TEXTURE_1D_ARRAY) { - srcDepth = srcHeight; - dstDepth = dstHeight; - srcHeight = 1; - dstHeight = 1; + srcDepth = srcHeight; + dstDepth = dstHeight; + srcHeight = 1; + dstHeight = 1; } /* Map src texture image slices */ @@ -2064,9 +2064,9 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target, static void generate_mipmap_compressed(struct gl_context *ctx, GLenum target, - struct gl_texture_object *texObj, - struct gl_texture_image *srcImage, - GLuint maxLevel) + struct gl_texture_object *texObj, + struct gl_texture_image *srcImage, + GLuint maxLevel) { GLuint level; mesa_format temp_format; @@ -2079,8 +2079,8 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target, /* only two types of compressed textures at this time */ assert(texObj->Target == GL_TEXTURE_2D || - texObj->Target == GL_TEXTURE_2D_ARRAY || - texObj->Target == GL_TEXTURE_CUBE_MAP || + texObj->Target == GL_TEXTURE_2D_ARRAY || + texObj->Target == GL_TEXTURE_CUBE_MAP || texObj->Target == GL_TEXTURE_CUBE_MAP_ARRAY); /* @@ -2173,11 +2173,11 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target, temp_dst_img_stride = _mesa_format_image_size(temp_format, dstWidth, dstHeight, 1); if (!temp_dst) { - temp_dst = malloc(temp_dst_img_stride * dstDepth); - if (!temp_dst) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps"); + temp_dst = malloc(temp_dst_img_stride * dstDepth); + if (!temp_dst) { + _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps"); goto end; - } + } } /* for 2D arrays, setup array[depth] of slice pointers */ @@ -2206,9 +2206,9 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target, /* swap src and dest pointers */ { - GLubyte *temp = temp_src; - temp_src = temp_dst; - temp_dst = temp; + GLubyte *temp = temp_src; + temp_src = temp_dst; + temp_dst = temp; temp_src_row_stride = temp_dst_row_stride; temp_src_img_stride = temp_dst_img_stride; } -- 2.7.4