fix up radeon span functions using latest r200 code from Brian,

[mesa.git] / src / mesa / drivers / dri / i915 / i915_context.c

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 00e698ea6cf9595e2ddb85ec2bd9fb4c3b663d61..6e6af35c7602aef19ce9e3ac6b9eb750e52103e8 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -45,15 +45,15 @@
  * Mesa's Driver Functions
  ***************************************/
 
-
-static const char * const card_extensions[] =
+static const struct dri_extension i915_extensions[] =
 {
-   "GL_ARB_fragment_program",
-   "GL_ARB_texture_cube_map",
-   "GL_EXT_blend_equation_separate",
-   "GL_ATI_blend_equation_separate",
-   "GL_ARB_point_parameters",
-   NULL
+    { "GL_ARB_depth_texture",              NULL },
+    { "GL_ARB_fragment_program",           NULL },
+    { "GL_ARB_shadow",                     NULL },
+    { "GL_EXT_shadow_funcs",               NULL },
+    /* ARB extn won't work if not enabled */
+    { "GL_SGIX_depth_texture",             NULL },
+    { NULL,                                NULL }
 };
 
 /* Override intel default.
@@ -73,63 +73,13 @@ static void i915InvalidateState( GLcontext *ctx, GLuint new_state )
     */
    {
       struct i915_fragment_program *p = 
-        (struct i915_fragment_program *)ctx->FragmentProgram.Current;
-      if (p->nr_params)
+        (struct i915_fragment_program *)ctx->FragmentProgram._Current;
+      if (p && p->nr_params)
         p->params_uptodate = 0;
    }
 
-}
-
-/* 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_ARB_fragment_program "
-        "GL_ARB_multitexture "
-        "GL_ARB_point_parameters "
-        "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_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_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_ycbcr_texture "
-        "GL_MESA_window_pos "
-        "GL_NV_texgen_reflection "
-        "GL_SGIS_generate_mipmap";
-
-   return intelGetString( ctx, name );
+   if (new_state & (_NEW_FOG|_NEW_HINT|_NEW_PROGRAM))
+      i915_update_fog(ctx);
 }
 
 
@@ -140,7 +90,6 @@ static void i915InitDriverFunctions( struct dd_function_table *functions )
    i915InitTextureFuncs( functions );
    i915InitFragProgFuncs( functions );
    functions->UpdateState = i915InvalidateState;
-   functions->GetString = i915GetString;
 }
 
 
@@ -173,7 +122,7 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
    intel->nr_heaps = 1;
    intel->texture_heaps[0] = 
       driCreateTextureHeap( 0, intel,
-                           intel->intelScreen->textureSize,
+                           intel->intelScreen->tex.size,
                            12,
                            I830_NR_TEX_REGIONS,
                            intel->sarea->texList,
@@ -182,8 +131,9 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
                            sizeof( struct i915_texture_object ),
                            (destroy_texture_object_t *)intelDestroyTexObj );
 
-   /* FIXME: driCalculateMaxTextureLevels assumes that mipmaps are tightly
-    * FIXME: packed, but they're not in Intel graphics hardware.
+   /* FIXME: driCalculateMaxTextureLevels assumes that mipmaps are
+    * tightly packed, but they're not in Intel graphics
+    * hardware.
     */
    ctx->Const.MaxTextureUnits = 1;
    driCalculateMaxTextureLevels( intel->texture_heaps,
@@ -216,7 +166,7 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
    ctx->Const.MaxFragmentProgramAddressRegs = 0; /* I don't think we have one */
 
 
-   driInitExtensions( ctx, card_extensions, GL_FALSE );
+   driInitExtensions( ctx, i915_extensions, GL_FALSE );
 
 
    _tnl_init_vertices( ctx, ctx->Const.MaxArrayLockSize + 12,