From: Brian Paul <brianp@vmware.com>
Date: Thu, 29 Oct 2009 03:25:56 +0000 (-0600)
Subject: mesa: minor code movement
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc143b1a9ffc16af27b2e7183ca3ec59ad5a7c89;p=mesa.git

mesa: minor code movement
---

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 11f8857fa7c..a4f1926ab37 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -153,38 +153,6 @@ _mesa_glenum_to_compressed_format(GLenum format)
 }
 
 
-/*
- * Return the address of the pixel at (col, row, img) in a
- * compressed texture image.
- * \param col, row, img - image position (3D), should be a multiple of the
- *                        format's block size.
- * \param format - compressed image format
- * \param width - image width (stride) in pixels
- * \param image - the image address
- * \return address of pixel at (row, col, img)
- */
-GLubyte *
-_mesa_compressed_image_address(GLint col, GLint row, GLint img,
-                               gl_format mesaFormat,
-                               GLsizei width, const GLubyte *image)
-{
-   /* XXX only 2D images implemented, not 3D */
-   const GLuint blockSize = _mesa_get_format_bytes(mesaFormat);
-   GLuint bw, bh;
-   GLint offset;
-
-   _mesa_get_format_block_size(mesaFormat, &bw, &bh);
-
-   ASSERT(col % bw == 0);
-   ASSERT(row % bh == 0);
-
-   offset = ((width + bw - 1) / bw) * (row / bh) + col / bw;
-   offset *= blockSize;
-
-   return (GLubyte *) image + offset;
-}
-
-
 /**
  * Given a compressed MESA_FORMAT_x value, return the corresponding
  * GLenum for that format.
@@ -233,3 +201,33 @@ _mesa_compressed_format_to_glenum(GLcontext *ctx, GLuint mesaFormat)
 }
 
 
+/*
+ * Return the address of the pixel at (col, row, img) in a
+ * compressed texture image.
+ * \param col, row, img - image position (3D), should be a multiple of the
+ *                        format's block size.
+ * \param format - compressed image format
+ * \param width - image width (stride) in pixels
+ * \param image - the image address
+ * \return address of pixel at (row, col, img)
+ */
+GLubyte *
+_mesa_compressed_image_address(GLint col, GLint row, GLint img,
+                               gl_format mesaFormat,
+                               GLsizei width, const GLubyte *image)
+{
+   /* XXX only 2D images implemented, not 3D */
+   const GLuint blockSize = _mesa_get_format_bytes(mesaFormat);
+   GLuint bw, bh;
+   GLint offset;
+
+   _mesa_get_format_block_size(mesaFormat, &bw, &bh);
+
+   ASSERT(col % bw == 0);
+   ASSERT(row % bh == 0);
+
+   offset = ((width + bw - 1) / bw) * (row / bh) + col / bw;
+   offset *= blockSize;
+
+   return (GLubyte *) image + offset;
+}
diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index 9c58425fc93..418416746c7 100644
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -36,16 +36,15 @@ _mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all);
 extern gl_format
 _mesa_glenum_to_compressed_format(GLenum format);
 
+extern GLenum
+_mesa_compressed_format_to_glenum(GLcontext *ctx, GLuint mesaFormat);
+
 extern GLubyte *
 _mesa_compressed_image_address(GLint col, GLint row, GLint img,
                                gl_format mesaFormat,
                                GLsizei width, const GLubyte *image);
 
 
-extern GLenum
-_mesa_compressed_format_to_glenum(GLcontext *ctx, GLuint mesaFormat);
-
-
 extern void
 _mesa_init_texture_s3tc( GLcontext *ctx );