summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/context.c4
-rw-r--r--src/mesa/main/get.c34
-rw-r--r--src/mesa/main/hint.c14
3 files changed, 26 insertions, 26 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index dfcff91cc2..a6e52a896f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.56 2000/04/08 18:57:45 brianp Exp $ */
+/* $Id: context.c,v 1.57 2000/04/10 15:52:25 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -996,7 +996,7 @@ static void init_attrib_groups( GLcontext *ctx )
ctx->Hint.Fog = GL_DONT_CARE;
ctx->Hint.AllowDrawWin = GL_TRUE;
- ctx->Hint.AllowDrawSpn = GL_TRUE;
+ ctx->Hint.AllowDrawFrg = GL_TRUE;
ctx->Hint.AllowDrawMem = GL_TRUE;
ctx->Hint.StrictLighting = GL_TRUE;
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index ec4f39fe2a..579ae68c56 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,4 +1,4 @@
-/* $Id: get.c,v 1.19 2000/04/08 18:57:45 brianp Exp $ */
+/* $Id: get.c,v 1.20 2000/04/10 15:52:25 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -963,12 +963,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_FALSE &&
+ ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_TRUE &&
+ ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -977,8 +977,8 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
case GL_ALLOW_DRAW_WIN_HINT_PGI:
*params = (GLboolean) ctx->Hint.AllowDrawWin;
break;
- case GL_ALLOW_DRAW_SPN_HINT_PGI:
- *params = (GLboolean) ctx->Hint.AllowDrawSpn;
+ case GL_ALLOW_DRAW_FRG_HINT_PGI:
+ *params = (GLboolean) ctx->Hint.AllowDrawFrg;
break;
case GL_ALLOW_DRAW_MEM_HINT_PGI:
*params = (GLboolean) ctx->Hint.AllowDrawMem;
@@ -2005,12 +2005,12 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_FALSE &&
+ ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_TRUE &&
+ ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -2019,8 +2019,8 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
case GL_ALLOW_DRAW_WIN_HINT_PGI:
*params = (GLdouble) ctx->Hint.AllowDrawWin;
break;
- case GL_ALLOW_DRAW_SPN_HINT_PGI:
- *params = (GLdouble) ctx->Hint.AllowDrawSpn;
+ case GL_ALLOW_DRAW_FRG_HINT_PGI:
+ *params = (GLdouble) ctx->Hint.AllowDrawFrg;
break;
case GL_ALLOW_DRAW_MEM_HINT_PGI:
*params = (GLdouble) ctx->Hint.AllowDrawMem;
@@ -3045,12 +3045,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_FALSE &&
+ ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_TRUE &&
+ ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -3059,8 +3059,8 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
case GL_ALLOW_DRAW_WIN_HINT_PGI:
*params = (GLfloat) ctx->Hint.AllowDrawWin;
break;
- case GL_ALLOW_DRAW_SPN_HINT_PGI:
- *params = (GLfloat) ctx->Hint.AllowDrawSpn;
+ case GL_ALLOW_DRAW_FRG_HINT_PGI:
+ *params = (GLfloat) ctx->Hint.AllowDrawFrg;
break;
case GL_ALLOW_DRAW_MEM_HINT_PGI:
*params = (GLfloat) ctx->Hint.AllowDrawMem;
@@ -4066,12 +4066,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_FALSE &&
+ ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
- ctx->Hint.AllowDrawSpn == GL_TRUE &&
+ ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -4080,8 +4080,8 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
case GL_ALLOW_DRAW_WIN_HINT_PGI:
*params = ctx->Hint.AllowDrawWin;
break;
- case GL_ALLOW_DRAW_SPN_HINT_PGI:
- *params = ctx->Hint.AllowDrawSpn;
+ case GL_ALLOW_DRAW_FRG_HINT_PGI:
+ *params = ctx->Hint.AllowDrawFrg;
break;
case GL_ALLOW_DRAW_MEM_HINT_PGI:
*params = ctx->Hint.AllowDrawMem;
diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c
index 3ea2a86181..3621176b37 100644
--- a/src/mesa/main/hint.c
+++ b/src/mesa/main/hint.c
@@ -1,4 +1,4 @@
-/* $Id: hint.c,v 1.2 2000/03/17 15:32:04 brianp Exp $ */
+/* $Id: hint.c,v 1.3 2000/04/10 15:52:26 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -90,17 +90,17 @@ _mesa_try_Hint( GLcontext *ctx, GLenum target, GLenum mode )
case GL_ALWAYS_FAST_HINT_PGI:
if (mode) {
ctx->Hint.AllowDrawWin = GL_TRUE;
- ctx->Hint.AllowDrawSpn = GL_FALSE;
+ ctx->Hint.AllowDrawFrg = GL_FALSE;
ctx->Hint.AllowDrawMem = GL_FALSE;
} else {
ctx->Hint.AllowDrawWin = GL_TRUE;
- ctx->Hint.AllowDrawSpn = GL_TRUE;
+ ctx->Hint.AllowDrawFrg = GL_TRUE;
ctx->Hint.AllowDrawMem = GL_TRUE;
}
break;
case GL_ALWAYS_SOFT_HINT_PGI:
ctx->Hint.AllowDrawWin = GL_TRUE;
- ctx->Hint.AllowDrawSpn = GL_TRUE;
+ ctx->Hint.AllowDrawFrg = GL_TRUE;
ctx->Hint.AllowDrawMem = GL_TRUE;
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@@ -108,8 +108,8 @@ _mesa_try_Hint( GLcontext *ctx, GLenum target, GLenum mode )
case GL_ALLOW_DRAW_WIN_HINT_PGI:
ctx->Hint.AllowDrawWin = mode;
break;
- case GL_ALLOW_DRAW_SPN_HINT_PGI:
- ctx->Hint.AllowDrawSpn = mode;
+ case GL_ALLOW_DRAW_FRG_HINT_PGI:
+ ctx->Hint.AllowDrawFrg = mode;
break;
case GL_ALLOW_DRAW_MEM_HINT_PGI:
ctx->Hint.AllowDrawMem = mode;
@@ -169,7 +169,7 @@ _mesa_HintPGI( GLenum target, GLint mode )
case GL_ALWAYS_SOFT_HINT_PGI:
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
case GL_ALLOW_DRAW_WIN_HINT_PGI:
- case GL_ALLOW_DRAW_SPN_HINT_PGI:
+ case GL_ALLOW_DRAW_FRG_HINT_PGI:
case GL_ALLOW_DRAW_MEM_HINT_PGI:
case GL_CLIP_NEAR_HINT_PGI:
case GL_CLIP_FAR_HINT_PGI: