summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorRandy Frank <[email protected]>2000-03-28 16:59:39 +0000
committerRandy Frank <[email protected]>2000-03-28 16:59:39 +0000
commit23ee049401fdaaa77240a3eb02ca4dcce421a939 (patch)
tree7ea0026303b73f22234a5708c0b2b385242ab5c6 /src/mesa/main
parent9d4d85520834361af3797c720c1b9b223f083d59 (diff)
Implemented support for the HP occlusion test extension (osmesa and X)
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/enums.c5
-rw-r--r--src/mesa/main/extensions.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 9c49a810bed..417a76bf3e8 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1,4 +1,4 @@
-/* $Id: enums.c,v 1.7 2000/03/07 17:54:58 brianp Exp $ */
+/* $Id: enums.c,v 1.8 2000/03/28 16:59:39 rjfrank Exp $ */
/*
* Mesa 3-D graphics library
@@ -769,6 +769,9 @@ enum_elt all_enums[] =
{ "GL_CLIENT_ACTIVE_TEXTURE_ARB", 0x84E1 },
{ "GL_MAX_TEXTURE_UNITS_ARB", 0x84E2 },
+ { "GL_OCCLUSION_TEST_HP", 0x8165 },
+ { "GL_OCCLUSION_TEST_RESULT_HP", 0x8166 },
+
{ "GL_TEXTURE_FILTER_CONTROL_EXT", 0x8500 },
{ "GL_TEXTUER_LOD_BIAS_EXT", 0x8501 },
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f60ae01de9d..65495a48a09 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,4 +1,4 @@
-/* $Id: extensions.c,v 1.20 2000/03/11 23:23:26 brianp Exp $ */
+/* $Id: extensions.c,v 1.21 2000/03/28 16:59:39 rjfrank Exp $ */
/*
* Mesa 3-D graphics library
@@ -130,7 +130,7 @@ static int set_extension( GLcontext *ctx, const char *name, GLint state )
if (i == ctx->Extensions.ext_list)
return 1;
- if (i->enabled && !(i->enabled & ALWAYS_ENABLED)) {
+ if (!(i->enabled & ALWAYS_ENABLED)) {
if (i->notify) i->notify( ctx, state );
i->enabled = state;
}