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 c7d80f70531c339ffa2562fd90a34977dcf929c8..3979f531a8b42e498a2611d4637f6b2be5637686 100644 (file)
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -3,6 +3,26 @@
  * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
  **************************************************************************/
 
 #include "i830_context.h"
@@ -12,59 +32,17 @@
 #include "tnl/tnl.h"
 #include "tnl/t_vertex.h"
 #include "tnl/t_context.h"
-
+#include "utils.h"
 
 /***************************************
  * Mesa's Driver Functions
  ***************************************/
 
-/* 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 *i830GetString( GLcontext *ctx, GLenum name )
+static const struct dri_extension i830_extensions[] =
 {
-   if (name == GL_EXTENSIONS)
-      return 
-        "GL_ARB_multitexture "
-        "GL_ARB_texture_border_clamp "
-        "GL_ARB_texture_compression "
-        "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_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 );
-}
+    { "GL_ARB_texture_env_crossbar",       NULL },
+    { NULL,                                NULL }
+};
 
 
 static void i830InitDriverFunctions( struct dd_function_table *functions )
@@ -72,7 +50,6 @@ static void i830InitDriverFunctions( struct dd_function_table *functions )
    intelInitDriverFunctions( functions );
    i830InitStateFuncs( functions );
    i830InitTextureFuncs( functions );
-   functions->GetString = i830GetString;
 }
 
 
@@ -102,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,
@@ -121,7 +98,7 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
                                 4,
                                 11, /* max 2D texture size is 2048x2048 */
                                 8,  /* max 3D texture size is 256^3 */
-                                0,  /* max CUBE. not supported */
+                                10, /* max CUBE texture size is 1024x1024 */
                                 11, /* max RECT. supported */
                                 12,
                                 GL_FALSE );
@@ -132,6 +109,8 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
 
    intel->verts = TNL_CONTEXT(ctx)->clipspace.vertex_buf;
 
+   driInitExtensions( ctx, i830_extensions, GL_FALSE );
+
    i830InitState( i830 );