Mesa (master): i965: Don' t override NewFramebuffer just to call _mesa_new_framebuffer

Ian Romanick idr at kemper.freedesktop.org
Tue Oct 6 19:19:47 UTC 2015


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

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

i965: Don't override NewFramebuffer just to call _mesa_new_framebuffer

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

---

 src/mesa/drivers/dri/i965/intel_buffers.h |    2 --
 src/mesa/drivers/dri/i965/intel_fbo.c     |   14 --------------
 2 files changed, 16 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_buffers.h b/src/mesa/drivers/dri/i965/intel_buffers.h
index 85f54b2..016039a 100644
--- a/src/mesa/drivers/dri/i965/intel_buffers.h
+++ b/src/mesa/drivers/dri/i965/intel_buffers.h
@@ -30,8 +30,6 @@
 #include "drm.h"
 #include "brw_context.h"
 
-struct intel_framebuffer;
-
 extern void intelInitBufferFuncs(struct dd_function_table *functions);
 
 bool brw_is_front_buffer_reading(struct gl_framebuffer *fb);
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index 6b2349e..5a6b0dd 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -52,19 +52,6 @@
 
 #define FILE_DEBUG_FLAG DEBUG_FBO
 
-/**
- * Create a new framebuffer object.
- */
-static struct gl_framebuffer *
-intel_new_framebuffer(struct gl_context * ctx, GLuint name)
-{
-   /* Only drawable state in intel_framebuffer at this time, just use Mesa's
-    * class
-    */
-   return _mesa_new_framebuffer(ctx, name);
-}
-
-
 /** Called by gl_renderbuffer::Delete() */
 static void
 intel_delete_renderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb)
@@ -1093,7 +1080,6 @@ void
 intel_fbo_init(struct brw_context *brw)
 {
    struct dd_function_table *dd = &brw->ctx.Driver;
-   dd->NewFramebuffer = intel_new_framebuffer;
    dd->NewRenderbuffer = intel_new_renderbuffer;
    dd->MapRenderbuffer = intel_map_renderbuffer;
    dd->UnmapRenderbuffer = intel_unmap_renderbuffer;




More information about the mesa-commit mailing list