summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/dlist.c39
-rw-r--r--src/mesa/main/extensions.c13
-rw-r--r--src/mesa/main/fog.h7
-rw-r--r--src/mesa/main/state.c38
4 files changed, 43 insertions, 54 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index f37b804ce41..cb682c6ffc4 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.47 2000/10/27 16:44:40 keithw Exp $ */
+/* $Id: dlist.c,v 1.48 2000/10/27 18:31:21 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -5230,26 +5230,23 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
table->Scaled = save_Scaled;
table->Scalef = save_Scalef;
table->Scissor = save_Scissor;
-
-#if 0
- table->SecondaryColor3fEXT = _mesa_SecondaryColor3bEXT;
- table->SecondaryColor3fvEXT = _mesa_SecondaryColor3bvEXT;
- table->SecondaryColor3dEXT = _mesa_SecondaryColor3sEXT;
- table->SecondaryColordvEXT = _mesa_SecondaryColor3svEXT;
- table->SecondaryColor3fEXT = _mesa_SecondaryColor3iEXT;
- table->SecondaryColor3fvEXT = _mesa_SecondaryColor3ivEXT;
- table->SecondaryColor3dEXT = _mesa_SecondaryColor3fEXT;
- table->SecondaryColordvEXT = _mesa_SecondaryColor3fvEXT;
- table->SecondaryColor3fEXT = _mesa_SecondaryColor3dEXT;
- table->SecondaryColor3fvEXT = _mesa_SecondaryColor3dvEXT;
- table->SecondaryColor3dEXT = _mesa_SecondaryColor3ubEXT;
- table->SecondaryColordvEXT = _mesa_SecondaryColor3ubvEXT;
- table->SecondaryColor3fEXT = _mesa_SecondaryColor3usEXT;
- table->SecondaryColor3fvEXT = _mesa_SecondaryColor3usvEXT;
- table->SecondaryColor3dEXT = _mesa_SecondaryColor3uiEXT;
- table->SecondaryColordvEXT = _mesa_SecondaryColor3uivEXT;
-#endif
-
+ table->SecondaryColor3bEXT = _mesa_SecondaryColor3bEXT;
+ table->SecondaryColor3bvEXT = _mesa_SecondaryColor3bvEXT;
+ table->SecondaryColor3sEXT = _mesa_SecondaryColor3sEXT;
+ table->SecondaryColor3svEXT = _mesa_SecondaryColor3svEXT;
+ table->SecondaryColor3iEXT = _mesa_SecondaryColor3iEXT;
+ table->SecondaryColor3ivEXT = _mesa_SecondaryColor3ivEXT;
+ table->SecondaryColor3fEXT = _mesa_SecondaryColor3fEXT;
+ table->SecondaryColor3fvEXT = _mesa_SecondaryColor3fvEXT;
+ table->SecondaryColor3dEXT = _mesa_SecondaryColor3dEXT;
+ table->SecondaryColor3dvEXT = _mesa_SecondaryColor3dvEXT;
+ table->SecondaryColor3ubEXT = _mesa_SecondaryColor3ubEXT;
+ table->SecondaryColor3ubvEXT = _mesa_SecondaryColor3ubvEXT;
+ table->SecondaryColor3usEXT = _mesa_SecondaryColor3usEXT;
+ table->SecondaryColor3usvEXT = _mesa_SecondaryColor3usvEXT;
+ table->SecondaryColor3uiEXT = _mesa_SecondaryColor3uiEXT;
+ table->SecondaryColor3uivEXT = _mesa_SecondaryColor3uivEXT;
+ table->SecondaryColorPointerEXT = _mesa_SecondaryColorPointerEXT;
table->SelectBuffer = _mesa_SelectBuffer;
table->ShadeModel = save_ShadeModel;
table->StencilFunc = save_StencilFunc;
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 010e95a71ae..823c7f405e0 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,4 +1,4 @@
-/* $Id: extensions.c,v 1.37 2000/10/27 16:44:40 keithw Exp $ */
+/* $Id: extensions.c,v 1.38 2000/10/27 18:31:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -56,20 +56,24 @@ static struct { int enabled; const char *name; } default_extensions[] = {
{ DEFAULT_ON, "GL_ARB_texture_env_add" },
{ ALWAYS_ENABLED, "GL_ARB_tranpose_matrix" },
{ ALWAYS_ENABLED, "GL_EXT_abgr" },
+ { DEFAULT_OFF, "GL_EXT_bgra" },
{ DEFAULT_ON, "GL_EXT_blend_color" },
{ DEFAULT_ON, "GL_EXT_blend_func_separate" },
{ DEFAULT_ON, "GL_EXT_blend_logic_op" },
{ DEFAULT_ON, "GL_EXT_blend_minmax" },
{ DEFAULT_ON, "GL_EXT_blend_subtract" },
{ DEFAULT_ON, "GL_EXT_clip_volume_hint" },
+ { DEFAULT_OFF, "GL_EXT_cull_vertex" },
{ DEFAULT_ON, "GL_EXT_convolution" },
{ DEFAULT_ON, "GL_EXT_compiled_vertex_array" },
+ { DEFAULT_ON, "GL_EXT_fog_coord" },
{ DEFAULT_ON, "GL_EXT_histogram" },
{ DEFAULT_ON, "GL_EXT_packed_pixels" },
{ DEFAULT_ON, "GL_EXT_paletted_texture" },
{ DEFAULT_ON, "GL_EXT_point_parameters" },
{ ALWAYS_ENABLED, "GL_EXT_polygon_offset" },
{ ALWAYS_ENABLED, "GL_EXT_rescale_normal" },
+ { DEFAULT_ON, "GL_EXT_secondary_color" },
{ DEFAULT_ON, "GL_EXT_shared_texture_palette" },
{ DEFAULT_ON, "GL_EXT_stencil_wrap" },
{ DEFAULT_ON, "GL_EXT_texture3D" },
@@ -92,12 +96,7 @@ static struct { int enabled; const char *name; } default_extensions[] = {
{ DEFAULT_ON, "GL_SGIS_pixel_texture" },
{ DEFAULT_ON, "GL_SGIS_texture_edge_clamp" },
{ DEFAULT_ON, "GL_SGIX_pixel_texture" },
- { DEFAULT_OFF, "GL_3DFX_texture_compression_FXT1" },
-
- { DEFAULT_OFF, "GL_EXT_secondary_color" },
- { DEFAULT_ON, "GL_EXT_fog_coord" },
- { DEFAULT_OFF, "GL_EXT_bgra" },
- { DEFAULT_OFF, "GL_EXT_cull_vertex" },
+ { DEFAULT_OFF, "GL_3DFX_texture_compression_FXT1" }
};
diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h
index d9b30d6000b..38bea5d6f01 100644
--- a/src/mesa/main/fog.h
+++ b/src/mesa/main/fog.h
@@ -1,8 +1,8 @@
-/* $Id: fog.h,v 1.5 2000/10/27 16:44:40 keithw Exp $ */
+/* $Id: fog.h,v 1.6 2000/10/27 18:31:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.3
+ * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -51,9 +51,6 @@ _mesa_Fogiv(GLenum pname, const GLint *params );
extern void
-_mesa_fog_vertices( struct vertex_buffer *VB );
-
-extern void
_mesa_fog_rgba_pixels( const GLcontext *ctx,
GLuint n, const GLfixed fog[],
GLubyte rgba[][4] );
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 7a7742d1f8a..149017a4a32 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.34 2000/10/27 16:44:41 keithw Exp $ */
+/* $Id: state.c,v 1.35 2000/10/27 18:31:23 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -360,27 +360,23 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
exec->Scaled = _mesa_Scaled;
exec->Scalef = _mesa_Scalef;
exec->Scissor = _mesa_Scissor;
-
-#if 0
- exec->SecondaryColor3fEXT = _mesa_SecondaryColor3bEXT;
- exec->SecondaryColor3fvEXT = _mesa_SecondaryColor3bvEXT;
- exec->SecondaryColor3dEXT = _mesa_SecondaryColor3sEXT;
- exec->SecondaryColordvEXT = _mesa_SecondaryColor3svEXT;
- exec->SecondaryColor3fEXT = _mesa_SecondaryColor3iEXT;
- exec->SecondaryColor3fvEXT = _mesa_SecondaryColor3ivEXT;
- exec->SecondaryColor3dEXT = _mesa_SecondaryColor3fEXT;
- exec->SecondaryColordvEXT = _mesa_SecondaryColor3fvEXT;
- exec->SecondaryColor3fEXT = _mesa_SecondaryColor3dEXT;
- exec->SecondaryColor3fvEXT = _mesa_SecondaryColor3dvEXT;
- exec->SecondaryColor3dEXT = _mesa_SecondaryColor3ubEXT;
- exec->SecondaryColordvEXT = _mesa_SecondaryColor3ubvEXT;
- exec->SecondaryColor3fEXT = _mesa_SecondaryColor3usEXT;
- exec->SecondaryColor3fvEXT = _mesa_SecondaryColor3usvEXT;
- exec->SecondaryColor3dEXT = _mesa_SecondaryColor3uiEXT;
- exec->SecondaryColordvEXT = _mesa_SecondaryColor3uivEXT;
+ exec->SecondaryColor3bEXT = _mesa_SecondaryColor3bEXT;
+ exec->SecondaryColor3bvEXT = _mesa_SecondaryColor3bvEXT;
+ exec->SecondaryColor3sEXT = _mesa_SecondaryColor3sEXT;
+ exec->SecondaryColor3svEXT = _mesa_SecondaryColor3svEXT;
+ exec->SecondaryColor3iEXT = _mesa_SecondaryColor3iEXT;
+ exec->SecondaryColor3ivEXT = _mesa_SecondaryColor3ivEXT;
+ exec->SecondaryColor3fEXT = _mesa_SecondaryColor3fEXT;
+ exec->SecondaryColor3fvEXT = _mesa_SecondaryColor3fvEXT;
+ exec->SecondaryColor3dEXT = _mesa_SecondaryColor3dEXT;
+ exec->SecondaryColor3dvEXT = _mesa_SecondaryColor3dvEXT;
+ exec->SecondaryColor3ubEXT = _mesa_SecondaryColor3ubEXT;
+ exec->SecondaryColor3ubvEXT = _mesa_SecondaryColor3ubvEXT;
+ exec->SecondaryColor3usEXT = _mesa_SecondaryColor3usEXT;
+ exec->SecondaryColor3usvEXT = _mesa_SecondaryColor3usvEXT;
+ exec->SecondaryColor3uiEXT = _mesa_SecondaryColor3uiEXT;
+ exec->SecondaryColor3uivEXT = _mesa_SecondaryColor3uivEXT;
exec->SecondaryColorPointerEXT = _mesa_SecondaryColorPointerEXT;
-#endif
-
exec->SelectBuffer = _mesa_SelectBuffer;
exec->ShadeModel = _mesa_ShadeModel;
exec->StencilFunc = _mesa_StencilFunc;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 23:01:19 +0000