summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/attrib.c5
-rw-r--r--src/mesa/main/depth.c3
-rw-r--r--src/mesa/main/drawpix.c9
-rw-r--r--src/mesa/main/enable.c22
-rw-r--r--src/mesa/main/extensions.c6
-rw-r--r--src/mesa/main/get.c54
-rw-r--r--src/mesa/main/get_gen.py15
-rw-r--r--src/mesa/main/mtypes.h6
-rw-r--r--src/mesa/main/occlude.c6
9 files changed, 11 insertions, 115 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 28456942cba..0b4a5599463 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5
*
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
*
@@ -890,9 +890,6 @@ _mesa_PopAttrib(void)
_mesa_ClearDepth(depth->Clear);
_mesa_set_enable(ctx, GL_DEPTH_TEST, depth->Test);
_mesa_DepthMask(depth->Mask);
- if (ctx->Extensions.HP_occlusion_test)
- _mesa_set_enable(ctx, GL_OCCLUSION_TEST_HP,
- depth->OcclusionTest);
}
break;
case GL_ENABLE_BIT:
diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index aca471a06c8..f5511ce2fbf 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5
*
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
*
@@ -160,7 +160,6 @@ void _mesa_init_depth( GLcontext * ctx )
ctx->Depth.Clear = 1.0;
ctx->Depth.Func = GL_LESS;
ctx->Depth.Mask = GL_TRUE;
- ctx->Depth.OcclusionTest = GL_FALSE;
/* XXX this is now per-framebuffer state */
#if 00
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 6f7cae9ef55..d22c62a41d6 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.1
+ * Version: 6.5
*
- * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2005 Brian Paul 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"),
@@ -70,7 +70,6 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
x = IROUND(ctx->Current.RasterPos[0]);
y = IROUND(ctx->Current.RasterPos[1]);
- ctx->OcclusionResult = GL_TRUE;
ctx->Driver.DrawPixels(ctx, x, y, width, height, format, type,
&ctx->Unpack, pixels);
}
@@ -127,8 +126,6 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
destx = IROUND(ctx->Current.RasterPos[0]);
desty = IROUND(ctx->Current.RasterPos[1]);
- ctx->OcclusionResult = GL_TRUE;
-
ctx->Driver.CopyPixels( ctx, srcx, srcy, width, height, destx, desty,
type );
}
@@ -206,7 +203,6 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
_mesa_update_state(ctx);
}
- ctx->OcclusionResult = GL_TRUE;
ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
}
#if _HAVE_FULL_GL
@@ -271,7 +267,6 @@ _mesa_DrawDepthPixelsMESA( GLsizei width, GLsizei height,
x = IROUND(ctx->Current.RasterPos[0]);
y = IROUND(ctx->Current.RasterPos[1]);
- ctx->OcclusionResult = GL_TRUE;
ctx->Driver.DrawDepthPixelsMESA(ctx, x, y, width, height,
colorFormat, colorType, colors,
depthType, depths, &ctx->Unpack);
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 67fd083ca82..7ce13a19675 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -5,9 +5,9 @@
/*
* Mesa 3-D graphics library
- * Version: 6.1
+ * Version: 6.5
*
- * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2005 Brian Paul 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"),
@@ -687,19 +687,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
client_state( ctx, cap, state );
return;
- /* GL_HP_occlusion_test */
- case GL_OCCLUSION_TEST_HP:
- CHECK_EXTENSION(HP_occlusion_test, cap);
- if (ctx->Depth.OcclusionTest == state)
- return;
- FLUSH_VERTICES(ctx, _NEW_DEPTH);
- ctx->Depth.OcclusionTest = state;
- if (state)
- ctx->OcclusionResult = ctx->OcclusionResultSaved;
- else
- ctx->OcclusionResultSaved = ctx->OcclusionResult;
- break;
-
/* GL_SGIS_pixel_texture */
case GL_PIXEL_TEXTURE_SGIS:
CHECK_EXTENSION(SGIS_pixel_texture, cap);
@@ -1255,11 +1242,6 @@ _mesa_IsEnabled( GLenum cap )
CHECK_EXTENSION(EXT_histogram);
return ctx->Pixel.MinMaxEnabled;
- /* GL_HP_occlusion_test */
- case GL_OCCLUSION_TEST_HP:
- CHECK_EXTENSION(HP_occlusion_test);
- return ctx->Depth.OcclusionTest;
-
/* GL_SGIS_pixel_texture */
case GL_PIXEL_TEXTURE_SGIS:
CHECK_EXTENSION(SGIS_pixel_texture);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index fae98416511..7a2880ac532 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5
*
- * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2005 Brian Paul 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"),
@@ -129,7 +129,6 @@ static const struct {
{ OFF, "GL_ATI_texture_env_combine3", F(ATI_texture_env_combine3)},
{ OFF, "GL_ATI_texture_mirror_once", F(ATI_texture_mirror_once)},
{ OFF, "GL_ATI_fragment_shader", F(ATI_fragment_shader)},
- { OFF, "GL_HP_occlusion_test", F(HP_occlusion_test) },
{ OFF, "GL_IBM_multimode_draw_arrays", F(IBM_multimode_draw_arrays) },
{ ON, "GL_IBM_rasterpos_clip", F(IBM_rasterpos_clip) },
{ OFF, "GL_IBM_texture_mirrored_repeat", F(ARB_texture_mirrored_repeat)},
@@ -247,7 +246,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
- ctx->Extensions.HP_occlusion_test = GL_TRUE;
ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;
ctx->Extensions.MESA_pack_invert = GL_TRUE;
#if FEATURE_MESA_program_debug
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index bfeb1d6d2a2..96ee29f6f5a 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1179,24 +1179,6 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
}
break;
- case GL_OCCLUSION_TEST_HP:
- CHECK_EXTENSION_B(HP_occlusion_test, pname);
- params[0] = ctx->Depth.OcclusionTest;
- break;
- case GL_OCCLUSION_TEST_RESULT_HP:
- CHECK_EXTENSION_B(HP_occlusion_test, pname);
- {
- FLUSH_VERTICES(ctx, _NEW_DEPTH);
- if (ctx->Depth.OcclusionTest)
- params[0] = ctx->OcclusionResult;
- else
- params[0] = ctx->OcclusionResultSaved;
- /* reset flag now */
- ctx->OcclusionResult = GL_FALSE;
- ctx->OcclusionResultSaved = GL_FALSE;
- return;
- }
- break;
case GL_PIXEL_TEXTURE_SGIS:
CHECK_EXTENSION_B(SGIS_pixel_texture, pname);
params[0] = ctx->Pixel.PixelTextureEnabled;
@@ -3024,24 +3006,6 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
params[15] = matrix[15];
}
break;
- case GL_OCCLUSION_TEST_HP:
- CHECK_EXTENSION_F(HP_occlusion_test, pname);
- params[0] = BOOLEAN_TO_FLOAT(ctx->Depth.OcclusionTest);
- break;
- case GL_OCCLUSION_TEST_RESULT_HP:
- CHECK_EXTENSION_F(HP_occlusion_test, pname);
- {
- FLUSH_VERTICES(ctx, _NEW_DEPTH);
- if (ctx->Depth.OcclusionTest)
- params[0] = ctx->OcclusionResult;
- else
- params[0] = ctx->OcclusionResultSaved;
- /* reset flag now */
- ctx->OcclusionResult = GL_FALSE;
- ctx->OcclusionResultSaved = GL_FALSE;
- return;
- }
- break;
case GL_PIXEL_TEXTURE_SGIS:
CHECK_EXTENSION_F(SGIS_pixel_texture, pname);
params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.PixelTextureEnabled);
@@ -4869,24 +4833,6 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
params[15] = IROUND(matrix[15]);
}
break;
- case GL_OCCLUSION_TEST_HP:
- CHECK_EXTENSION_I(HP_occlusion_test, pname);
- params[0] = BOOLEAN_TO_INT(ctx->Depth.OcclusionTest);
- break;
- case GL_OCCLUSION_TEST_RESULT_HP:
- CHECK_EXTENSION_I(HP_occlusion_test, pname);
- {
- FLUSH_VERTICES(ctx, _NEW_DEPTH);
- if (ctx->Depth.OcclusionTest)
- params[0] = ctx->OcclusionResult;
- else
- params[0] = ctx->OcclusionResultSaved;
- /* reset flag now */
- ctx->OcclusionResult = GL_FALSE;
- ctx->OcclusionResultSaved = GL_FALSE;
- return;
- }
- break;
case GL_PIXEL_TEXTURE_SGIS:
CHECK_EXTENSION_I(SGIS_pixel_texture, pname);
params[0] = BOOLEAN_TO_INT(ctx->Pixel.PixelTextureEnabled);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 4eedc03c7a8..aff4a0c922c 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -558,21 +558,6 @@ StateVars = [
"matrix[3]", "matrix[7]", "matrix[11]", "matrix[15]"],
"const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;", None ),
- # GL_HP_occlusion_test
- ( "GL_OCCLUSION_TEST_HP", GLboolean, ["ctx->Depth.OcclusionTest"], "",
- "HP_occlusion_test" ),
- ( "GL_OCCLUSION_TEST_RESULT_HP", GLboolean, [],
- """FLUSH_VERTICES(ctx, _NEW_DEPTH);
- if (ctx->Depth.OcclusionTest)
- params[0] = ctx->OcclusionResult;
- else
- params[0] = ctx->OcclusionResultSaved;
- /* reset flag now */
- ctx->OcclusionResult = GL_FALSE;
- ctx->OcclusionResultSaved = GL_FALSE;
- return;""",
- "HP_occlusion_test" ),
-
# GL_SGIS_pixel_texture
( "GL_PIXEL_TEXTURE_SGIS", GLboolean, ["ctx->Pixel.PixelTextureEnabled"],
"", "SGIS_pixel_texture" ),
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a91c64e2fed..2ec3868befb 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -7,7 +7,7 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5
*
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
*
@@ -584,7 +584,6 @@ struct gl_depthbuffer_attrib
GLclampd Clear; /**< Value to clear depth buffer to */
GLboolean Test; /**< Depth buffering enabled flag */
GLboolean Mask; /**< Depth buffer writable? */
- GLboolean OcclusionTest; /**< GL_HP_occlusion_test */
GLboolean BoundsTest; /**< GL_EXT_depth_bounds_test */
GLfloat BoundsMin, BoundsMax;/**< GL_EXT_depth_bounds_test */
};
@@ -2358,7 +2357,6 @@ struct gl_extensions
GLboolean ATI_texture_mirror_once;
GLboolean ATI_texture_env_combine3;
GLboolean ATI_fragment_shader;
- GLboolean HP_occlusion_test;
GLboolean IBM_rasterpos_clip;
GLboolean IBM_multimode_draw_arrays;
GLboolean MESA_pack_invert;
@@ -2836,8 +2834,6 @@ struct __GLcontextRec
struct gl_list_extensions ListExt; /**< driver dlist extensions */
- GLboolean OcclusionResult; /**< for GL_HP_occlusion_test */
- GLboolean OcclusionResultSaved; /**< for GL_HP_occlusion_test */
GLuint _Facing; /**< This is a hack for 2-sided stencil test.
*
* We don't have a better way to communicate this value from
diff --git a/src/mesa/main/occlude.c b/src/mesa/main/occlude.c
index bc61a475d66..3583e50703f 100644
--- a/src/mesa/main/occlude.c
+++ b/src/mesa/main/occlude.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.0.2
+ * Version: 6.5
*
- * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2005 Brian Paul 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"),
@@ -325,8 +325,6 @@ _mesa_init_occlude(GLcontext *ctx)
#if FEATURE_ARB_occlusion_query
ctx->Occlusion.QueryObjects = _mesa_NewHashTable();
#endif
- ctx->OcclusionResult = GL_FALSE;
- ctx->OcclusionResultSaved = GL_FALSE;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 01:30:53 +0000