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

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

diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index fc63386cbe8e183cf46296f0fd6ac3a04378fca0..3979f531a8b42e498a2611d4637f6b2be5637686 100644 (file)
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -32,17 +32,16 @@
 #include "tnl/tnl.h"
 #include "tnl/t_vertex.h"
 #include "tnl/t_context.h"
-
+#include "utils.h"
 
 /***************************************
  * Mesa's Driver Functions
  ***************************************/
 
-static const char * const card_extensions[] =
+static const struct dri_extension i830_extensions[] =
 {
-   "GL_ARB_texture_env_crossbar",
-   "GL_NV_blend_square",
-   NULL
+    { "GL_ARB_texture_env_crossbar",       NULL },
+    { NULL,                                NULL }
 };
 
 
@@ -80,7 +79,7 @@ GLboolean i830CreateContext( 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,
@@ -110,7 +109,7 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
 
    intel->verts = TNL_CONTEXT(ctx)->clipspace.vertex_buf;
 
-   driInitExtensions( ctx, card_extensions, GL_FALSE );
+   driInitExtensions( ctx, i830_extensions, GL_FALSE );
 
    i830InitState( i830 );