From d2ab930046ae91987ee4e528e13ad06f8889f200 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 22 Jan 2009 10:29:24 -0700 Subject: docs: placeholder 7.5 release notes --- docs/relnotes-7.5.html | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 docs/relnotes-7.5.html (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html new file mode 100644 index 0000000000..0d54dff762 --- /dev/null +++ b/docs/relnotes-7.5.html @@ -0,0 +1,47 @@ + + +Mesa Release Notes + + + + + + + +

Mesa 7.5 Release Notes / date TBD

+ +

+Mesa 7.5 is a new development release. +

+

+Mesa 7.5 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +

+

+See the Compiling/Installing page for prerequisites +for DRI ardware acceleration. +

+ + +

MD5 checksums

+
+tbd
+
+ + +

New features

+ + + +

Bug fixes

+ + +

Changes

+ + + + -- cgit v1.2.3 From fb88b6df82900c5c8f3f8044be06c757e376b916 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 22 Jan 2009 15:51:12 -0700 Subject: docs: first 7.5 feature: GL_ARB_framebuffer_object --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 0d54dff762..235be4ba02 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -32,6 +32,7 @@ tbd

New features

-- cgit v1.2.3 From 6f8896c5999721e7ba95645af562c47be29cf138 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 23 Jan 2009 11:36:57 -0700 Subject: docs: document improved stencil support and GL_EXT_vertex_array_bgra --- docs/relnotes-7.5.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 235be4ba02..782d55829c 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -33,6 +33,10 @@ tbd

New features

  • GL_ARB_framebuffer_object extension (software drivers, i965 driver) +
  • Reworked two-sided stencil support. +This allows a driver to support all three variations of two-sided stencil +including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0 +
  • GL_EXT_vertex_array_bgra extension (software drivers, i965 driver)
-- cgit v1.2.3 From ea8d0aa94b9561b3df9b51222c549395b56a3103 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 23 Jan 2009 17:40:24 -0700 Subject: docs: added GL_NV_texture_env_combine4 --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 782d55829c..5e9d91de4f 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -37,6 +37,7 @@ tbd This allows a driver to support all three variations of two-sided stencil including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
  • GL_EXT_vertex_array_bgra extension (software drivers, i965 driver) +
  • GL_NV_texture_env_combine4 extension (software drivers, i965 driver) -- cgit v1.2.3 From f584752afefb06a17b10fc879f04c3b45bbc764b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 28 Jan 2009 15:06:54 -0700 Subject: docs: document GL_EXT_texture_swizzle --- docs/relnotes-7.5.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 5e9d91de4f..ef8759ba6a 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -37,7 +37,8 @@ tbd This allows a driver to support all three variations of two-sided stencil including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
  • GL_EXT_vertex_array_bgra extension (software drivers, i965 driver) -
  • GL_NV_texture_env_combine4 extension (software drivers, i965 driver) +
  • GL_NV_texture_env_combine4 extension (software drivers, i965/i915 drivers) +
  • GL_EXT_texture_swizzle extension (software drivers, i965 driver) -- cgit v1.2.3 From 26da28c995557c8b913e5ccfe31b31dc32e6c735 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 28 Jan 2009 16:49:28 -0700 Subject: mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_texture Everyone should be using the newer/better ARB versions of these extensions. --- docs/relnotes-7.5.html | 2 + src/mesa/main/attrib.c | 12 ++--- src/mesa/main/extensions.c | 7 +-- src/mesa/main/mtypes.h | 7 +-- src/mesa/main/texobj.c | 8 +--- src/mesa/main/texparam.c | 82 +++++---------------------------- src/mesa/main/texstate.c | 10 ---- src/mesa/shader/prog_statevars.c | 10 ++-- src/mesa/swrast/s_texfilter.c | 99 +--------------------------------------- 9 files changed, 29 insertions(+), 208 deletions(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index ef8759ba6a..621bd4afac 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -48,6 +48,8 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0

    Changes

      +
    • Remove support for GL_SGIX_shadow, GL_SGIX_shadow_ambient and +GL_SGIX_depth_texture extensions. Superseded by the ARB versions.
    diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 825c841ee2..3be7fd5a2d 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -820,15 +820,9 @@ pop_texture_group(GLcontext *ctx, struct texture_state *texstate) _mesa_TexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, obj->MaxAnisotropy); } - if (ctx->Extensions.SGIX_shadow) { - _mesa_TexParameteri(target, GL_TEXTURE_COMPARE_SGIX, - obj->CompareFlag); - _mesa_TexParameteri(target, GL_TEXTURE_COMPARE_OPERATOR_SGIX, - obj->CompareOperator); - } - if (ctx->Extensions.SGIX_shadow_ambient) { - _mesa_TexParameterf(target, GL_SHADOW_AMBIENT_SGIX, - obj->ShadowAmbient); + if (ctx->Extensions.ARB_shadow_ambient) { + _mesa_TexParameterf(target, GL_TEXTURE_COMPARE_FAIL_VALUE_ARB, + obj->CompareFailValue); } } diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 86144c42ad..4ebdb5d9ae 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -62,7 +62,7 @@ static const struct { { OFF, "GL_ARB_shading_language_100", F(ARB_shading_language_100) }, { OFF, "GL_ARB_shading_language_120", F(ARB_shading_language_120) }, { OFF, "GL_ARB_shadow", F(ARB_shadow) }, - { OFF, "GL_ARB_shadow_ambient", F(SGIX_shadow_ambient) }, + { OFF, "GL_ARB_shadow_ambient", F(ARB_shadow_ambient) }, { OFF, "GL_ARB_texture_border_clamp", F(ARB_texture_border_clamp) }, { OFF, "GL_ARB_texture_compression", F(ARB_texture_compression) }, { OFF, "GL_ARB_texture_cube_map", F(ARB_texture_cube_map) }, @@ -170,8 +170,6 @@ static const struct { { ON, "GL_SGIS_texture_edge_clamp", F(SGIS_texture_edge_clamp) }, { ON, "GL_SGIS_texture_lod", F(SGIS_texture_lod) }, { OFF, "GL_SGIX_depth_texture", F(ARB_depth_texture) }, - { OFF, "GL_SGIX_shadow", F(SGIX_shadow) }, - { OFF, "GL_SGIX_shadow_ambient", F(SGIX_shadow_ambient) }, { OFF, "GL_SUN_multi_draw_arrays", F(EXT_multi_draw_arrays) }, { OFF, "GL_S3_s3tc", F(S3_s3tc) }, }; @@ -214,6 +212,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx) ctx->Extensions.ARB_shading_language_120 = GL_FALSE; /* not quite done */ #endif ctx->Extensions.ARB_shadow = GL_TRUE; + ctx->Extensions.ARB_shadow_ambient = GL_TRUE; ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; ctx->Extensions.ARB_texture_cube_map = GL_TRUE; ctx->Extensions.ARB_texture_env_combine = GL_TRUE; @@ -302,8 +301,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx) ctx->Extensions.SGI_texture_color_table = GL_TRUE; ctx->Extensions.SGIS_generate_mipmap = GL_TRUE; ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE; - ctx->Extensions.SGIX_shadow = GL_TRUE; - ctx->Extensions.SGIX_shadow_ambient = GL_TRUE; #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE; #endif diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 8ab0d26f45..da243eceac 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1433,11 +1433,9 @@ struct gl_texture_object GLint BaseLevel; /**< min mipmap level, OpenGL 1.2 */ GLint MaxLevel; /**< max mipmap level, OpenGL 1.2 */ GLfloat MaxAnisotropy; /**< GL_EXT_texture_filter_anisotropic */ - GLboolean CompareFlag; /**< GL_SGIX_shadow */ - GLenum CompareOperator; /**< GL_SGIX_shadow */ - GLfloat ShadowAmbient; /**< GL_ARB_shadow_ambient */ GLenum CompareMode; /**< GL_ARB_shadow */ GLenum CompareFunc; /**< GL_ARB_shadow */ + GLfloat CompareFailValue; /**< GL_ARB_shadow_ambient */ GLenum _Function; /**< Comparison function derived from * \c CompareOperator, \c CompareMode, and * \c CompareFunc. @@ -2563,6 +2561,7 @@ struct gl_extensions GLboolean ARB_shading_language_100; GLboolean ARB_shading_language_120; GLboolean ARB_shadow; + GLboolean ARB_shadow_ambient; /* or GL_ARB_shadow_ambient */ GLboolean ARB_texture_border_clamp; GLboolean ARB_texture_compression; GLboolean ARB_texture_cube_map; @@ -2660,8 +2659,6 @@ struct gl_extensions GLboolean SGIS_generate_mipmap; GLboolean SGIS_texture_edge_clamp; GLboolean SGIS_texture_lod; - GLboolean SGIX_shadow; - GLboolean SGIX_shadow_ambient; /* or GL_ARB_shadow_ambient */ GLboolean TDFX_texture_compression_FXT1; GLboolean S3_s3tc; /*@}*/ diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index fad39a0634..4e6cf439fc 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -134,12 +134,10 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj, obj->BaseLevel = 0; obj->MaxLevel = 1000; obj->MaxAnisotropy = 1.0; - obj->CompareFlag = GL_FALSE; /* SGIX_shadow */ - obj->CompareOperator = GL_TEXTURE_LEQUAL_R_SGIX; /* SGIX_shadow */ obj->CompareMode = GL_NONE; /* ARB_shadow */ obj->CompareFunc = GL_LEQUAL; /* ARB_shadow */ + obj->CompareFailValue = 0.0F; /* ARB_shadow_ambient */ obj->DepthMode = GL_LUMINANCE; /* ARB_depth_texture */ - obj->ShadowAmbient = 0.0F; /* ARB/SGIX_shadow_ambient */ obj->Swizzle[0] = GL_RED; obj->Swizzle[1] = GL_GREEN; obj->Swizzle[2] = GL_BLUE; @@ -248,11 +246,9 @@ _mesa_copy_texture_object( struct gl_texture_object *dest, dest->BaseLevel = src->BaseLevel; dest->MaxLevel = src->MaxLevel; dest->MaxAnisotropy = src->MaxAnisotropy; - dest->CompareFlag = src->CompareFlag; - dest->CompareOperator = src->CompareOperator; - dest->ShadowAmbient = src->ShadowAmbient; dest->CompareMode = src->CompareMode; dest->CompareFunc = src->CompareFunc; + dest->CompareFailValue = src->CompareFailValue; dest->DepthMode = src->DepthMode; dest->_MaxLevel = src->_MaxLevel; dest->_MaxLambda = src->_MaxLambda; diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 41c914e5b3..f610fa8dda 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -260,30 +260,6 @@ set_tex_parameteri(GLcontext *ctx, texObj->MaxLevel = params[0]; return; - case GL_TEXTURE_COMPARE_SGIX: - if (ctx->Extensions.SGIX_shadow) { - FLUSH_VERTICES(ctx, _NEW_TEXTURE); - texObj->CompareFlag = params[0] ? GL_TRUE : GL_FALSE; - } - else { - _mesa_error(ctx, GL_INVALID_ENUM, - "glTexParameter(pname=GL_TEXTURE_COMPARE_SGIX)"); - } - return; - - case GL_TEXTURE_COMPARE_OPERATOR_SGIX: - if (ctx->Extensions.SGIX_shadow && - (params[0] == GL_TEXTURE_LEQUAL_R_SGIX || - params[0] == GL_TEXTURE_GEQUAL_R_SGIX)) { - FLUSH_VERTICES(ctx, _NEW_TEXTURE); - texObj->CompareOperator = params[0]; - } - else { - _mesa_error(ctx, GL_INVALID_ENUM, - "glTexParameter(GL_TEXTURE_COMPARE_OPERATOR_SGIX)"); - } - return; - case GL_GENERATE_MIPMAP_SGIS: if (ctx->Extensions.SGIS_generate_mipmap) { FLUSH_VERTICES(ctx, _NEW_TEXTURE); @@ -454,14 +430,14 @@ set_tex_parameterf(GLcontext *ctx, } return; - case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ - if (ctx->Extensions.SGIX_shadow_ambient) { + case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB: + if (ctx->Extensions.ARB_shadow_ambient) { FLUSH_VERTICES(ctx, _NEW_TEXTURE); - texObj->ShadowAmbient = CLAMP(params[0], 0.0F, 1.0F); + texObj->CompareFailValue = CLAMP(params[0], 0.0F, 1.0F); } else { _mesa_error(ctx, GL_INVALID_ENUM, - "glTexParameter(pname=GL_SHADOW_AMBIENT_SGIX)"); + "glTexParameter(pname=GL_TEXTURE_COMPARE_FAIL_VALUE_ARB)"); } return; @@ -512,8 +488,6 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param) case GL_TEXTURE_WRAP_R: case GL_TEXTURE_BASE_LEVEL: case GL_TEXTURE_MAX_LEVEL: - case GL_TEXTURE_COMPARE_SGIX: - case GL_TEXTURE_COMPARE_OPERATOR_SGIX: case GL_GENERATE_MIPMAP_SGIS: case GL_TEXTURE_COMPARE_MODE_ARB: case GL_TEXTURE_COMPARE_FUNC_ARB: @@ -556,8 +530,6 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params) case GL_TEXTURE_WRAP_R: case GL_TEXTURE_BASE_LEVEL: case GL_TEXTURE_MAX_LEVEL: - case GL_TEXTURE_COMPARE_SGIX: - case GL_TEXTURE_COMPARE_OPERATOR_SGIX: case GL_GENERATE_MIPMAP_SGIS: case GL_TEXTURE_COMPARE_MODE_ARB: case GL_TEXTURE_COMPARE_FUNC_ARB: @@ -613,7 +585,7 @@ _mesa_TexParameteri(GLenum target, GLenum pname, GLint param) case GL_TEXTURE_PRIORITY: case GL_TEXTURE_MAX_ANISOTROPY_EXT: case GL_TEXTURE_LOD_BIAS: - case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ + case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB: { GLfloat fparam = (GLfloat) param; /* convert int param to float */ @@ -662,7 +634,7 @@ _mesa_TexParameteriv(GLenum target, GLenum pname, const GLint *params) case GL_TEXTURE_PRIORITY: case GL_TEXTURE_MAX_ANISOTROPY_EXT: case GL_TEXTURE_LOD_BIAS: - case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ + case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB: { /* convert int param to float */ GLfloat fparam = (GLfloat) params[0]; @@ -1060,23 +1032,9 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) else error = GL_TRUE; break; - case GL_TEXTURE_COMPARE_SGIX: - if (ctx->Extensions.SGIX_shadow) { - *params = (GLfloat) obj->CompareFlag; - } - else - error = GL_TRUE; - break; - case GL_TEXTURE_COMPARE_OPERATOR_SGIX: - if (ctx->Extensions.SGIX_shadow) { - *params = (GLfloat) obj->CompareOperator; - } - else - error = GL_TRUE; - break; - case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ - if (ctx->Extensions.SGIX_shadow_ambient) { - *params = obj->ShadowAmbient; + case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB: + if (ctx->Extensions.ARB_shadow_ambient) { + *params = obj->CompareFailValue; } else error = GL_TRUE; @@ -1248,25 +1206,9 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) error = GL_TRUE; } break; - case GL_TEXTURE_COMPARE_SGIX: - if (ctx->Extensions.SGIX_shadow) { - *params = (GLint) obj->CompareFlag; - } - else { - error = GL_TRUE; - } - break; - case GL_TEXTURE_COMPARE_OPERATOR_SGIX: - if (ctx->Extensions.SGIX_shadow) { - *params = (GLint) obj->CompareOperator; - } - else { - error = GL_TRUE; - } - break; - case GL_SHADOW_AMBIENT_SGIX: /* aka GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ - if (ctx->Extensions.SGIX_shadow_ambient) { - *params = (GLint) FLOAT_TO_INT(obj->ShadowAmbient); + case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB: + if (ctx->Extensions.ARB_shadow_ambient) { + *params = (GLint) FLOAT_TO_INT(obj->CompareFailValue); } else { error = GL_TRUE; diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 7cddec0bce..f7a4d8b323 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -404,16 +404,6 @@ update_texture_compare_function(GLcontext *ctx, */ tObj->_Function = GL_NONE; } - else if (tObj->CompareFlag) { - /* GL_SGIX_shadow */ - if (tObj->CompareOperator == GL_TEXTURE_LEQUAL_R_SGIX) { - tObj->_Function = GL_LEQUAL; - } - else { - ASSERT(tObj->CompareOperator == GL_TEXTURE_GEQUAL_R_SGIX); - tObj->_Function = GL_GEQUAL; - } - } else if (tObj->CompareMode == GL_COMPARE_R_TO_TEXTURE_ARB) { /* GL_ARB_shadow */ tObj->_Function = tObj->CompareFunc; diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c index 615826b210..3ce60427bf 100644 --- a/src/mesa/shader/prog_statevars.c +++ b/src/mesa/shader/prog_statevars.c @@ -493,10 +493,10 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[], const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current; if (texObj) { - value[0] = texObj->ShadowAmbient; - value[1] = texObj->ShadowAmbient; - value[2] = texObj->ShadowAmbient; - value[3] = texObj->ShadowAmbient; + value[0] = + value[1] = + value[2] = + value[3] = texObj->CompareFailValue; } } return; @@ -777,7 +777,7 @@ append_token(char *dst, gl_state_index k) append(dst, "PCMbias"); break; case STATE_SHADOW_AMBIENT: - append(dst, "ShadowAmbient"); + append(dst, "CompareFailValue"); break; default: /* probably STATE_INTERNAL_DRIVER+i (driver private state) */ diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c index a095b255ab..8d72018cf4 100644 --- a/src/mesa/swrast/s_texfilter.c +++ b/src/mesa/swrast/s_texfilter.c @@ -2826,7 +2826,7 @@ sample_depth_texture( GLcontext *ctx, tObj->Target == GL_TEXTURE_1D_ARRAY_EXT || tObj->Target == GL_TEXTURE_2D_ARRAY_EXT); - UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->ShadowAmbient); + UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->CompareFailValue); /* XXXX if tObj->MinFilter != tObj->MagFilter, we're ignoring lambda */ @@ -3156,103 +3156,6 @@ sample_depth_texture( GLcontext *ctx, } -#if 0 -/* - * Experimental depth texture sampling function. - */ -static void -sample_depth_texture2(const GLcontext *ctx, - const struct gl_texture_unit *texUnit, - GLuint n, const GLfloat texcoords[][4], - GLchan texel[][4]) -{ - const struct gl_texture_object *texObj = texUnit->_Current; - const GLint baseLevel = texObj->BaseLevel; - const struct gl_texture_image *texImage = texObj->Image[0][baseLevel]; - const GLuint width = texImage->Width; - const GLuint height = texImage->Height; - GLchan ambient; - GLboolean lequal, gequal; - - if (texObj->Target != GL_TEXTURE_2D) { - _mesa_problem(ctx, "only 2-D depth textures supported at this time"); - return; - } - - if (texObj->MinFilter != texObj->MagFilter) { - _mesa_problem(ctx, "mipmapped depth textures not supported at this time"); - return; - } - - /* XXX the GL_SGIX_shadow extension spec doesn't say what to do if - * GL_TEXTURE_COMPARE_SGIX == GL_TRUE but the current texture object - * isn't a depth texture. - */ - if (texImage->TexFormat->BaseFormat != GL_DEPTH_COMPONENT) { - _mesa_problem(ctx,"GL_TEXTURE_COMPARE_SGIX enabled with non-depth texture"); - return; - } - - UNCLAMPED_FLOAT_TO_CHAN(ambient, tObj->ShadowAmbient); - - if (texObj->CompareOperator == GL_TEXTURE_LEQUAL_R_SGIX) { - lequal = GL_TRUE; - gequal = GL_FALSE; - } - else { - lequal = GL_FALSE; - gequal = GL_TRUE; - } - - { - GLuint i; - for (i = 0; i < n; i++) { - const GLint K = 3; - GLint col, row, ii, jj, imin, imax, jmin, jmax, samples, count; - GLfloat w; - GLchan lum; - col = nearest_texel_location(texObj->WrapS, img, width, - texcoords[i][0]); - row = nearest_texel_location(texObj->WrapT, img, height, - texcoords[i][1]); - - imin = col - K; - imax = col + K; - jmin = row - K; - jmax = row + K; - - if (imin < 0) imin = 0; - if (imax >= width) imax = width - 1; - if (jmin < 0) jmin = 0; - if (jmax >= height) jmax = height - 1; - - samples = (imax - imin + 1) * (jmax - jmin + 1); - count = 0; - for (jj = jmin; jj <= jmax; jj++) { - for (ii = imin; ii <= imax; ii++) { - GLfloat depthSample; - texImage->FetchTexelf(texImage, ii, jj, 0, &depthSample); - if ((depthSample <= r[i] && lequal) || - (depthSample >= r[i] && gequal)) { - count++; - } - } - } - - w = (GLfloat) count / (GLfloat) samples; - w = CHAN_MAXF - w * (CHAN_MAXF - (GLfloat) ambient); - lum = (GLint) w; - - texel[i][RCOMP] = lum; - texel[i][GCOMP] = lum; - texel[i][BCOMP] = lum; - texel[i][ACOMP] = CHAN_MAX; - } - } -} -#endif - - /** * We use this function when a texture object is in an "incomplete" state. * When a fragment program attempts to sample an incomplete texture we -- cgit v1.2.3 From 7d399bf0626a55fa2a124dcf09135464cc87baa1 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 26 Feb 2009 18:37:26 -0700 Subject: docs: add SPARC assembly updates --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 621bd4afac..f29553b0fb 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -39,6 +39,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
  • GL_EXT_vertex_array_bgra extension (software drivers, i965 driver)
  • GL_NV_texture_env_combine4 extension (software drivers, i965/i915 drivers)
  • GL_EXT_texture_swizzle extension (software drivers, i965 driver) +
  • Updated SPARC assembly optimizations (David S. Miller) -- cgit v1.2.3 From ce01de507563685d4cac4ec45b74e6214887ffc3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 7 Apr 2009 18:23:21 -0600 Subject: docs: more info for 7.4 release notes --- docs/relnotes-7.5.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index f29553b0fb..3c822da863 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -12,6 +12,13 @@

    Mesa 7.5 is a new development release. +People who are concerned with stability and reliability should stick +with the 7.4.x branch or wait for Mesa 7.6. +

    +

    +The main new feature of Mesa 7.5 is the +Gallium3D infrastructure.

    Mesa 7.5 implements the OpenGL 2.1 API, but the version reported by @@ -32,6 +39,17 @@ tbd

    New features

      +
    • Gallium - this is the new architecture for OS-independent and + API-independent 3D drivers. + Gallium3D is intended for GPUs that fully support vertex/fragment shaders. + The Gallium3D drivers currently included are: +
        +
      • softpipe - a software/reference driver +
      • i915 - Intel 915/945 driver +
      • Cell - IBM/Sony/Toshiba Cell processor driver +
      • nouveau - preliminary driver for NVIDIA GPUs (still under development) +
      • r300 - preliminary driver for R300 (still under development) +
    • GL_ARB_framebuffer_object extension (software drivers, i965 driver)
    • Reworked two-sided stencil support. This allows a driver to support all three variations of two-sided stencil @@ -45,8 +63,10 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0

      Bug fixes

        +
      • Lots of i965 driver bug fixes
      +

      Changes

      • Remove support for GL_SGIX_shadow, GL_SGIX_shadow_ambient and -- cgit v1.2.3 From a902b6ba48c8ff8bebda95e32310781d9a0763ce Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 16 Apr 2009 10:28:15 -0600 Subject: docs: separate compilation units in 7.5 --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 3c822da863..c75720b699 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -58,6 +58,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
      • GL_NV_texture_env_combine4 extension (software drivers, i965/i915 drivers)
      • GL_EXT_texture_swizzle extension (software drivers, i965 driver)
      • Updated SPARC assembly optimizations (David S. Miller) +
      • Initial support for separate compilation units in GLSL compiler.
      -- cgit v1.2.3 From c953f6620c617feceb79f42c56d08c6df0796f76 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 18 Apr 2009 13:16:35 -0600 Subject: docs: removed/added demo programs --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index c75720b699..bfeea3f433 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -72,6 +72,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
      • Remove support for GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_texture extensions. Superseded by the ARB versions. +
      • Omittd some old Mesa demos from the release tarballs, added some others.
      -- cgit v1.2.3 From 675b1cacf7e41310771791b15f3d44bd3eb9b70e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 30 Apr 2009 17:11:20 -0600 Subject: docs: notes about new version number meaning in release notes --- docs/relnotes-7.5.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index bfeea3f433..27c64b42b6 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -27,7 +27,14 @@ Some drivers don't support all the features required in OpenGL 2.1.

      See the Compiling/Installing page for prerequisites -for DRI ardware acceleration. +for DRI hardware acceleration. +

      +

      +Note that the Mesa project is no longer using odd/even version numbers +to indicate development/stable releases. +The so-called development releases have been fairly stable. +If you're especially concerned with stability you should probably look for +"point" releases such as 7.5.1 which will be a bug-fix release.

      -- cgit v1.2.3 From e4e7ecc221fc1ed5714ac4c13e5cea204d37c6ad Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 30 Apr 2009 17:17:31 -0600 Subject: docs: asst. updates for 7.5 release --- docs/download.html | 6 ------ docs/news.html | 6 ++++++ docs/relnotes-7.5.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/download.html b/docs/download.html index 37b0b3da47..cf1cc21d37 100644 --- a/docs/download.html +++ b/docs/download.html @@ -8,12 +8,6 @@

      Downloading

      -

      -Current development release: 7.3 -
      -Last stable release: 7.2 -

      -

      Primary download site: News +

      May tbd, 2009

      +

      +Mesa 7.5 is released. +

      + +

      April 18, 2009

      Mesa 7.4.1 is released. diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 27c64b42b6..c10ccd7a5c 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -13,7 +13,7 @@

      Mesa 7.5 is a new development release. People who are concerned with stability and reliability should stick -with the 7.4.x branch or wait for Mesa 7.6. +with the 7.4.x branch or wait for Mesa 7.5.1.

      The main new feature of Mesa 7.5 is the -- cgit v1.2.3 From edd2bbe4a70fcb9f8e8365f19c1aba6deb4a272d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 30 Apr 2009 17:27:51 -0600 Subject: docs: fix typo --- docs/relnotes-7.5.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index c10ccd7a5c..3de243d1b2 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -79,7 +79,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0

      • Remove support for GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_texture extensions. Superseded by the ARB versions. -
      • Omittd some old Mesa demos from the release tarballs, added some others. +
      • Omitted some old Mesa demos from the release tarballs, added some others.
      -- cgit v1.2.3 From da0d4e1db67d7641a535218de2db5f7bb00a6bb8 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 18 May 2009 07:17:36 -0600 Subject: docs: emphasize the incomplete status of the nouveau/R300 gallium drivers --- docs/relnotes-7.5.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 3de243d1b2..d47b21d827 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -46,7 +46,7 @@ tbd

      New features

        -
      • Gallium - this is the new architecture for OS-independent and +
      • Gallium3D - this is the new architecture for OS-independent and API-independent 3D drivers. Gallium3D is intended for GPUs that fully support vertex/fragment shaders. The Gallium3D drivers currently included are: @@ -54,8 +54,10 @@ tbd
      • softpipe - a software/reference driver
      • i915 - Intel 915/945 driver
      • Cell - IBM/Sony/Toshiba Cell processor driver -
      • nouveau - preliminary driver for NVIDIA GPUs (still under development) -
      • r300 - preliminary driver for R300 (still under development) +
      • nouveau (for NVIDIA GPUs) and R300 for (AMD/ATI R300). + PLEASE NOTE: these drivers are incomplete and still under development. + It's probably NOT worthwhile to report any bugs unless you have patches. +
    • GL_ARB_framebuffer_object extension (software drivers, i965 driver)
    • Reworked two-sided stencil support. -- cgit v1.2.3 From 5450281ff75eab0cccdf7a926aed7e04132d3c95 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 9 Jun 2009 11:56:12 -0600 Subject: docs: document GLSL preprocessor fixes --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index d47b21d827..663626cb05 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -74,6 +74,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0

      Bug fixes

      • Lots of i965 driver bug fixes +
      • Fixed some GLSL preprocessor bugs
      -- cgit v1.2.3 From 62ad606065312cecb1e2dcad0ad2cadf402f0b5c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 26 Jun 2009 13:15:17 -0600 Subject: docs: document for/continue bug fix --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 663626cb05..9aee030d09 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -75,6 +75,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
      • Lots of i965 driver bug fixes
      • Fixed some GLSL preprocessor bugs +
      • GLSL: continue inside of a for-loop didn't work
      -- cgit v1.2.3 From dd585db687f700de465fe78f9937eb785805e756 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 26 Jun 2009 16:41:54 -0600 Subject: docs: increase max varying vars to 16 --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 9aee030d09..d0dba30528 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -68,6 +68,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
    • GL_EXT_texture_swizzle extension (software drivers, i965 driver)
    • Updated SPARC assembly optimizations (David S. Miller)
    • Initial support for separate compilation units in GLSL compiler. +
    • Increased max number of generic GLSL varying variables to 16 (formerly 8).
    -- cgit v1.2.3 From 418987ff05f892d3c33ed4ddbe856c496b05ea14 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 26 Jun 2009 16:54:44 -0600 Subject: docs: detect when too many varying vars are used --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index d0dba30528..045692113d 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -69,6 +69,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
  • Updated SPARC assembly optimizations (David S. Miller)
  • Initial support for separate compilation units in GLSL compiler.
  • Increased max number of generic GLSL varying variables to 16 (formerly 8). +
  • GLSL linker now detects when too many varying variables are used. -- cgit v1.2.3 From 36e906aad6d0520db00cc5112fd015497465bc87 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 8 Jul 2009 14:14:03 -0600 Subject: docs: document glMaterial/glShadeModel display list optimization --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 045692113d..541a0f802a 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -70,6 +70,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
  • Initial support for separate compilation units in GLSL compiler.
  • Increased max number of generic GLSL varying variables to 16 (formerly 8).
  • GLSL linker now detects when too many varying variables are used. +
  • Optimize-out redundant glMaterial and glShadeModel calls in display lists -- cgit v1.2.3 From 78af70be3727945d2d81a07b99d5a794f1114c05 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 9 Jul 2009 08:04:07 -0600 Subject: docs: document gl_TextureMatrix[i][j] array indexing bug fix --- docs/relnotes-7.5.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 541a0f802a..5a67d3fb52 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -71,6 +71,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
  • Increased max number of generic GLSL varying variables to 16 (formerly 8).
  • GLSL linker now detects when too many varying variables are used.
  • Optimize-out redundant glMaterial and glShadeModel calls in display lists +
  • Fixed gl_TextureMatrix[i][j] array indexing bug in GLSL compiler. -- cgit v1.2.3 From 8c6e81f97dba8c4a108f63a2236915443db6c3cd Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 17 Jul 2009 09:40:28 -0600 Subject: docs: update links to Gallium wiki page on freedesktop.org --- docs/cell.html | 2 +- docs/news.html | 2 +- docs/relnotes-7.5.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/cell.html b/docs/cell.html index ada903cf8a..30626b60b4 100644 --- a/docs/cell.html +++ b/docs/cell.html @@ -12,7 +12,7 @@ The Mesa Cell driver is part of the -Gallium3D +Gallium3D architecture. Tungsten Graphics did the original implementation of the Cell driver.

    diff --git a/docs/news.html b/docs/news.html index ee4a86c2a2..f29f95419f 100644 --- a/docs/news.html +++ b/docs/news.html @@ -99,7 +99,7 @@ Added a new page describing the Mesa Cell driver.

    Gallium3D is the codename for the new Mesa device driver architecture which is currently under development. -A summary of the architecture can be found on the Tungsten Graphics website.

    diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 5a67d3fb52..42b9168548 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -17,7 +17,7 @@ with the 7.4.x branch or wait for Mesa 7.5.1.

    The main new feature of Mesa 7.5 is the -Gallium3D infrastructure.

    -- cgit v1.2.3 From 7fd367467273382aeca5952b12111932766279fb Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 17 Jul 2009 12:40:24 -0600 Subject: docs: set date for 7.5 release --- docs/relnotes-7.5.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 42b9168548..8bcacd62e1 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -8,7 +8,7 @@ -

    Mesa 7.5 Release Notes / date TBD

    +

    Mesa 7.5 Release Notes / 17 July 2009

    Mesa 7.5 is a new development release. -- cgit v1.2.3 From 25e371fb7bd68ca9aba258a89d0d339b5901e1d3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 17 Jul 2009 16:58:27 -0600 Subject: docs: 7.5 tarball md5sums --- docs/relnotes-7.5.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docs/relnotes-7.5.html') diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 8bcacd62e1..56deca6a86 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -40,7 +40,15 @@ If you're especially concerned with stability you should probably look for

    MD5 checksums

    -tbd
+553fd956e544727f30fbe249619b6286  MesaLib-7.5.tar.gz
+459f332551f6ebb86f384d21dd15e1f0  MesaLib-7.5.tar.bz2
+8c02c0e17a9025250d20424ae32f5163  MesaLib-7.5.zip
+a188da2886fa5496ea0c2cda602b2eeb  MesaDemos-7.5.tar.gz
+398ee8801814a00e47f6c2314e3dfddc  MesaDemos-7.5.tar.bz2
+15a0c8ae013c54335a26335e1a98d609  MesaDemos-7.5.zip
+81010147def5a644ba14f9bbb7a49a2a  MesaGLUT-7.5.tar.gz
+baa7a1e850b6e39bae58868fd0684004  MesaGLUT-7.5.tar.bz2
+265228418e4423fa328f2f5b7970cf08  MesaGLUT-7.5.zip
    -- cgit v1.2.3