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

mesa: use more mesa format functions

Browse source
This commit is contained in:
Brian Paul 2009-09-27 20:56:04 -06:00
parent 5cf5d4be21
commit af0adb5852
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/mesa/main/texparam.c
View file

@ -727,6 +727,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
const struct gl_texture_image *img = NULL; const struct gl_texture_image *img = NULL;
GLboolean isProxy; GLboolean isProxy;
GLint maxLevels; GLint maxLevels;
gl_format texFormat;
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -764,6 +765,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
goto out; goto out;
} }
texFormat = img->TexFormat->MesaFormat;
isProxy = _mesa_is_proxy_texture(target); isProxy = _mesa_is_proxy_texture(target);
switch (pname) { switch (pname) {
@ -786,7 +789,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
case GL_TEXTURE_GREEN_SIZE: case GL_TEXTURE_GREEN_SIZE:
case GL_TEXTURE_BLUE_SIZE: case GL_TEXTURE_BLUE_SIZE:
if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA) if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
*params = _mesa_get_format_bits(img->TexFormat->MesaFormat, pname); *params = _mesa_get_format_bits(texFormat, pname);
else else
*params = 0; *params = 0;
break; break;
@ -794,7 +797,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
if (img->_BaseFormat == GL_ALPHA || if (img->_BaseFormat == GL_ALPHA ||
img->_BaseFormat == GL_LUMINANCE_ALPHA || img->_BaseFormat == GL_LUMINANCE_ALPHA ||
img->_BaseFormat == GL_RGBA) img->_BaseFormat == GL_RGBA)
*params = _mesa_get_format_bits(img->TexFormat->MesaFormat, pname); *params = _mesa_get_format_bits(texFormat, pname);
else else
*params = 0; *params = 0;
break; break;
@ -802,11 +805,11 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
if (img->_BaseFormat != GL_INTENSITY) if (img->_BaseFormat != GL_INTENSITY)
*params = 0; *params = 0;
else { else {
*params = _mesa_get_format_bits(img->TexFormat->MesaFormat, pname); *params = _mesa_get_format_bits(texFormat, pname);
if (*params == 0) { if (*params == 0) {
/* intensity probably stored as rgb texture */ /* intensity probably stored as rgb texture */
*params = MIN2(_mesa_get_format_bits(img->TexFormat->MesaFormat, GL_TEXTURE_RED_SIZE), *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),
_mesa_get_format_bits(img->TexFormat->MesaFormat, GL_TEXTURE_GREEN_SIZE)); _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));
} }
} }
break; break;
@ -815,23 +818,23 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
img->_BaseFormat != GL_LUMINANCE_ALPHA) img->_BaseFormat != GL_LUMINANCE_ALPHA)
*params = 0; *params = 0;
else { else {
*params = _mesa_get_format_bits(img->TexFormat->MesaFormat, pname); *params = _mesa_get_format_bits(texFormat, pname);
if (img->TexFormat->LuminanceBits == 0) { if (img->TexFormat->LuminanceBits == 0) {
/* luminance probably stored as rgb texture */ /* luminance probably stored as rgb texture */
*params = MIN2(_mesa_get_format_bits(img->TexFormat->MesaFormat, GL_TEXTURE_RED_SIZE), *params = MIN2(_mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE),
_mesa_get_format_bits(img->TexFormat->MesaFormat, GL_TEXTURE_GREEN_SIZE)); _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE));
} }
} }
break; break;
case GL_TEXTURE_INDEX_SIZE_EXT: case GL_TEXTURE_INDEX_SIZE_EXT:
if (img->_BaseFormat == GL_COLOR_INDEX) if (img->_BaseFormat == GL_COLOR_INDEX)
*params = _mesa_get_format_bits(img->TexFormat->MesaFormat, pname); *params = _mesa_get_format_bits(texFormat, pname);
else else
*params = 0; *params = 0;
break; break;
case GL_TEXTURE_DEPTH_SIZE_ARB: case GL_TEXTURE_DEPTH_SIZE_ARB:
if (ctx->Extensions.ARB_depth_texture) if (ctx->Extensions.ARB_depth_texture)
*params = _mesa_get_format_bits(img->TexFormat->MesaFormat, pname); *params = _mesa_get_format_bits(texFormat, pname);
else else
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
"glGetTexLevelParameter[if]v(pname)"); "glGetTexLevelParameter[if]v(pname)");
@ -839,7 +842,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
case GL_TEXTURE_STENCIL_SIZE_EXT: case GL_TEXTURE_STENCIL_SIZE_EXT:
if (ctx->Extensions.EXT_packed_depth_stencil || if (ctx->Extensions.EXT_packed_depth_stencil ||
ctx->Extensions.ARB_framebuffer_object) { ctx->Extensions.ARB_framebuffer_object) {
*params = _mesa_get_format_bits(img->TexFormat->MesaFormat, pname); *params = _mesa_get_format_bits(texFormat, pname);
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
@ -855,7 +858,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
*/ */
*params = _mesa_compressed_texture_size(ctx, img->Width, *params = _mesa_compressed_texture_size(ctx, img->Width,
img->Height, img->Depth, img->Height, img->Depth,
img->TexFormat->MesaFormat); texFormat);
} }
else { else {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
@ -869,7 +872,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
/* GL_ARB_texture_float */ /* GL_ARB_texture_float */
case GL_TEXTURE_RED_TYPE_ARB: case GL_TEXTURE_RED_TYPE_ARB:
if (ctx->Extensions.ARB_texture_float) { if (ctx->Extensions.ARB_texture_float) {
*params = img->TexFormat->RedBits ? img->TexFormat->DataType : GL_NONE; *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_RED_SIZE) ?
_mesa_get_format_datatype(texFormat) : GL_NONE;
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
@ -878,7 +882,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
break; break;
case GL_TEXTURE_GREEN_TYPE_ARB: case GL_TEXTURE_GREEN_TYPE_ARB:
if (ctx->Extensions.ARB_texture_float) { if (ctx->Extensions.ARB_texture_float) {
*params = img->TexFormat->GreenBits ? img->TexFormat->DataType : GL_NONE; *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_GREEN_SIZE) ?
_mesa_get_format_datatype(texFormat) : GL_NONE;
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
@ -887,7 +892,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
break; break;
case GL_TEXTURE_BLUE_TYPE_ARB: case GL_TEXTURE_BLUE_TYPE_ARB:
if (ctx->Extensions.ARB_texture_float) { if (ctx->Extensions.ARB_texture_float) {
*params = img->TexFormat->BlueBits ? img->TexFormat->DataType : GL_NONE; *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_BLUE_SIZE) ?
_mesa_get_format_datatype(texFormat) : GL_NONE;
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
@ -896,7 +902,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
break; break;
case GL_TEXTURE_ALPHA_TYPE_ARB: case GL_TEXTURE_ALPHA_TYPE_ARB:
if (ctx->Extensions.ARB_texture_float) { if (ctx->Extensions.ARB_texture_float) {
*params = img->TexFormat->AlphaBits ? img->TexFormat->DataType : GL_NONE; *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_ALPHA_SIZE) ?
_mesa_get_format_datatype(texFormat) : GL_NONE;
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
@ -905,7 +912,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
break; break;
case GL_TEXTURE_LUMINANCE_TYPE_ARB: case GL_TEXTURE_LUMINANCE_TYPE_ARB:
if (ctx->Extensions.ARB_texture_float) { if (ctx->Extensions.ARB_texture_float) {
*params = img->TexFormat->LuminanceBits ? img->TexFormat->DataType : GL_NONE; *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_LUMINANCE_SIZE) ?
_mesa_get_format_datatype(texFormat) : GL_NONE;
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
@ -914,7 +922,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
break; break;
case GL_TEXTURE_INTENSITY_TYPE_ARB: case GL_TEXTURE_INTENSITY_TYPE_ARB:
if (ctx->Extensions.ARB_texture_float) { if (ctx->Extensions.ARB_texture_float) {
*params = img->TexFormat->IntensityBits ? img->TexFormat->DataType : GL_NONE; *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_INTENSITY_SIZE) ?
_mesa_get_format_datatype(texFormat) : GL_NONE;
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
@ -923,7 +932,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
break; break;
case GL_TEXTURE_DEPTH_TYPE_ARB: case GL_TEXTURE_DEPTH_TYPE_ARB:
if (ctx->Extensions.ARB_texture_float) { if (ctx->Extensions.ARB_texture_float) {
*params = img->TexFormat->DepthBits ? img->TexFormat->DataType : GL_NONE; *params = _mesa_get_format_bits(texFormat, GL_TEXTURE_DEPTH_SIZE) ?
_mesa_get_format_datatype(texFormat) : GL_NONE;
} }
else { else {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,