summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i915/i830_context.c1
-rw-r--r--src/mesa/drivers/dri/i915/i915_context.c77
-rw-r--r--src/mesa/drivers/dri/i915/intel_context.c18
3 files changed, 14 insertions, 82 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index 5c8e95aa4c..fa19e3104f 100644
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -41,7 +41,6 @@
static const char * const card_extensions[] =
{
"GL_ARB_texture_env_crossbar",
- "GL_NV_blend_square",
NULL
};
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 591100882f..fc4dade21e 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -47,22 +47,11 @@
static const char * const card_extensions[] =
{
+ "GL_ARB_depth_texture", /* New: alanh 06-Jan-2005 */
"GL_ARB_fragment_program",
- "GL_ARB_texture_cube_map",
- "GL_EXT_blend_equation_separate",
- "GL_ATI_blend_equation_separate",
- "GL_ARB_point_parameters",
-
-/* New
- */
- "GL_NV_blend_square",
- "GL_EXT_cull_vertex",
- "GL_ARB_depth_texture",
+ "GL_ARB_shadow", /* New: alanh 06-Jan-2005 */
+ "GL_EXT_shadow_funcs", /* New: alanh 06-Jan-2005 */
"GL_SGIX_depth_texture", /* ARB extn won't work if not enabled */
- "GL_ARB_shadow",
- "GL_EXT_shadow_funcs",
- "GL_3DFX_texture_compression_FXT1",
-
NULL
};
@@ -90,65 +79,6 @@ static void i915InvalidateState( GLcontext *ctx, GLuint new_state )
}
-/* This is the extension list explicitly enabled by the client and
- * excludes functionality available in Mesa and also excludes legacy
- * extensions. It is recognized that in an open source driver, those
- * extensions will probably be re-enabled.
- */
-static const GLubyte *i915GetString( GLcontext *ctx, GLenum name )
-{
- if (name == GL_EXTENSIONS)
- return
- "GL_3DFX_texture_compression_FXT1 "
- "GL_ARB_depth_texture "
- "GL_ARB_fragment_program "
- "GL_ARB_multitexture "
- "GL_ARB_point_parameters "
- "GL_ARB_shadow "
- "GL_ARB_texture_border_clamp "
- "GL_ARB_texture_compression "
- "GL_ARB_texture_cube_map "
- "GL_ARB_texture_env_add "
- "GL_ARB_texture_env_combine "
- "GL_ARB_texture_env_dot3 "
- "GL_ARB_texture_mirrored_repeat "
- "GL_ARB_transpose_matrix "
- "GL_ARB_vertex_buffer_object "
- "GL_ARB_vertex_program "
- "GL_ARB_window_pos "
- "GL_EXT_abgr "
- "GL_EXT_bgra "
- "GL_EXT_blend_color "
- "GL_EXT_blend_func_separate "
- "GL_EXT_blend_minmax "
- "GL_EXT_blend_subtract "
- "GL_EXT_clip_volume_hint "
- "GL_EXT_compiled_vertex_array "
- "GL_EXT_cull_vertex "
- "GL_EXT_draw_range_elements "
- "GL_EXT_fog_coord "
- "GL_EXT_multi_draw_arrays "
- "GL_EXT_packed_pixels "
- "GL_EXT_rescale_normal "
- "GL_EXT_secondary_color "
- "GL_EXT_separate_specular_color "
- "GL_EXT_shadow_funcs "
- "GL_EXT_stencil_wrap "
- "GL_EXT_texture3D "
- "GL_EXT_texture_env_add "
- "GL_EXT_texture_env_combine "
- "GL_EXT_texture_filter_anisotropic "
- "GL_IBM_texture_mirrored_repeat "
- "GL_MESA_window_pos "
- "GL_MESA_ycbcr_texture "
- "GL_NV_blend_square "
- "GL_NV_texgen_reflection "
- "GL_SGIS_generate_mipmap ";
-
-
- return intelGetString( ctx, name );
-}
-
static void i915InitDriverFunctions( struct dd_function_table *functions )
{
@@ -157,7 +87,6 @@ static void i915InitDriverFunctions( struct dd_function_table *functions )
i915InitTextureFuncs( functions );
i915InitFragProgFuncs( functions );
functions->UpdateState = i915InvalidateState;
- functions->GetString = i915GetString;
}
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
};