fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

new params for SpecificCompressedTexFormat() (Bill White)

Browse source
This commit is contained in:
Brian Paul 2000-09-28 18:30:39 +00:00
parent 574c456a5a
commit 37a6211795
2 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/main/dd.h
View file

@ -1,4 +1,4 @@
/* $Id: dd.h,v 1.32 2000/09/14 23:13:51 brianp Exp $ */
/* $Id: dd.h,v 1.33 2000/09/28 18:30:39 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -699,8 +699,15 @@ struct dd_function_table {
*/
GLint (*SpecificCompressedTexFormat)(GLcontext *ctx,
GLint internalFormat,
GLint numDimensions);
GLint internalFormat,
GLint numDimensions,
GLint *levelp,
GLsizei *widthp,
GLsizei *heightp,
GLsizei *depthp,
GLint *borderp,
GLenum *formatp,
GLenum *typep);
/* Called to turn a generic texture format into a specific
* texture format. For example, if a driver implements
* GL_3DFX_texture_compression_FXT1, this would map

49
src/mesa/main/teximage.c
View file

@ -1,4 +1,4 @@
/* $Id: teximage.c,v 1.50 2000/09/07 15:38:49 brianp Exp $ */
/* $Id: teximage.c,v 1.51 2000/09/28 18:30:39 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -1507,7 +1507,14 @@ copytexsubimage_error_check( GLcontext *ctx, GLuint dimensions,
*/
static GLint
get_specific_compressed_tex_format(GLcontext *ctx,
GLint ifmt, GLint numDimensions)
GLint ifmt, GLint numDimensions,
GLint *levelp,
GLsizei *widthp,
GLsizei *heightp,
GLsizei *depthp,
GLint *borderp,
GLenum *formatp,
GLenum *typep)
{
char message[100];
GLint internalFormat = ifmt;
@ -1516,22 +1523,14 @@ get_specific_compressed_tex_format(GLcontext *ctx,
&& ctx->Driver.SpecificCompressedTexFormat) {
/*
* First, ask the driver for the specific format.
* We do this for all formats, since we may want to
* fake one compressed format for another.
*/
switch (internalFormat) {
case GL_COMPRESSED_ALPHA_ARB:
case GL_COMPRESSED_LUMINANCE_ARB:
case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
case GL_COMPRESSED_INTENSITY_ARB:
case GL_COMPRESSED_RGB_ARB:
case GL_COMPRESSED_RGBA_ARB:
internalFormat = (*ctx->Driver.SpecificCompressedTexFormat)
(ctx, internalFormat, numDimensions);
/* XXX shouldn't we return now? */
break;
default:
/* silence compiler warnings */
;
}
internalFormat = (*ctx->Driver.SpecificCompressedTexFormat)
(ctx, internalFormat, numDimensions,
levelp,
widthp, heightp, depthp,
borderp, formatp, typep);
}
/*
@ -1597,7 +1596,6 @@ get_specific_compressed_tex_format(GLcontext *ctx,
}
/*
* Called from the API. Note that width includes the border.
*/
@ -1619,7 +1617,10 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
struct gl_texture_image *texImage;
GLint ifmt;
ifmt = get_specific_compressed_tex_format(ctx, internalFormat, 1);
ifmt = get_specific_compressed_tex_format(ctx, internalFormat, 1,
&level,
&width, 0, 0,
&border, &format, &type);
if (ifmt < 0) {
/*
* The error here is that we were sent a generic compressed
@ -1752,7 +1753,10 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
struct gl_texture_image *texImage;
GLint ifmt;
ifmt = get_specific_compressed_tex_format(ctx, internalFormat, 2);
ifmt = get_specific_compressed_tex_format(ctx, internalFormat, 2,
&level,
&width, &height, 0,
&border, &format, &type);
if (ifmt < 0) {
/*
* The error here is that we were sent a generic compressed
@ -1894,7 +1898,10 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
struct gl_texture_image *texImage;
GLint ifmt;
ifmt = get_specific_compressed_tex_format(ctx, internalFormat, 3);
ifmt = get_specific_compressed_tex_format(ctx, internalFormat, 3,
&level,
&width, &height, &depth,
&border, &format, &type);
if (ifmt < 0) {
/*
* The error here is that we were sent a generic compressed