fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-30 09:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mesa: move _mesa_upscale_teximage2d() to texcompress_fxt1.c

Browse source 
Was used by no other code.
This commit is contained in:
Brian Paul 2011-09-17 15:25:33 -06:00
parent 529b9360f3
commit ece8d6f25c
3 changed files with 38 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/mesa/main/mipmap.c
View file

@ -2218,37 +2218,3 @@ do { \
}
}
/**
* Upscale an image by replication, not (typical) stretching.
* We use this when the image width or height is less than a
* certain size (4, 8) and we need to upscale an image.
*/
void
_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
GLsizei outWidth, GLsizei outHeight,
GLint comps, const GLchan *src, GLint srcRowStride,
GLchan *dest )
{
GLint i, j, k;
ASSERT(outWidth >= inWidth);
ASSERT(outHeight >= inHeight);
#if 0
ASSERT(inWidth == 1 || inWidth == 2 || inHeight == 1 || inHeight == 2);
ASSERT((outWidth & 3) == 0);
ASSERT((outHeight & 3) == 0);
#endif
for (i = 0; i < outHeight; i++) {
const GLint ii = i % inHeight;
for (j = 0; j < outWidth; j++) {
const GLint jj = j % inWidth;
for (k = 0; k < comps; k++) {
dest[(i * outWidth + j) * comps + k]
= src[ii * srcRowStride + jj * comps + k];
}
}
}
}

6
src/mesa/main/mipmap.h
View file

@ -54,11 +54,5 @@ _mesa_rescale_teximage2d(GLuint bytesPerPixel,
GLint dstWidth, GLint dstHeight,
const GLvoid *srcImage, GLvoid *dstImage);
extern void
_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
GLsizei outWidth, GLsizei outHeight,
GLint comps, const GLchan *src, GLint srcRowStride,
GLchan *dest);
#endif /* MIPMAP_H */

41
src/mesa/main/texcompress_fxt1.c
View file

@ -1289,6 +1289,41 @@ fxt1_quantize (GLuint *cc, const GLubyte *lines[], GLint comps)
}
/**
* Upscale an image by replication, not (typical) stretching.
* We use this when the image width or height is less than a
* certain size (4, 8) and we need to upscale an image.
*/
static void
upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
GLsizei outWidth, GLsizei outHeight,
GLint comps, const GLchan *src, GLint srcRowStride,
GLchan *dest )
{
GLint i, j, k;
ASSERT(outWidth >= inWidth);
ASSERT(outHeight >= inHeight);
#if 0
ASSERT(inWidth == 1 || inWidth == 2 || inHeight == 1 || inHeight == 2);
ASSERT((outWidth & 3) == 0);
ASSERT((outHeight & 3) == 0);
#endif
for (i = 0; i < outHeight; i++) {
const GLint ii = i % inHeight;
for (j = 0; j < outWidth; j++) {
const GLint jj = j % inWidth;
for (k = 0; k < comps; k++) {
dest[(i * outWidth + j) * comps + k]
= src[ii * srcRowStride + jj * comps + k];
}
}
}
}
static void
fxt1_encode (GLuint width, GLuint height, GLint comps,
const void *source, GLint srcRowStride,
@ -1311,9 +1346,9 @@ fxt1_encode (GLuint width, GLuint height, GLint comps,
_mesa_error(ctx, GL_OUT_OF_MEMORY, "texture compression");
goto cleanUp;
}
_mesa_upscale_teximage2d(width, height, newWidth, newHeight,
comps, (const GLchan *) source,
srcRowStride, (GLchan *) newSource);
upscale_teximage2d(width, height, newWidth, newHeight,
comps, (const GLchan *) source,
srcRowStride, (GLchan *) newSource);
source = newSource;
width = newWidth;
height = newHeight;