At this point, all uses have been replaced by the more general hook QueryInternalFormat, introduced by ARB_internalformat_query2. --- src/mesa/drivers/common/driverfuncs.c | 1 - src/mesa/main/dd.h | 18 ------------------ src/mesa/main/formatquery.c | 14 -------------- 3 files changed, 33 deletions(-)
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index e6334d8..e96f92a 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -90,7 +90,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver) /* Texture functions */ driver->ChooseTextureFormat = _mesa_choose_tex_format; - driver->QuerySamplesForFormat = _mesa_query_samples_for_format; driver->QueryInternalFormat = _mesa_query_internal_format_default; driver->TexImage = _mesa_store_teximage; driver->TexSubImage = _mesa_store_texsubimage; diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index ae5fad6..c26aa93 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -174,24 +174,6 @@ struct dd_function_table { GLenum srcFormat, GLenum srcType ); /** - * Determine sample counts support for a particular target and format - * - * \param ctx GL context - * \param target GL target enum - * \param internalFormat GL format enum - * \param samples Buffer to hold the returned sample counts. - * Drivers \b must \b not return more than 16 counts. - * - * \returns - * The number of sample counts actually written to \c samples. If - * \c internaFormat is not renderable, zero is returned. - */ - size_t (*QuerySamplesForFormat)(struct gl_context *ctx, - GLenum target, - GLenum internalFormat, - int samples[16]); - - /** * Queries different driver parameters for a particular target and format. * Since ARB_internalformat_query2 introduced several new query parameters * over ARB_internalformat_query, having one driver hook for each parameter diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c index 79f7549..13de970 100644 --- a/src/mesa/main/formatquery.c +++ b/src/mesa/main/formatquery.c @@ -29,20 +29,6 @@ #include "fbobject.h" #include "formatquery.h" -/* default implementation of QuerySamplesForFormat driverfunc, for - * non-multisample-capable drivers. */ -size_t -_mesa_query_samples_for_format(struct gl_context *ctx, GLenum target, - GLenum internalFormat, int samples[16]) -{ - (void) target; - (void) internalFormat; - (void) ctx; - - samples[0] = 1; - return 1; -} - /* default implementation of QueryInternalFormat driverfunc, for * drivers not implementing ARB_internalformat_query2. */ -- 2.5.3 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev