diff options
| author | Brian Paul <[email protected]> | 2000-05-23 15:17:12 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-05-23 15:17:12 +0000 |
| commit | fc4b44399a07a7a7559f20ceab8a791209b4d875 (patch) | |
| tree | 1b3e06659b40d45fc3c516cbb449434552fdb7a7 /src/mesa/main/get.c | |
| parent | df54463363729a25a7c11739d3b09f5a1e3083ef (diff) | |
more work on GL_ARB_texture_cube_map
Diffstat (limited to 'src/mesa/main/get.c')
| -rw-r--r-- | src/mesa/main/get.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index e6e4a59717c..8302b3459ee 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1,4 +1,4 @@ -/* $Id: get.c,v 1.26 2000/05/22 16:33:21 brianp Exp $ */ +/* $Id: get.c,v 1.27 2000/05/23 15:17:13 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -963,7 +963,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) return; case GL_TEXTURE_BINDING_CUBE_MAP_ARB: if (ctx->Extensions.HaveTextureCubeMap) - *params = INT_TO_BOOL(textureUnit->CurrentPosX->Name); + *params = INT_TO_BOOL(textureUnit->CurrentCubeMap->Name); else gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); return; @@ -2077,19 +2077,19 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) if (ctx->Extensions.HaveTextureCubeMap) *params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); return; case GL_TEXTURE_BINDING_CUBE_MAP_ARB: if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLdouble) textureUnit->CurrentPosX->Name; + *params = (GLdouble) textureUnit->CurrentCubeMap->Name; else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); return; case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: if (ctx->Extensions.HaveTextureCubeMap) *params = (GLdouble) ctx->Const.MaxCubeTextureSize; else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); return; /* GL_PGI_misc_hints */ @@ -3194,19 +3194,19 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) if (ctx->Extensions.HaveTextureCubeMap) *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); return; case GL_TEXTURE_BINDING_CUBE_MAP_ARB: if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLfloat) textureUnit->CurrentPosX->Name; + *params = (GLfloat) textureUnit->CurrentCubeMap->Name; else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); return; case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: if (ctx->Extensions.HaveTextureCubeMap) *params = (GLfloat) ctx->Const.MaxCubeTextureSize; else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); return; /* GL_PGI_misc_hints */ @@ -4285,19 +4285,19 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) if (ctx->Extensions.HaveTextureCubeMap) *params = (GLint) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); return; case GL_TEXTURE_BINDING_CUBE_MAP_ARB: if (ctx->Extensions.HaveTextureCubeMap) - *params = textureUnit->CurrentPosX->Name; + *params = textureUnit->CurrentCubeMap->Name; else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); return; case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: if (ctx->Extensions.HaveTextureCubeMap) *params = ctx->Const.MaxCubeTextureSize; else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); return; /* GL_PGI_misc_hints */ |