diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-08 15:28:45 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-08 15:28:45 +0000 |
| commit | 4618a9bfc2cd57c47ddf3590782c751ec194d362 (patch) | |
| tree | d3c67875641645d05620b4c942cd551078aa06c1 | |
| parent | f36954ec3c25b673fc275877938e2dea48ec5682 (diff) | |
check for either GL_ARB_depth_texture or GL_SGIX_depth_texture in a few places
| -rw-r--r-- | src/mesa/main/texformat.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/texstate.c | 8 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index 3cbc7c88f8..878a10bb7c 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.1 + * Version: 6.5 * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -1185,7 +1185,8 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat, ; /* fallthrough */ } - if (ctx->Extensions.SGIX_depth_texture) { + if (ctx->Extensions.SGIX_depth_texture || + ctx->Extensions.ARB_depth_texture) { switch (internalFormat) { case GL_DEPTH_COMPONENT: case GL_DEPTH_COMPONENT24_SGIX: diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index b5d2d266b0..d4d023acda 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3 + * Version: 6.5 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * @@ -242,7 +242,8 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat ) } } - if (ctx->Extensions.SGIX_depth_texture) { + if (ctx->Extensions.SGIX_depth_texture || + ctx->Extensions.ARB_depth_texture) { switch (internalFormat) { case GL_DEPTH_COMPONENT: case GL_DEPTH_COMPONENT16_SGIX: @@ -1982,7 +1983,8 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format, _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)"); } - if (!ctx->Extensions.SGIX_depth_texture && is_depth_format(format)) { + if (!ctx->Extensions.SGIX_depth_texture && + !ctx->Extensions.ARB_depth_texture && is_depth_format(format)) { _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)"); } diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 1fe11425b4..cf17a6b1e7 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3 + * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * @@ -1771,10 +1771,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level, *params = 0; return; case GL_DEPTH_BITS: - /* XXX this isn't in the GL_SGIX_depth_texture spec - * but seems appropriate. - */ - if (ctx->Extensions.SGIX_depth_texture) + if (ctx->Extensions.SGIX_depth_texture || + ctx->Extensions.ARB_depth_texture) *params = img->TexFormat->DepthBits; else _mesa_error(ctx, GL_INVALID_ENUM, |