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

intel: Fix up some extension string issues

Browse source 
Move the remaining extension string enables to intel_extensions.c.
Make sure that GL_NV_texture_env_combine4 is not enabled on i830.
This commit is contained in:
Ian Romanick 2009-01-27 23:44:18 -08:00 • committed by Ian Romanick
parent d485ee54dd
commit 425c803c03
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/drivers/dri/i915/i915_context.c
View file

@ -50,16 +50,6 @@
* Mesa's Driver Functions
***************************************/
static const struct dri_extension i915_extensions[] = {
{"GL_ARB_depth_texture", NULL},
{"GL_ARB_fragment_program", NULL},
{"GL_ARB_shadow", NULL},
{"GL_ARB_texture_non_power_of_two", NULL},
{"GL_ATI_texture_env_combine3", NULL},
{"GL_EXT_shadow_funcs", NULL},
{NULL, NULL}
};
/* Override intel default.
*/
static void
@ -174,9 +164,6 @@ i915CreateContext(const __GLcontextModes * mesaVis,
ctx->Const.MaxDrawBuffers = 1;
driInitExtensions(ctx, i915_extensions, GL_FALSE);
_tnl_init_vertices(ctx, ctx->Const.MaxArrayLockSize + 12,
36 * sizeof(GLfloat));

19
src/mesa/drivers/dri/intel/intel_extensions.c
View file

@ -98,7 +98,6 @@ static const struct dri_extension card_extensions[] = {
{ "GL_MESA_ycbcr_texture", NULL },
{ "GL_NV_blend_square", NULL },
{ "GL_NV_point_sprite", GL_NV_point_sprite_functions },
{ "GL_NV_texture_env_combine4", NULL },
{ "GL_NV_vertex_program", GL_NV_vertex_program_functions },
{ "GL_NV_vertex_program1_1", NULL },
{ "GL_SGIS_generate_mipmap", NULL },
@ -106,6 +105,19 @@ static const struct dri_extension card_extensions[] = {
};
/** i915 / i945-only extensions */
static const struct dri_extension i915_extensions[] = {
{ "GL_ARB_depth_texture", NULL },
{ "GL_ARB_fragment_program", NULL },
{ "GL_ARB_shadow", NULL },
{ "GL_ARB_texture_non_power_of_two", NULL },
{ "GL_ATI_texture_env_combine3", NULL },
{ "GL_EXT_shadow_funcs", NULL },
{ "GL_NV_texture_env_combine4", NULL },
{ NULL, NULL }
};
/** i965-only extensions */
static const struct dri_extension brw_extensions[] = {
{ "GL_ARB_depth_texture", NULL },
@ -132,6 +144,7 @@ static const struct dri_extension brw_extensions[] = {
{ "GL_EXT_vertex_array_bgra", NULL },
{ "GL_ATI_separate_stencil", GL_ATI_separate_stencil_functions },
{ "GL_ATI_texture_env_combine3", NULL },
{ "GL_NV_texture_env_combine4", NULL },
{ NULL, NULL }
};
@ -169,4 +182,8 @@ intelInitExtensions(GLcontext *ctx, GLboolean enable_imaging)
if (intel == NULL || IS_965(intel->intelScreen->deviceID))
driInitExtensions(ctx, brw_extensions, GL_FALSE);
if (intel == NULL || IS_915(intel->intelScreen->deviceID)
|| IS_945(intel->intelScreen->deviceID))
driInitExtensions(ctx, i915_extensions, GL_FALSE);
}