diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2005-01-06 14:35:44 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2005-01-06 14:35:44 +0000 |
commit | a2db56b34b7fe0fb58441d293ba56b8ed48141a8 (patch) | |
tree | ae1ede85df888975714ed214757e4c7cee9206b4 /src/mesa/drivers/dri/i915/intel_context.c | |
parent | 9f149bf2068c8897497d2b795006ae7334cfc3f6 (diff) |
Add Intel i915GM support, and these extensions.
* GL_ARB_texture_cube_map
* GL_EXT_blend_equation_separate
* GL_ATI_blend_equation_separate
* GL_ARB_point_parameters
* GL_NV_blend_square
* GL_EXT_cull_vertex
* GL_ARB_depth_texture
* GL_SGIX_depth_texture
* GL_ARB_shadow
* GL_EXT_shadow_funcs
* GL_3DFX_texture_compression_FXT1
(Keith Whitwell, Tungsten Graphics)
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_context.c')
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 1ff7b8be7f..ba155d53ec 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -72,7 +72,7 @@ int prevLockLine; * Mesa's Driver Functions ***************************************/ -#define DRIVER_DATE "20041007" +#define DRIVER_DATE "20041217" const GLubyte *intelGetString( GLcontext *ctx, GLenum name ) { @@ -96,6 +96,8 @@ const GLubyte *intelGetString( GLcontext *ctx, GLenum name ) chipset = "Intel(R) 865G"; break; case PCI_CHIP_I915_G: chipset = "Intel(R) 915G"; break; + case PCI_CHIP_I915_GM: + chipset = "Intel(R) 915GM"; break; default: chipset = "Unknown Intel Chipset"; break; } @@ -123,29 +125,15 @@ static void intelBufferSize(GLframebuffer *buffer, UNLOCK_HARDWARE(intel); } - - -/** - * Extension strings exported by the intel driver. - * - * \note - * It appears that ARB_texture_env_crossbar and NV_blend_square have - * "disappeared" compared to the old i830-specific driver. - * - * \note - * See implementation of \c glGetString in each hw_context.c file: - * This set of extensions is overridden and many are not actually - * exported to the driver. They are however enabled internally as - * Mesa requires this when calculating things like GL version number. - */ static const char * const card_extensions[] = { + "GL_APPLE_client_storage", "GL_ARB_multisample", "GL_ARB_multitexture", "GL_ARB_point_parameters", "GL_ARB_texture_border_clamp", - "GL_ARB_texture_cube_map", "GL_ARB_texture_compression", + "GL_ARB_texture_cube_map", "GL_ARB_texture_env_add", "GL_ARB_texture_env_combine", "GL_ARB_texture_env_dot3", @@ -154,7 +142,6 @@ static const char * const card_extensions[] = "GL_ARB_vertex_buffer_object", "GL_ARB_vertex_program", "GL_ARB_window_pos", - "GL_EXT_abgr", "GL_EXT_bgra", "GL_EXT_blend_color", @@ -167,27 +154,30 @@ static const char * const card_extensions[] = "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_APPLE_client_storage", + "GL_IBM_texture_mirrored_repeat", + "GL_INGR_blend_func_separate", "GL_MESA_pack_invert", "GL_MESA_ycbcr_texture", + "GL_NV_texture_rectangle", "GL_NV_vertex_program", "GL_NV_vertex_program1_1", "GL_SGIS_generate_mipmap", - + "GL_SGIS_texture_border_clamp", + "GL_SGIS_texture_edge_clamp", NULL }; - extern const struct tnl_pipeline_stage _intel_render_stage; static const struct tnl_pipeline_stage *intel_pipeline[] = { &_tnl_vertex_transform_stage, + &_tnl_vertex_cull_stage, &_tnl_normal_transform_stage, &_tnl_lighting_stage, &_tnl_fog_coordinate_stage, |