OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify extension string handling.

Browse Source
This commit is contained in:
Brian Paul
2003-07-03 02:15:06 +00:00
parent 9826ca3ef5
commit de4f460e20
5 changed files with 212 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/main/context.c
View File

@@ -1202,7 +1202,7 @@ init_attrib_groups( GLcontext *ctx )
ctx->MinMax.Min[ACOMP] = 1000; ctx->MinMax.Max[ACOMP] = -1000; ctx->MinMax.Min[ACOMP] = 1000; ctx->MinMax.Max[ACOMP] = -1000;
/* Extensions */ /* Extensions */
_mesa_extensions_ctr( ctx ); _mesa_init_extensions( ctx );
/* Lighting group */ /* Lighting group */
for (i=0;i<MAX_LIGHTS;i++) { for (i=0;i<MAX_LIGHTS;i++) {
@@ -1682,9 +1682,10 @@ static void add_debug_flags( const char *debug )
} }
/* /**
* Initialize a GLcontext struct. This includes allocating all the * Initialize a GLcontext struct. This includes allocating all the
* other structs and arrays which hang off of the context by pointers. * other structs and arrays which hang off of the context by pointers.
* \note the direct parameter is ignored (obsolete).
*/ */
GLboolean GLboolean
_mesa_initialize_context( GLcontext *ctx, _mesa_initialize_context( GLcontext *ctx,
@@ -1923,12 +1924,12 @@ _mesa_initialize_context( GLcontext *ctx,
/* /**
* Allocate and initialize a GLcontext structure. * Allocate and initialize a GLcontext structure.
* Input: visual - a GLvisual pointer (we copy the struct contents) * Input: visual - a GLvisual pointer (we copy the struct contents)
* sharelist - another context to share display lists with or NULL * sharelist - another context to share display lists with or NULL
* driver_ctx - pointer to device driver's context state struct * driver_ctx - pointer to device driver's context state struct
* direct - direct rendering? * direct - obsolete, ignored
* Return: pointer to a new __GLcontextRec or NULL if error. * Return: pointer to a new __GLcontextRec or NULL if error.
*/ */
GLcontext * GLcontext *
@@ -2078,7 +2079,8 @@ _mesa_free_context_data( GLcontext *ctx )
_math_matrix_dtr(&ctx->Viewport._WindowMap); _math_matrix_dtr(&ctx->Viewport._WindowMap);
_mesa_extensions_dtr(ctx); if (ctx->Extensions.String)
FREE((void *) ctx->Extensions.String);
FREE(ctx->Exec); FREE(ctx->Exec);
FREE(ctx->Save); FREE(ctx->Save);

465
src/mesa/main/extensions.c
View File

@@ -30,20 +30,11 @@
#include "mtypes.h" #include "mtypes.h"
#define MAX_EXT_NAMELEN 80
struct extension {
struct extension *next, *prev;
GLint enabled;
GLboolean *flag; /* optional flag stored elsewhere */
char name[MAX_EXT_NAMELEN+1];
void (*notify)( GLcontext *, GLboolean );
};
#define F(x) (int)&(((struct gl_extensions *)0)->x) #define F(x) (int)&(((struct gl_extensions *)0)->x)
#define ON GL_TRUE #define ON GL_TRUE
#define OFF GL_FALSE #define OFF GL_FALSE
static const struct { static const struct {
GLboolean enabled; GLboolean enabled;
const char *name; const char *name;
@@ -121,7 +112,7 @@ static const struct {
{ OFF, "GL_IBM_texture_mirrored_repeat", F(ARB_texture_mirrored_repeat)}, { OFF, "GL_IBM_texture_mirrored_repeat", F(ARB_texture_mirrored_repeat)},
{ OFF, "GL_INGR_blend_func_separate", F(EXT_blend_func_separate) }, { OFF, "GL_INGR_blend_func_separate", F(EXT_blend_func_separate) },
{ OFF, "GL_MESA_pack_invert", F(MESA_pack_invert) }, { OFF, "GL_MESA_pack_invert", F(MESA_pack_invert) },
{ OFF, "GL_MESA_packed_depth_stencil", 0 }, { OFF, "GL_MESA_packed_depth_stencil", F(MESA_packed_depth_stencil) },
{ OFF, "GL_MESA_resize_buffers", F(MESA_resize_buffers) }, { OFF, "GL_MESA_resize_buffers", F(MESA_resize_buffers) },
{ OFF, "GL_MESA_ycbcr_texture", F(MESA_ycbcr_texture) }, { OFF, "GL_MESA_ycbcr_texture", F(MESA_ycbcr_texture) },
{ ON, "GL_MESA_window_pos", F(ARB_window_pos) }, { ON, "GL_MESA_window_pos", F(ARB_window_pos) },
@@ -149,352 +140,286 @@ static const struct {
/**
/*
* Enable all extensions suitable for a software-only renderer. * Enable all extensions suitable for a software-only renderer.
* This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc. * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.
*/ */
void void
_mesa_enable_sw_extensions(GLcontext *ctx) _mesa_enable_sw_extensions(GLcontext *ctx)
{ {
const char *extensions[] = { ctx->Extensions.ARB_depth_texture = GL_TRUE;
"GL_ARB_depth_texture",
#if FEATURE_ARB_fragment_program #if FEATURE_ARB_fragment_program
"GL_ARB_fragment_program", /*ctx->Extensions.ARB_fragment_program = GL_TRUE;*/
#endif #endif
"GL_ARB_imaging", ctx->Extensions.ARB_imaging = GL_TRUE;
"GL_ARB_multitexture", ctx->Extensions.ARB_multitexture = GL_TRUE;
#if FEATURE_ARB_occlusion_query #if FEATURE_ARB_occlusion_query
"GL_ARB_occlusion_query", ctx->Extensions.ARB_occlusion_query = GL_TRUE;
#endif #endif
"GL_ARB_point_parameters", ctx->Extensions.ARB_shadow = GL_TRUE;
"GL_ARB_shadow", ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
"GL_ARB_shadow_ambient", ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
"GL_ARB_texture_border_clamp", ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
"GL_ARB_texture_cube_map", ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
"GL_ARB_texture_env_add", ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
"GL_ARB_texture_env_combine", ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
"GL_ARB_texture_env_crossbar",
"GL_ARB_texture_env_dot3",
"GL_ARB_texture_mirrored_repeat",
#if FEATURE_ARB_vertex_program #if FEATURE_ARB_vertex_program
"GL_ARB_vertex_program", /*ctx->Extensions.ARB_vertex_program = GL_TRUE;*/
#endif #endif
"GL_ATI_texture_env_combine3", ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
"GL_ATI_texture_mirror_once", ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
"GL_EXT_blend_color", ctx->Extensions.EXT_blend_color = GL_TRUE;
"GL_EXT_blend_func_separate", ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
"GL_EXT_blend_logic_op", ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
"GL_EXT_blend_minmax", ctx->Extensions.EXT_blend_minmax = GL_TRUE;
"GL_EXT_blend_subtract", ctx->Extensions.EXT_blend_subtract = GL_TRUE;
"GL_EXT_convolution", ctx->Extensions.EXT_convolution = GL_TRUE;
"GL_EXT_depth_bounds_test", ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;
"GL_EXT_fog_coord", ctx->Extensions.EXT_fog_coord = GL_TRUE;
"GL_EXT_histogram", ctx->Extensions.EXT_histogram = GL_TRUE;
"GL_EXT_paletted_texture", ctx->Extensions.EXT_paletted_texture = GL_TRUE;
"GL_EXT_point_parameters", ctx->Extensions.EXT_point_parameters = GL_TRUE;
"GL_EXT_shadow_funcs", ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
"GL_EXT_secondary_color", ctx->Extensions.EXT_secondary_color = GL_TRUE;
"GL_EXT_shared_texture_palette", ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
"GL_EXT_stencil_wrap", ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
"GL_EXT_stencil_two_side", ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
"GL_EXT_texture_edge_clamp", ctx->Extensions.EXT_texture_env_add = GL_TRUE;
"GL_EXT_texture_env_add", ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
"GL_EXT_texture_env_combine", ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
"GL_EXT_texture_env_dot3", ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
"GL_EXT_texture_lod_bias", ctx->Extensions.HP_occlusion_test = GL_TRUE;
"GL_EXT_texture_rectangle", ctx->Extensions.MESA_pack_invert = GL_TRUE;
"GL_HP_occlusion_test", ctx->Extensions.MESA_resize_buffers = GL_TRUE;
"GL_IBM_texture_mirrored_repeat", ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
"GL_INGR_blend_func_separate", ctx->Extensions.NV_blend_square = GL_TRUE;
"GL_MESA_pack_invert", /*ctx->Extensions.NV_light_max_exponent = GL_TRUE;*/
"GL_MESA_resize_buffers", ctx->Extensions.NV_point_sprite = GL_TRUE;
"GL_MESA_ycbcr_texture", ctx->Extensions.NV_texture_rectangle = GL_TRUE;
"GL_NV_blend_square", /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/
"GL_NV_light_max_exponent",
"GL_NV_point_sprite",
"GL_NV_texture_rectangle",
"GL_NV_texgen_reflection",
#if FEATURE_NV_vertex_program #if FEATURE_NV_vertex_program
"GL_NV_vertex_program", ctx->Extensions.NV_vertex_program = GL_TRUE;
"GL_NV_vertex_program1_1", ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
#endif #endif
#if FEATURE_NV_fragment_program #if FEATURE_NV_fragment_program
"GL_NV_fragment_program", ctx->Extensions.NV_fragment_program = GL_TRUE;
#endif #endif
"GL_SGI_color_matrix", ctx->Extensions.SGI_color_matrix = GL_TRUE;
"GL_SGI_color_table", ctx->Extensions.SGI_color_table = GL_TRUE;
"GL_SGI_texture_color_table", ctx->Extensions.SGI_texture_color_table = GL_TRUE;
"GL_SGIS_generate_mipmap", ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
"GL_SGIS_pixel_texture", ctx->Extensions.SGIS_pixel_texture = GL_TRUE;
"GL_SGIS_texture_edge_clamp", ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
"GL_SGIS_texture_border_clamp", ctx->Extensions.SGIX_depth_texture = GL_TRUE;
"GL_SGIX_depth_texture", ctx->Extensions.SGIX_pixel_texture = GL_TRUE;
"GL_SGIX_pixel_texture", ctx->Extensions.SGIX_shadow = GL_TRUE;
"GL_SGIX_shadow", ctx->Extensions.SGIX_shadow_ambient = GL_TRUE;
"GL_SGIX_shadow_ambient",
NULL
};
GLuint i;
for (i = 0; extensions[i]; i++) {
_mesa_enable_extension(ctx, extensions[i]);
}
} }
/* /**
* Enable GL_ARB_imaging and all the EXT extensions that are subsets of it. * Enable GL_ARB_imaging and all the EXT extensions that are subsets of it.
*/ */
void void
_mesa_enable_imaging_extensions(GLcontext *ctx) _mesa_enable_imaging_extensions(GLcontext *ctx)
{ {
const char *extensions[] = { ctx->Extensions.ARB_imaging = GL_TRUE;
"GL_ARB_imaging", ctx->Extensions.EXT_blend_color = GL_TRUE;
"GL_EXT_blend_color", ctx->Extensions.EXT_blend_minmax = GL_TRUE;
"GL_EXT_blend_minmax", ctx->Extensions.EXT_blend_subtract = GL_TRUE;
"GL_EXT_blend_subtract", ctx->Extensions.EXT_convolution = GL_TRUE;
"GL_EXT_convolution", ctx->Extensions.EXT_histogram = GL_TRUE;
"GL_EXT_histogram", ctx->Extensions.SGI_color_matrix = GL_TRUE;
"GL_SGI_color_matrix", ctx->Extensions.SGI_color_table = GL_TRUE;
"GL_SGI_color_table",
NULL
};
GLuint i;
for (i = 0; extensions[i]; i++) {
_mesa_enable_extension(ctx, extensions[i]);
}
} }
/* /**
* Enable all OpenGL 1.3 features and extensions. * Enable all OpenGL 1.3 features and extensions.
* A convenience function to be called by drivers.
*/ */
void void
_mesa_enable_1_3_extensions(GLcontext *ctx) _mesa_enable_1_3_extensions(GLcontext *ctx)
{ {
const char *extensions[] = { ctx->Extensions.ARB_multisample = GL_TRUE;
"GL_ARB_multisample", ctx->Extensions.ARB_multitexture = GL_TRUE;
"GL_ARB_multitexture", ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
"GL_ARB_texture_border_clamp", ctx->Extensions.ARB_texture_compression = GL_TRUE;
"GL_ARB_texture_compression", ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
"GL_ARB_texture_cube_map", ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
"GL_ARB_texture_env_add", ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
"GL_ARB_texture_env_combine", ctx->Extensions.EXT_texture_env_add = GL_TRUE;
"GL_ARB_texture_env_dot3", /*ctx->Extensions.ARB_transpose_matrix = GL_TRUE;*/
"GL_ARB_transpose_matrix",
NULL
};
GLuint i;
for (i = 0; extensions[i]; i++) {
_mesa_enable_extension(ctx, extensions[i]);
}
} }
/* /**
* Enable all OpenGL 1.4 features and extensions. * Enable all OpenGL 1.4 features and extensions.
* A convenience function to be called by drivers.
*/ */
void void
_mesa_enable_1_4_extensions(GLcontext *ctx) _mesa_enable_1_4_extensions(GLcontext *ctx)
{ {
const char *extensions[] = { ctx->Extensions.ARB_depth_texture = GL_TRUE;
"GL_ARB_depth_texture", ctx->Extensions.ARB_shadow = GL_TRUE;
"GL_ARB_point_parameters", ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
"GL_ARB_shadow", ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
"GL_ARB_texture_env_crossbar", ctx->Extensions.ARB_window_pos = GL_TRUE;
"GL_ARB_texture_mirrored_repeat", ctx->Extensions.EXT_blend_color = GL_TRUE;
"GL_ARB_window_pos", ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
"GL_EXT_blend_color", ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
"GL_EXT_blend_func_separate", ctx->Extensions.EXT_blend_minmax = GL_TRUE;
"GL_EXT_blend_logic_op", ctx->Extensions.EXT_blend_subtract = GL_TRUE;
"GL_EXT_blend_minmax", ctx->Extensions.EXT_fog_coord = GL_TRUE;
"GL_EXT_blend_subtract", ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
"GL_EXT_fog_coord", ctx->Extensions.EXT_point_parameters = GL_TRUE;
"GL_EXT_multi_draw_arrays", ctx->Extensions.EXT_secondary_color = GL_TRUE;
"GL_EXT_secondary_color", ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
"GL_EXT_stencil_wrap", ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
"GL_SGIS_generate_mipmap",
NULL
};
GLuint i;
for (i = 0; extensions[i]; i++) {
_mesa_enable_extension(ctx, extensions[i]);
}
} }
/**
/* * Enable all OpenGL 1.5 features and extensions.
* Add a new extenstion. This would be called from a Mesa driver. * A convenience function to be called by drivers.
* XXX TENTATIVE!!!
*/ */
void void
_mesa_add_extension( GLcontext *ctx, _mesa_enable_1_5_extensions(GLcontext *ctx)
GLboolean enabled,
const char *name,
GLboolean *flag_ptr )
{ {
/* We should never try to add an extension after ctx->Extensions.ARB_occlusion_query = GL_TRUE;
* _mesa_extensions_get_string() has been called! ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
*/
assert(ctx->Extensions.ext_string == 0);
{
struct extension *t = MALLOC_STRUCT(extension);
t->enabled = enabled;
_mesa_strncpy(t->name, name, MAX_EXT_NAMELEN);
t->name[MAX_EXT_NAMELEN] = 0;
t->flag = flag_ptr;
if (t->flag)
*t->flag = enabled;
insert_at_tail( ctx->Extensions.ext_list, t );
}
} }
/* /**
* Either enable or disable the named extension. * Either enable or disable the named extension.
*/ */
static void static void
set_extension( GLcontext *ctx, const char *name, GLint state ) set_extension( GLcontext *ctx, const char *name, GLboolean state )
{ {
/* XXX we should assert that ext_string is null. We should never be GLboolean *base = (GLboolean *) &ctx->Extensions;
* enabling/disabling extensions after _mesa_extensions_get_string() GLuint i;
* has been called!
*/
struct extension *i;
foreach( i, ctx->Extensions.ext_list )
if (_mesa_strncmp(i->name, name, MAX_EXT_NAMELEN) == 0)
break;
if (i == ctx->Extensions.ext_list) { if (ctx->Extensions.String) {
/* this is an error. Drivers should never try to enable/disable /* The string was already queried - can't change it now! */
* an extension which is unknown to Mesa or wasn't added by calling _mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);
* _mesa_add_extension().
*/
return; return;
} }
if (i->flag) for (i = 0 ; i < Elements(default_extensions) ; i++) {
*(i->flag) = state; if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
i->enabled = state; if (default_extensions[i].flag_offset) {
GLboolean *enabled = base + default_extensions[i].flag_offset;
*enabled = state;
}
return;
}
}
_mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
} }
/**
* Enable the named extension.
* Typically called by drivers.
*/
void void
_mesa_enable_extension( GLcontext *ctx, const char *name ) _mesa_enable_extension( GLcontext *ctx, const char *name )
{ {
if (ctx->Extensions.ext_string == 0) set_extension(ctx, name, GL_TRUE);
set_extension( ctx, name, 1 );
} }
/**
* Disable the named extension.
* XXX is this really needed???
*/
void void
_mesa_disable_extension( GLcontext *ctx, const char *name ) _mesa_disable_extension( GLcontext *ctx, const char *name )
{ {
if (ctx->Extensions.ext_string == 0) set_extension(ctx, name, GL_FALSE);
set_extension( ctx, name, 0 );
} }
/* /**
* Test if the named extension is enabled in this context. * Test if the named extension is enabled in this context.
*/ */
GLboolean GLboolean
_mesa_extension_is_enabled( GLcontext *ctx, const char *name) _mesa_extension_is_enabled( GLcontext *ctx, const char *name )
{
struct extension *i;
foreach( i, ctx->Extensions.ext_list )
if (_mesa_strncmp(i->name, name, MAX_EXT_NAMELEN) == 0) {
if (i->enabled)
return GL_TRUE;
else
return GL_FALSE;
}
return GL_FALSE;
}
void
_mesa_extensions_dtr( GLcontext *ctx )
{
struct extension *i, *nexti;
if (ctx->Extensions.ext_string) {
FREE( ctx->Extensions.ext_string );
ctx->Extensions.ext_string = 0;
}
if (ctx->Extensions.ext_list) {
foreach_s( i, nexti, ctx->Extensions.ext_list ) {
remove_from_list( i );
FREE( i );
}
FREE(ctx->Extensions.ext_list);
ctx->Extensions.ext_list = 0;
}
}
void
_mesa_extensions_ctr( GLcontext *ctx )
{ {
const GLboolean *base = (const GLboolean *) &ctx->Extensions;
GLuint i; GLuint i;
GLboolean *base = (GLboolean *)&ctx->Extensions;
ctx->Extensions.ext_string = NULL;
ctx->Extensions.ext_list = MALLOC_STRUCT(extension);
make_empty_list( ctx->Extensions.ext_list );
for (i = 0 ; i < Elements(default_extensions) ; i++) { for (i = 0 ; i < Elements(default_extensions) ; i++) {
GLboolean *ptr = NULL; if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
if (!default_extensions[i].flag_offset)
if (default_extensions[i].flag_offset) return GL_TRUE;
ptr = base + default_extensions[i].flag_offset; return *(base + default_extensions[i].flag_offset);
(void) _mesa_add_extension( ctx,
default_extensions[i].enabled,
default_extensions[i].name,
ptr);
} }
}
return GL_FALSE;
} }
const char * /**
_mesa_extensions_get_string( GLcontext *ctx ) * Run through the default_extensions array above and set the
* ctx->Extensions.ARB/EXT_* flags accordingly.
* To be called during context initialization.
*/
void
_mesa_init_extensions( GLcontext *ctx )
{ {
if (ctx->Extensions.ext_string == 0) GLboolean *base = (GLboolean *) &ctx->Extensions;
{ GLuint i;
struct extension *i;
char *str;
GLuint len = 0;
foreach (i, ctx->Extensions.ext_list)
if (i->enabled)
len += _mesa_strlen(i->name) + 1;
if (len == 0) for (i = 0 ; i < Elements(default_extensions) ; i++) {
return ""; if (default_extensions[i].enabled &&
default_extensions[i].flag_offset) {
str = (char *) _mesa_malloc(len * sizeof(char)); *(base + default_extensions[i].flag_offset) = GL_TRUE;
ctx->Extensions.ext_string = str;
foreach (i, ctx->Extensions.ext_list)
if (i->enabled) {
_mesa_strcpy(str, i->name);
str += _mesa_strlen(str);
*str++ = ' ';
} }
*(str-1) = 0;
} }
}
return ctx->Extensions.ext_string;
/**
* Construct the GL_EXTENSIONS string. Called the first time that
* glGetString(GL_EXTENSIONS) is called.
*/
GLubyte *
_mesa_make_extension_string( GLcontext *ctx )
{
const GLboolean *base = (const GLboolean *) &ctx->Extensions;
GLuint extStrLen = 0;
GLubyte *s;
GLuint i;
/* first, compute length of the extension string */
for (i = 0 ; i < Elements(default_extensions) ; i++) {
if (!default_extensions[i].flag_offset ||
*(base + default_extensions[i].flag_offset)) {
extStrLen += _mesa_strlen(default_extensions[i].name) + 1;
}
}
s = _mesa_malloc(extStrLen);
/* second, build the extension string */
extStrLen = 0;
for (i = 0 ; i < Elements(default_extensions) ; i++) {
if (!default_extensions[i].flag_offset ||
*(base + default_extensions[i].flag_offset)) {
GLuint len = _mesa_strlen(default_extensions[i].name);
_mesa_memcpy(s + extStrLen, default_extensions[i].name, len);
extStrLen += len;
s[extStrLen] = (GLubyte) ' ';
extStrLen++;
}
}
ASSERT(extStrLen > 0);
s[extStrLen - 1] = 0;
return s;
} }

20
src/mesa/main/extensions.h
View File

@@ -1,9 +1,8 @@
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 4.1 * Version: 5.1
* *
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -38,19 +37,16 @@ extern void _mesa_enable_1_3_extensions(GLcontext *ctx);
extern void _mesa_enable_1_4_extensions(GLcontext *ctx); extern void _mesa_enable_1_4_extensions(GLcontext *ctx);
extern void _mesa_add_extension( GLcontext *ctx, GLboolean enabled, extern void _mesa_enable_1_5_extensions(GLcontext *ctx);
const char *name, GLboolean *flag_ptr );
extern void _mesa_enable_extension( GLcontext *ctx, const char *name ); extern void _mesa_enable_extension(GLcontext *ctx, const char *name);
extern void _mesa_disable_extension( GLcontext *ctx, const char *name ); extern void _mesa_disable_extension(GLcontext *ctx, const char *name);
extern GLboolean _mesa_extension_is_enabled( GLcontext *ctx, const char *name); extern GLboolean _mesa_extension_is_enabled(GLcontext *ctx, const char *name);
extern void _mesa_extensions_dtr( GLcontext *ctx ); extern void _mesa_init_extensions(GLcontext *ctx);
extern void _mesa_extensions_ctr( GLcontext *ctx ); extern GLubyte *_mesa_make_extension_string(GLcontext *ctx);
extern const char *_mesa_extensions_get_string( GLcontext *ctx );
#endif #endif

4
src/mesa/main/get.c
View File

@@ -6243,7 +6243,9 @@ _mesa_GetString( GLenum name )
return (const GLubyte *) version_1_2; return (const GLubyte *) version_1_2;
} }
case GL_EXTENSIONS: case GL_EXTENSIONS:
return (const GLubyte *) _mesa_extensions_get_string(ctx); if (!ctx->Extensions.String)
ctx->Extensions.String = _mesa_make_extension_string(ctx);
return (const GLubyte *) ctx->Extensions.String;
#if FEATURE_NV_fragment_program #if FEATURE_NV_fragment_program
case GL_PROGRAM_ERROR_STRING_NV: case GL_PROGRAM_ERROR_STRING_NV:
if (ctx->Extensions.NV_fragment_program) { if (ctx->Extensions.NV_fragment_program) {

10
src/mesa/main/mtypes.h
View File

@@ -878,7 +878,7 @@ struct gl_texture_image {
GLfloat DepthScale; /* used for mipmap lod computation */ GLfloat DepthScale; /* used for mipmap lod computation */
GLvoid *Data; /* Image data, accessed via FetchTexel() */ GLvoid *Data; /* Image data, accessed via FetchTexel() */
GLboolean IsClientData; /* Data owned by client? */ GLboolean IsClientData; /* Data owned by client? */
GLboolean _IsPowerOfTwo; /* Are all dimensions powers of two? */
const struct gl_texture_format *TexFormat; const struct gl_texture_format *TexFormat;
@@ -920,6 +920,7 @@ struct gl_texture_object {
GLint _MaxLevel; /* actual max mipmap level (q in the spec) */ GLint _MaxLevel; /* actual max mipmap level (q in the spec) */
GLfloat _MaxLambda; /* = _MaxLevel - BaseLevel (q - b in spec) */ GLfloat _MaxLambda; /* = _MaxLevel - BaseLevel (q - b in spec) */
GLboolean GenerateMipmap; /* GL_SGIS_generate_mipmap */ GLboolean GenerateMipmap; /* GL_SGIS_generate_mipmap */
GLboolean _IsPowerOfTwo; /* Are all image dimensions powers of two? */
struct gl_texture_image *Image[MAX_TEXTURE_LEVELS]; struct gl_texture_image *Image[MAX_TEXTURE_LEVELS];
@@ -1449,13 +1450,11 @@ struct gl_constants {
/* /*
* List of extensions. * List of extensions.
*/ */
struct extension;
struct gl_extensions { struct gl_extensions {
char *ext_string;
struct extension *ext_list;
/* Flags to quickly test if certain extensions are available. /* Flags to quickly test if certain extensions are available.
* Not every extension needs to have such a flag, but it's encouraged. * Not every extension needs to have such a flag, but it's encouraged.
*/ */
GLboolean dummy; /* don't remove this! */
GLboolean ARB_depth_texture; GLboolean ARB_depth_texture;
GLboolean ARB_fragment_program; GLboolean ARB_fragment_program;
GLboolean ARB_imaging; GLboolean ARB_imaging;
@@ -1504,6 +1503,7 @@ struct gl_extensions {
GLboolean HP_occlusion_test; GLboolean HP_occlusion_test;
GLboolean IBM_rasterpos_clip; GLboolean IBM_rasterpos_clip;
GLboolean MESA_pack_invert; GLboolean MESA_pack_invert;
GLboolean MESA_packed_depth_stencil;
GLboolean MESA_resize_buffers; GLboolean MESA_resize_buffers;
GLboolean MESA_ycbcr_texture; GLboolean MESA_ycbcr_texture;
GLboolean NV_blend_square; GLboolean NV_blend_square;
@@ -1524,6 +1524,8 @@ struct gl_extensions {
GLboolean SGIX_shadow_ambient; /* or GL_ARB_shadow_ambient */ GLboolean SGIX_shadow_ambient; /* or GL_ARB_shadow_ambient */
GLboolean TDFX_texture_compression_FXT1; GLboolean TDFX_texture_compression_FXT1;
GLboolean APPLE_client_storage; GLboolean APPLE_client_storage;
/* The extension string */
const GLubyte *String;
}; };