mesa: Completely remove QuerySamplesForFormat from driver func table

At this point, all uses have been replaced by the more general hook
QueryInternalFormat, introduced by ARB_internalformat_query2.

Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index e6334d8969b58f6840c32e0f73f4f61504fc607f..e96f92af5bb98b12e1a62de5f04b4323dc36787d 100644 (file)
--- 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 2f151c2965492eff0381e6ff77587bc28acb7d70..60bc8ef44117ec42835289632108887b7d13053b 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -183,24 +183,6 @@ struct dd_function_table {
                                       GLenum target, GLint internalFormat,
                                       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

diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c
index 21d10a8e79cc4cb4e5e95d86d5b5b918599bbf3f..a7f053e3c94a36713ed63cfaa8e4ec029e317557 100644 (file)
--- 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.
  */