OpenGL 1.3 support

This commit is contained in:
Brian Paul 2001-08-28 22:46:22 +00:00
parent afe4f5e6c1
commit 2a88946f9a
4 changed files with 1176 additions and 826 deletions

View file

@ -1,4 +1,4 @@
/* $Id: osmesa.c,v 1.63 2001/07/14 17:53:04 brianp Exp $ */
/* $Id: osmesa.c,v 1.64 2001/08/28 22:46:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -306,6 +306,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
}
_mesa_enable_sw_extensions(&(osmesa->gl_ctx));
_mesa_enable_1_3_extensions(&(osmesa->gl_ctx));
osmesa->gl_buffer = _mesa_create_framebuffer( osmesa->gl_visual,
osmesa->gl_visual->depthBits > 0,

View file

@ -1,4 +1,4 @@
/* $Id: xm_api.c,v 1.25 2001/06/15 14:18:46 brianp Exp $ */
/* $Id: xm_api.c,v 1.26 2001/08/28 22:46:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -1636,7 +1636,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
}
_mesa_enable_sw_extensions(ctx);
_mesa_enable_extension(ctx, "GL_ARB_texture_compression");
_mesa_enable_1_3_extensions(ctx);
ctx->Driver.BaseCompressedTexFormat = _mesa_base_compressed_texformat;
ctx->Driver.CompressedTextureSize = _mesa_compressed_texture_size;
ctx->Driver.GetCompressedTexImage = _mesa_get_compressed_teximage;
@ -2506,7 +2506,7 @@ const char *XMesaGetString( XMesaContext c, int name )
{
(void) c;
if (name==XMESA_VERSION) {
return "3.1";
return "3.5";
}
else if (name==XMESA_EXTENSIONS) {
return "";

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
/* $Id: get.c,v 1.66 2001/08/20 16:42:40 brianp Exp $ */
/* $Id: get.c,v 1.67 2001/08/28 22:46:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -5310,7 +5310,8 @@ _mesa_GetString( GLenum name )
GET_CURRENT_CONTEXT(ctx);
static const char *vendor = "Brian Paul";
static const char *renderer = "Mesa";
static const char *version = "1.2 Mesa 3.5.1";
static const char *version_1_2 = "1.2 Mesa 3.5.1";
static const char *version_1_3 = "1.3 Mesa 3.5.1";
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
@ -5327,7 +5328,16 @@ _mesa_GetString( GLenum name )
case GL_RENDERER:
return (const GLubyte *) renderer;
case GL_VERSION:
return (const GLubyte *) version;
if (ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_multisample &&
ctx->Extensions.ARB_texture_border_clamp &&
ctx->Extensions.ARB_texture_compression &&
ctx->Extensions.EXT_texture_env_add &&
ctx->Extensions.ARB_texture_env_combine &&
ctx->Extensions.ARB_texture_env_dot3)
return (const GLubyte *) version_1_3;
else
return (const GLubyte *) version_1_2;
case GL_EXTENSIONS:
return (const GLubyte *) _mesa_extensions_get_string(ctx);
default: