diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-01-07 00:48:24 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-01-07 00:48:24 +0000 |
| commit | 7e3379b1a0f1837e432323f60885e5c8e38c2699 (patch) | |
| tree | 4c70edc0f036749665c4b0676a0ca1934802780c /src/mesa/drivers/dri/i915/intel_context.c | |
| parent | 71fc6a3fc9177efa335e5c09867faf0bde6584a2 (diff) | |
Revert some accidental cross-merge changes. Remove i915GetString. Migrate
a couple extensions that appeared in both device-specific card_extensions
strings to the shared one.
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index ba155d53ec..97e8933c21 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -125,9 +125,16 @@ static void intelBufferSize(GLframebuffer *buffer, UNLOCK_HARDWARE(intel); } + +/** + * Extension strings exported by the intel driver. + * + * \note + * It appears that ARB_texture_env_crossbar has "disappeared" compared to the + * old i830-specific driver. + */ static const char * const card_extensions[] = { - "GL_APPLE_client_storage", "GL_ARB_multisample", "GL_ARB_multitexture", "GL_ARB_point_parameters", @@ -149,27 +156,24 @@ static const char * const card_extensions[] = "GL_EXT_blend_func_separate", "GL_EXT_blend_minmax", "GL_EXT_blend_subtract", + "GL_EXT_cull_vertex", /* New: alanh 06-Jan-2005 */ "GL_EXT_fog_coord", "GL_EXT_multi_draw_arrays", "GL_EXT_secondary_color", "GL_EXT_stencil_wrap", "GL_EXT_texture_edge_clamp", - "GL_EXT_texture_env_add", "GL_EXT_texture_env_combine", "GL_EXT_texture_env_dot3", "GL_EXT_texture_filter_anisotropic", "GL_EXT_texture_lod_bias", "GL_3DFX_texture_compression_FXT1", - "GL_IBM_texture_mirrored_repeat", - "GL_INGR_blend_func_separate", + "GL_APPLE_client_storage", "GL_MESA_pack_invert", "GL_MESA_ycbcr_texture", - "GL_NV_texture_rectangle", + "GL_NV_blend_square", "GL_NV_vertex_program", "GL_NV_vertex_program1_1", "GL_SGIS_generate_mipmap", - "GL_SGIS_texture_border_clamp", - "GL_SGIS_texture_edge_clamp", NULL }; |