Mesa (master): st/mesa: Don' t override NewFramebuffer just to call _mesa_new_framebuffer

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 5c4ef9f1d2ae6a1824119aa246eaea727e294e3a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c4ef9f1d2ae6a1824119aa246eaea727e294e3a

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Oct  6 10:55:40 2015 -0700

st/mesa: Don't override NewFramebuffer just to call _mesa_new_framebuffer

v2: Since state_tracker does not call _mesa_init_driver_functions, we
need to initialize the dd::NewFramebuffer pointer to
_mesa_new_framebuffer here.  Suggested by Brian.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/state_tracker/st_cb_fbo.c |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 9d06a23..ff703fa 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -246,17 +246,6 @@ st_renderbuffer_delete(struct gl_context *ctx, struct gl_renderbuffer *rb)
 
 
 /**
- * Called via ctx->Driver.NewFramebuffer()
- */
-static struct gl_framebuffer *
-st_new_framebuffer(struct gl_context *ctx, GLuint name)
-{
-   /* XXX not sure we need to subclass gl_framebuffer for pipe */
-   return _mesa_new_framebuffer(ctx, name);
-}
-
-
-/**
  * Called via ctx->Driver.NewRenderbuffer()
  */
 static struct gl_renderbuffer *
@@ -826,7 +815,7 @@ st_UnmapRenderbuffer(struct gl_context *ctx,
 
 void st_init_fbo_functions(struct dd_function_table *functions)
 {
-   functions->NewFramebuffer = st_new_framebuffer;
+   functions->NewFramebuffer = _mesa_new_framebuffer;
    functions->NewRenderbuffer = st_new_renderbuffer;
    functions->FramebufferRenderbuffer = _mesa_FramebufferRenderbuffer_sw;
    functions->RenderTexture = st_render_texture;