summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/drivers/glide/fxsetup.c2
-rw-r--r--src/mesa/glapi/glapi.c40
-rw-r--r--src/mesa/glapi/glapioffsets.h17
-rw-r--r--src/mesa/glapi/glapitable.h21
-rw-r--r--src/mesa/glapi/glapitemp.h87
-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
-rw-r--r--src/mesa/x86/glapi_x86.S136
10 files changed, 322 insertions, 78 deletions
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index 45be2b8482..64831fcfb3 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -1435,7 +1435,7 @@ static void fxSetupColorMask(GLcontext *ctx)
*/
static void fxSetupFog(GLcontext *ctx)
{
- if (ctx->Fog.Enabled && ctx->FogMode==FOG_FRAGMENT) {
+ if (ctx->Fog.Enabled /*&& ctx->FogMode==FOG_FRAGMENT*/) {
fxMesaContext fxMesa = FX_CONTEXT(ctx);
/* update fog color */
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index e640f0c8f6..fd12f24ee6 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -1,4 +1,4 @@
-/* $Id: glapi.c,v 1.46 2000/10/19 20:13:12 brianp Exp $ */
+/* $Id: glapi.c,v 1.47 2000/10/27 18:31:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -287,7 +287,7 @@ _glapi_get_dispatch_table_size(void)
const char *
_glapi_get_version(void)
{
- return "20000223"; /* YYYYMMDD */
+ return "20001026"; /* YYYYMMDD */
}
@@ -1241,6 +1241,7 @@ static struct name_address_offset static_functions[] = {
{ "glGetPixelTransformParameterivEXT", NAME(glGetPixelTransformParameterivEXT), _gloffset_GetPixelTransformParameterivEXT },
{ "glGetPixelTransformParameterfvEXT", NAME(glGetPixelTransformParameterfvEXT), _gloffset_GetPixelTransformParameterfvEXT },
#undef NAME
+#endif
/* 145. GL_EXT_secondary_color */
#ifdef GL_EXT_secondary_color
@@ -1256,14 +1257,6 @@ static struct name_address_offset static_functions[] = {
{ "glSecondaryColor3ubEXT", NAME(glSecondaryColor3ubEXT), _gloffset_SecondaryColor3ubEXT },
{ "glSecondaryColor3uiEXT", NAME(glSecondaryColor3uiEXT), _gloffset_SecondaryColor3uiEXT },
{ "glSecondaryColor3usEXT", NAME(glSecondaryColor3usEXT), _gloffset_SecondaryColor3usEXT },
- { "glSecondaryColor4bEXT", NAME(glSecondaryColor4bEXT), _gloffset_SecondaryColor4bEXT },
- { "glSecondaryColor4dEXT", NAME(glSecondaryColor4dEXT), _gloffset_SecondaryColor4dEXT },
- { "glSecondaryColor4fEXT", NAME(glSecondaryColor4fEXT), _gloffset_SecondaryColor4fEXT },
- { "glSecondaryColor4iEXT", NAME(glSecondaryColor4iEXT), _gloffset_SecondaryColor4iEXT },
- { "glSecondaryColor4sEXT", NAME(glSecondaryColor4sEXT), _gloffset_SecondaryColor4sEXT },
- { "glSecondaryColor4ubEXT", NAME(glSecondaryColor4ubEXT), _gloffset_SecondaryColor4ubEXT },
- { "glSecondaryColor4uiEXT", NAME(glSecondaryColor4uiEXT), _gloffset_SecondaryColor4uiEXT },
- { "glSecondaryColor4usEXT", NAME(glSecondaryColor4usEXT), _gloffset_SecondaryColor4usEXT },
{ "glSecondaryColor3bvEXT", NAME(glSecondaryColor3bvEXT), _gloffset_SecondaryColor3bvEXT },
{ "glSecondaryColor3dvEXT", NAME(glSecondaryColor3dvEXT), _gloffset_SecondaryColor3dvEXT },
{ "glSecondaryColor3fvEXT", NAME(glSecondaryColor3fvEXT), _gloffset_SecondaryColor3fvEXT },
@@ -1272,18 +1265,11 @@ static struct name_address_offset static_functions[] = {
{ "glSecondaryColor3ubvEXT", NAME(glSecondaryColor3ubvEXT), _gloffset_SecondaryColor3ubvEXT },
{ "glSecondaryColor3uivEXT", NAME(glSecondaryColor3uivEXT), _gloffset_SecondaryColor3uivEXT },
{ "glSecondaryColor3usvEXT", NAME(glSecondaryColor3usvEXT), _gloffset_SecondaryColor3usvEXT },
- { "glSecondaryColor4bvEXT", NAME(glSecondaryColor4bvEXT), _gloffset_SecondaryColor4bvEXT },
- { "glSecondaryColor4dvEXT", NAME(glSecondaryColor4dvEXT), _gloffset_SecondaryColor4dvEXT },
- { "glSecondaryColor4fvEXT", NAME(glSecondaryColor4fvEXT), _gloffset_SecondaryColor4fvEXT },
- { "glSecondaryColor4ivEXT", NAME(glSecondaryColor4ivEXT), _gloffset_SecondaryColor4ivEXT },
- { "glSecondaryColor4svEXT", NAME(glSecondaryColor4svEXT), _gloffset_SecondaryColor4svEXT },
- { "glSecondaryColor4ubvEXT", NAME(glSecondaryColor4ubvEXT), _gloffset_SecondaryColor4ubvEXT },
- { "glSecondaryColor4uivEXT", NAME(glSecondaryColor4uivEXT), _gloffset_SecondaryColor4uivEXT },
- { "glSecondaryColor4usvEXT", NAME(glSecondaryColor4usvEXT), _gloffset_SecondaryColor4usvEXT },
{ "glSecondaryColorPointerEXT", NAME(glSecondaryColorPointerEXT), _gloffset_SecondaryColorPointerEXT },
#undef NAME
/* 147. GL_EXT_texture_perturb_normal */
+#if 000
#ifdef GL_EXT_texture_perturb_normal
#define NAME(X) (GLvoid *) X
#else
@@ -1291,8 +1277,10 @@ static struct name_address_offset static_functions[] = {
#endif
{ "glTextureNormalEXT", NAME(glTextureNormalEXT), _gloffset_TextureNormalEXT },
#undef NAME
+#endif
/* 148. GL_EXT_multi_draw_arrays */
+#if 000
#ifdef GL_EXT_multi_draw_arrays
#define NAME(X) (GLvoid *) X
#else
@@ -1315,8 +1303,8 @@ static struct name_address_offset static_functions[] = {
{ "glFogCoordPointerEXT", NAME(glFogCoordPointerEXT), _gloffset_FogCoordPointerEXT },
#undef NAME
-#if 000
/* 156. GL_EXT_coordinate_frame */
+#if 000
#ifdef GL_EXT_coordinate_frame
#define NAME(X) (GLvoid *) X
#else
@@ -1345,8 +1333,10 @@ static struct name_address_offset static_functions[] = {
{ "glTangentPointerEXT", NAME(glTangentPointerEXT), _gloffset_TangentPointerEXT },
{ "glBinormalPointerEXT", NAME(glBinormalPointerEXT), _gloffset_BinormalPointerEXT },
#undef NAME
+#endif
/* 164. GL_SUN_global_alpha */
+#if 000
#ifdef GL_SUN_global_alpha
#define NAME(X) (GLvoid *) X
#else
@@ -1361,8 +1351,10 @@ static struct name_address_offset static_functions[] = {
{ "glGlobalAlphaFactorusSUN", NAME(glGlobalAlphaFactorusSUN), _gloffset_GlobalAlphaFactorusSUN },
{ "glGlobalAlphaFactoruiSUN", NAME(glGlobalAlphaFactoruiSUN), _gloffset_GlobalAlphaFactoruiSUN },
#undef NAME
+#endif
/* 165. GL_SUN_triangle_list */
+#if 000
#ifdef GL_SUN_triangle_list
#define NAME(X) (GLvoid *) X
#else
@@ -1376,8 +1368,10 @@ static struct name_address_offset static_functions[] = {
{ "glReplacementCodeubvSUN", NAME(glReplacementCodeubvSUN), _gloffset_ReplacementCodeubvSUN },
{ "glReplacementCodePointerSUN", NAME(glReplacementCodePointerSUN), _gloffset_ReplacementCodePointerSUN },
#undef NAME
+#endif
/* 166. GL_SUN_vertex */
+#if 000
#ifdef GL_SUN_vertex
#define NAME(X) (GLvoid *) X
#else
@@ -1848,6 +1842,14 @@ _glapi_check_table(const struct _glapi_table *table)
assert(istextureOffset == _gloffset_IsTextureEXT);
assert(istextureOffset == offset);
}
+ {
+ GLuint secondaryColor3fOffset = _glapi_get_proc_offset("glSecondaryColor3fEXT");
+ char *secondaryColor3fFunc = (char*) &table->SecondaryColor3fEXT;
+ GLuint offset = (secondaryColor3fFunc - (char *) table) / sizeof(void *);
+ assert(secondaryColor3fOffset == _gloffset_SecondaryColor3fEXT);
+ assert(secondaryColor3fOffset == offset);
+ assert(_glapi_get_proc_address("glSecondaryColor3fEXT") == (void *) &glSecondaryColor3fEXT);
+ }
#endif
}
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index b05d49e6ff..c1c82bba0e 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -563,5 +563,22 @@
#define _gloffset_CompressedTexSubImage2DARB 558
#define _gloffset_CompressedTexSubImage1DARB 559
#define _gloffset_GetCompressedTexImageARB 560
+#define _gloffset_SecondaryColor3bEXT 561
+#define _gloffset_SecondaryColor3bvEXT 562
+#define _gloffset_SecondaryColor3dEXT 563
+#define _gloffset_SecondaryColor3dvEXT 564
+#define _gloffset_SecondaryColor3fEXT 565
+#define _gloffset_SecondaryColor3fvEXT 566
+#define _gloffset_SecondaryColor3iEXT 567
+#define _gloffset_SecondaryColor3ivEXT 568
+#define _gloffset_SecondaryColor3sEXT 569
+#define _gloffset_SecondaryColor3svEXT 570
+#define _gloffset_SecondaryColor3ubEXT 571
+#define _gloffset_SecondaryColor3ubvEXT 572
+#define _gloffset_SecondaryColor3uiEXT 573
+#define _gloffset_SecondaryColor3uivEXT 574
+#define _gloffset_SecondaryColor3usEXT 575
+#define _gloffset_SecondaryColor3usvEXT 576
+#define _gloffset_SecondaryColorPointerEXT 577
#endif
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 94690afb2f..248b936149 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -548,8 +548,8 @@ struct _glapi_table
void (*IndexFuncEXT)(GLenum func, GLclampf ref); /* 539 */
void (*LockArraysEXT)(GLint first, GLsizei count); /* 540 */
void (*UnlockArraysEXT)(void); /* 541 */
- void (*CullParameterdvEXT)(GLenum pname, const GLdouble * params); /* 542 */
- void (*CullParameterfvEXT)(GLenum pname, const GLfloat * params); /* 543 */
+ void (*CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 542 */
+ void (*CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 543 */
void (*HintPGI)(GLenum target, GLint mode); /* 544 */
void (*FogCoordfEXT)(GLfloat coord); /* 545 */
void (*FogCoordfvEXT)(const GLfloat * coord); /* 546 */
@@ -567,6 +567,23 @@ struct _glapi_table
void (*CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 558 */
void (*CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 559 */
void (*GetCompressedTexImageARB)(GLenum target, GLint level, void * img); /* 560 */
+ void (*SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 561 */
+ void (*SecondaryColor3bvEXT)(const GLbyte * v); /* 562 */
+ void (*SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 563 */
+ void (*SecondaryColor3dvEXT)(const GLdouble * v); /* 564 */
+ void (*SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 565 */
+ void (*SecondaryColor3fvEXT)(const GLfloat * v); /* 566 */
+ void (*SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 567 */
+ void (*SecondaryColor3ivEXT)(const GLint * v); /* 568 */
+ void (*SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 569 */
+ void (*SecondaryColor3svEXT)(const GLshort * v); /* 570 */
+ void (*SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 571 */
+ void (*SecondaryColor3ubvEXT)(const GLubyte * v); /* 572 */
+ void (*SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 573 */
+ void (*SecondaryColor3uivEXT)(const GLuint * v); /* 574 */
+ void (*SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 575 */
+ void (*SecondaryColor3usvEXT)(const GLushort * v); /* 576 */
+ void (*SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 577 */
};
#endif
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 073163ca00..7186e5ef65 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -1,4 +1,4 @@
-/* $Id: glapitemp.h,v 1.22 2000/06/12 15:38:43 brianp Exp $ */
+/* $Id: glapitemp.h,v 1.23 2000/10/27 18:31:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -2871,7 +2871,90 @@ KEYWORD1 void KEYWORD2 NAME(GetPixelTransformParameterfvEXT)(GLenum target, GLen
/* 145. GL_EXT_secondary_color */
-/* XXX todo */
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue)
+{
+ DISPATCH(SecondaryColor3bEXT, (red, green, blue), (F, "glSecondaryColor3bEXT(%d, %d, %d);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3bvEXT)(const GLbyte *v)
+{
+ DISPATCH(SecondaryColor3bvEXT, (v), (F, "glSecondaryColor3bvEXT(%d, %d, %d);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue)
+{
+ DISPATCH(SecondaryColor3dEXT, (red, green, blue), (F, "glSecondaryColor3dEXT(%g, %g, %g);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3dvEXT)(const GLdouble * v)
+{
+ DISPATCH(SecondaryColor3dvEXT, (v), (F, "glSecondaryColor3dvEXT(%g, %g, %g);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue)
+{
+ DISPATCH(SecondaryColor3fEXT, (red, green, blue), (F, "glSecondaryColor3fEXT(%g, %g, %g);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3fvEXT)(const GLfloat * v)
+{
+ DISPATCH(SecondaryColor3fvEXT, (v), (F, "glSecondaryColor3fvEXT(%g, %g, %g);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3iEXT)(GLint red, GLint green, GLint blue)
+{
+ DISPATCH(SecondaryColor3iEXT, (red, green, blue), (F, "glSecondaryColor3iEXT(%d, %d, %d);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ivEXT)(const GLint * v)
+{
+ DISPATCH(SecondaryColor3ivEXT, (v), (F, "glSecondaryColor3ivEXT(%d, %d, %d);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue)
+{
+ DISPATCH(SecondaryColor3sEXT, (red, green, blue), (F, "glSecondaryColor3sEXT(%d, %d, %d);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3svEXT)(const GLshort * v)
+{
+ DISPATCH(SecondaryColor3svEXT, (v), (F, "glSecondaryColor3svEXT(%d, %d, %d);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue)
+{
+ DISPATCH(SecondaryColor3ubEXT, (red, green, blue), (F, "glSecondaryColor3ubEXT(%d, %d, %d);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3ubvEXT)(const GLubyte * v)
+{
+ DISPATCH(SecondaryColor3ubvEXT, (v), (F, "glSecondaryColor3ubvEXT(%d, %d, %d);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue)
+{
+ DISPATCH(SecondaryColor3uiEXT, (red, green, blue), (F, "glSecondaryColor3uiEXT(%d, %d, %d);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3uivEXT)(const GLuint * v)
+{
+ DISPATCH(SecondaryColor3uivEXT, (v), (F, "glSecondaryColor3uivEXT(%d, %d, %d);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue)
+{
+ DISPATCH(SecondaryColor3usEXT, (red, green, blue), (F, "glSecondaryColor3usEXT(%d, %d, %d);", red, green, blue));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColor3usvEXT)(const GLushort * v)
+{
+ DISPATCH(SecondaryColor3usvEXT, (v), (F, "glSecondaryColor3usvEXT(%d, %d, %d);", v[0], v[1], v[2]));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLvoid * pointer)
+{
+ DISPATCH(SecondaryColorPointerEXT, (size, type, stride, pointer), (F, "glSecondaryColorPointerEXT(%d, 0x%x, %d, %p);", size, type, stride, pointer));
+}
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index f37b804ce4..cb682c6ffc 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 010e95a71a..823c7f405e 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 d9b30d6000..38bea5d6f0 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 7a7742d1f8..149017a4a3 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;
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 43b62e762e..f88df17293 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -4428,6 +4428,142 @@ GL_PREFIX(DrawRangeElementsEXT):
JMP(GL_OFFSET(_gloffset_DrawRangeElements))
ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3bEXT))
+GL_PREFIX(SecondaryColor3bEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3bEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3bEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3bvEXT))
+GL_PREFIX(SecondaryColor3bvEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3bvEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3bvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3dEXT))
+GL_PREFIX(SecondaryColor3dEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3dEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3dEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3dvEXT))
+GL_PREFIX(SecondaryColor3dvEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3dvEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3dvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3fEXT))
+GL_PREFIX(SecondaryColor3fEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3fEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3fEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3fvEXT))
+GL_PREFIX(SecondaryColor3fvEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3fvEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3fvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3iEXT))
+GL_PREFIX(SecondaryColor3iEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3iEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3iEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ivEXT))
+GL_PREFIX(SecondaryColor3ivEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3ivEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3ivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3sEXT))
+GL_PREFIX(SecondaryColor3sEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3sEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3sEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3svEXT))
+GL_PREFIX(SecondaryColor3svEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3svEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3svEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ubEXT))
+GL_PREFIX(SecondaryColor3ubEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3ubEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3ubEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3ubvEXT))
+GL_PREFIX(SecondaryColor3ubvEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3ubvEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3ubvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3uiEXT))
+GL_PREFIX(SecondaryColor3uiEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3uiEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3uiEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3uivEXT))
+GL_PREFIX(SecondaryColor3uivEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3uivEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3uivEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3usEXT))
+GL_PREFIX(SecondaryColor3usEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3usEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3usEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColor3usvEXT))
+GL_PREFIX(SecondaryColor3usvEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColor3usvEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColor3usvEXT))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SecondaryColorPointerEXT))
+GL_PREFIX(SecondaryColorPointerEXT):
+ MOV_L(GLNAME(_glapi_Dispatch), EAX)
+ TEST_L(EAX, EAX)
+ JZ(GLNAME(_glapi_fallback_SecondaryColorPointerEXT))
+ JMP(GL_OFFSET(_gloffset_SecondaryColorPointerEXT))
+
+ALIGNTEXT16
GLOBL_FN(GL_PREFIX(FogCoordfEXT))
GL_PREFIX(FogCoordfEXT):
MOV_L(GLNAME(_glapi_Dispatch), EAX)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 23:03:35 +0000