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

shuffle some code to make some assertions in the _savage_texstore_a111xxxx functions compile without error...

Browse source
This commit is contained in:
Roland Scheidegger 2006-06-09 00:28:53 +00:00
parent 5dbd0a400a
commit 52c5d9c5b7
1 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/mesa/drivers/dri/savage/savagetex.c
View file

@ -527,6 +527,51 @@ savageAllocTexObj( struct gl_texture_object *texObj )
* formats that promote to ARGB8888 or ARGB4444 and set the color
* components to white. This way we get the correct result.
*/
static GLboolean
_savage_texstore_a1114444(TEXSTORE_PARAMS);
static GLboolean
_savage_texstore_a1118888(TEXSTORE_PARAMS);
static struct gl_texture_format _savage_texformat_a1114444 = {
MESA_FORMAT_ARGB4444, /* MesaFormat */
GL_RGBA, /* BaseFormat */
GL_UNSIGNED_NORMALIZED_ARB, /* DataType */
4, /* RedBits */
4, /* GreenBits */
4, /* BlueBits */
4, /* AlphaBits */
0, /* LuminanceBits */
0, /* IntensityBits */
0, /* IndexBits */
0, /* DepthBits */
0, /* StencilBits */
2, /* TexelBytes */
_savage_texstore_a1114444, /* StoreTexImageFunc */
NULL, NULL, NULL, NULL, NULL, NULL /* FetchTexel* filled in by
* savageDDInitTextureFuncs */
};
static struct gl_texture_format _savage_texformat_a1118888 = {
MESA_FORMAT_ARGB8888, /* MesaFormat */
GL_RGBA, /* BaseFormat */
GL_UNSIGNED_NORMALIZED_ARB, /* DataType */
8, /* RedBits */
8, /* GreenBits */
8, /* BlueBits */
8, /* AlphaBits */
0, /* LuminanceBits */
0, /* IntensityBits */
0, /* IndexBits */
0, /* DepthBits */
0, /* StencilBits */
4, /* TexelBytes */
_savage_texstore_a1118888, /* StoreTexImageFunc */
NULL, NULL, NULL, NULL, NULL, NULL /* FetchTexel* filled in by
* savageDDInitTextureFuncs */
};
static GLboolean
_savage_texstore_a1114444(TEXSTORE_PARAMS)
{
@ -605,44 +650,6 @@ _savage_texstore_a1118888(TEXSTORE_PARAMS)
}
static struct gl_texture_format _savage_texformat_a1114444 = {
MESA_FORMAT_ARGB4444, /* MesaFormat */
GL_RGBA, /* BaseFormat */
GL_UNSIGNED_NORMALIZED_ARB, /* DataType */
4, /* RedBits */
4, /* GreenBits */
4, /* BlueBits */
4, /* AlphaBits */
0, /* LuminanceBits */
0, /* IntensityBits */
0, /* IndexBits */
0, /* DepthBits */
0, /* StencilBits */
2, /* TexelBytes */
_savage_texstore_a1114444, /* StoreTexImageFunc */
NULL, NULL, NULL, NULL, NULL, NULL /* FetchTexel* filled in by
* savageDDInitTextureFuncs */
};
static struct gl_texture_format _savage_texformat_a1118888 = {
MESA_FORMAT_ARGB8888, /* MesaFormat */
GL_RGBA, /* BaseFormat */
GL_UNSIGNED_NORMALIZED_ARB, /* DataType */
8, /* RedBits */
8, /* GreenBits */
8, /* BlueBits */
8, /* AlphaBits */
0, /* LuminanceBits */
0, /* IntensityBits */
0, /* IndexBits */
0, /* DepthBits */
0, /* StencilBits */
4, /* TexelBytes */
_savage_texstore_a1118888, /* StoreTexImageFunc */
NULL, NULL, NULL, NULL, NULL, NULL /* FetchTexel* filled in by
* savageDDInitTextureFuncs */
};
/* Called by the _mesa_store_teximage[123]d() functions. */
static const struct gl_texture_format *
savageChooseTextureFormat( GLcontext *ctx, GLint internalFormat,