[Mesa-dev,06/23] mesa: remove Driver.ResizeBuffers

Submitted by Marek Olšák on Sept. 27, 2015, 10:20 p.m.

Details

Message ID 1443392452-668-7-git-send-email-maraeo@gmail.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Marek Olšák Sept. 27, 2015, 10:20 p.m.
From: Marek Olšák <marek.olsak@amd.com>

Nothing overrides it.
---
 src/mesa/drivers/common/driverfuncs.c  | 1 -
 src/mesa/drivers/dri/common/dri_util.c | 3 ++-
 src/mesa/main/dd.h                     | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 6fe42b1..d619551 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -75,7 +75,6 @@  _mesa_init_driver_functions(struct dd_function_table *driver)
 
    driver->GetString = NULL;  /* REQUIRED! */
    driver->UpdateState = NULL;  /* REQUIRED! */
-   driver->ResizeBuffers = _mesa_resize_framebuffer;
 
    driver->Finish = NULL;
    driver->Flush = NULL;
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index d35ac26..5cfa2f8 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -44,6 +44,7 @@ 
 #include "utils.h"
 #include "xmlpool.h"
 #include "main/mtypes.h"
+#include "main/framebuffer.h"
 #include "main/version.h"
 #include "main/errors.h"
 #include "main/macros.h"
@@ -793,7 +794,7 @@  driUpdateFramebufferSize(struct gl_context *ctx, const __DRIdrawable *dPriv)
 {
    struct gl_framebuffer *fb = (struct gl_framebuffer *) dPriv->driverPrivate;
    if (fb && (dPriv->w != fb->Width || dPriv->h != fb->Height)) {
-      ctx->Driver.ResizeBuffers(ctx, fb, dPriv->w, dPriv->h);
+      _mesa_resize_framebuffer(ctx, fb, dPriv->w, dPriv->h);
       /* if the driver needs the hw lock for ResizeBuffers, the drawable
          might have changed again by now */
       assert(fb->Width == dPriv->w);
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index c35c7aa..e43ed50 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -94,13 +94,6 @@  struct dd_function_table {
    void (*UpdateState)( struct gl_context *ctx, GLbitfield new_state );
 
    /**
-    * Resize the given framebuffer to the given size.
-    * XXX OBSOLETE: this function will be removed in the future.
-    */
-   void (*ResizeBuffers)( struct gl_context *ctx, struct gl_framebuffer *fb,
-                          GLuint width, GLuint height);
-
-   /**
     * This is called whenever glFinish() is called.
     */
    void (*Finish)( struct gl_context *ctx );

Comments

On 09/27/2015 04:20 PM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak@amd.com>
>
> Nothing overrides it.
> ---
>   src/mesa/drivers/common/driverfuncs.c  | 1 -
>   src/mesa/drivers/dri/common/dri_util.c | 3 ++-
>   src/mesa/main/dd.h                     | 7 -------
>   3 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
> index 6fe42b1..d619551 100644
> --- a/src/mesa/drivers/common/driverfuncs.c
> +++ b/src/mesa/drivers/common/driverfuncs.c
> @@ -75,7 +75,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
>
>      driver->GetString = NULL;  /* REQUIRED! */
>      driver->UpdateState = NULL;  /* REQUIRED! */
> -   driver->ResizeBuffers = _mesa_resize_framebuffer;
>
>      driver->Finish = NULL;
>      driver->Flush = NULL;
> diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
> index d35ac26..5cfa2f8 100644
> --- a/src/mesa/drivers/dri/common/dri_util.c
> +++ b/src/mesa/drivers/dri/common/dri_util.c
> @@ -44,6 +44,7 @@
>   #include "utils.h"
>   #include "xmlpool.h"
>   #include "main/mtypes.h"
> +#include "main/framebuffer.h"
>   #include "main/version.h"
>   #include "main/errors.h"
>   #include "main/macros.h"
> @@ -793,7 +794,7 @@ driUpdateFramebufferSize(struct gl_context *ctx, const __DRIdrawable *dPriv)
>   {
>      struct gl_framebuffer *fb = (struct gl_framebuffer *) dPriv->driverPrivate;
>      if (fb && (dPriv->w != fb->Width || dPriv->h != fb->Height)) {
> -      ctx->Driver.ResizeBuffers(ctx, fb, dPriv->w, dPriv->h);
> +      _mesa_resize_framebuffer(ctx, fb, dPriv->w, dPriv->h);
>         /* if the driver needs the hw lock for ResizeBuffers, the drawable
>            might have changed again by now */
>         assert(fb->Width == dPriv->w);
> diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
> index c35c7aa..e43ed50 100644
> --- a/src/mesa/main/dd.h
> +++ b/src/mesa/main/dd.h
> @@ -94,13 +94,6 @@ struct dd_function_table {
>      void (*UpdateState)( struct gl_context *ctx, GLbitfield new_state );
>
>      /**
> -    * Resize the given framebuffer to the given size.
> -    * XXX OBSOLETE: this function will be removed in the future.
> -    */
> -   void (*ResizeBuffers)( struct gl_context *ctx, struct gl_framebuffer *fb,
> -                          GLuint width, GLuint height);
> -
> -   /**
>       * This is called whenever glFinish() is called.
>       */
>      void (*Finish)( struct gl_context *ctx );
>

The comment mentioning "ctx->Driver.ResizeBuffers()" in framebuffer.c 
should probably be updated/removed.


FWIW, I believe Keith created all the driver hooks related to display 
lists / VBO to try to keep the details of the VBO code out of the main 
Mesa code (as with tnl, swrast, etc).  I'm fine with with removing them 
though.  If anything, it's easier to follow the code with the direct 
calls to vbo_*().

For the series, Reviewed-by: Brian Paul <brianp@vmware.com>

-Brian