Mesa (master): nouveau: take ownership rather than adding reference for new renderbuffers

Timothy Arceri tarceri at kemper.freedesktop.org
Mon Apr 10 01:06:08 UTC 2017


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Sat Apr  8 10:26:34 2017 +1000

nouveau: take ownership rather than adding reference for new renderbuffers

This avoids locking in the reference calls and fixes a leak after the
RefCount initialisation was change from 0 to 1.

Fixes: 32141e53d1520 (mesa: tidy up renderbuffer RefCount initialisation)

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/mesa/drivers/dri/nouveau/nouveau_screen.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 1f4cbe8a61..2dbd9d13b6 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -259,27 +259,27 @@ nouveau_create_buffer(__DRIscreen *dri_screen,
 
 	/* Front buffer. */
 	rb = nouveau_renderbuffer_dri_new(color_format, drawable);
-	_mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, rb);
+	_mesa_add_renderbuffer_without_ref(fb, BUFFER_FRONT_LEFT, rb);
 
 	/* Back buffer */
 	if (visual->doubleBufferMode) {
 		rb = nouveau_renderbuffer_dri_new(color_format, drawable);
-		_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, rb);
+		_mesa_add_renderbuffer_without_ref(fb, BUFFER_BACK_LEFT, rb);
 	}
 
 	/* Depth/stencil buffer. */
 	if (visual->depthBits == 24 && visual->stencilBits == 8) {
 		rb = nouveau_renderbuffer_dri_new(GL_DEPTH24_STENCIL8_EXT, drawable);
-		_mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
+		_mesa_add_renderbuffer_without_ref(fb, BUFFER_DEPTH, rb);
 		_mesa_add_renderbuffer(fb, BUFFER_STENCIL, rb);
 
 	} else if (visual->depthBits == 24) {
 		rb = nouveau_renderbuffer_dri_new(GL_DEPTH_COMPONENT24, drawable);
-		_mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
+		_mesa_add_renderbuffer_without_ref(fb, BUFFER_DEPTH, rb);
 
 	} else if (visual->depthBits == 16) {
 		rb = nouveau_renderbuffer_dri_new(GL_DEPTH_COMPONENT16, drawable);
-		_mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
+		_mesa_add_renderbuffer_without_ref(fb, BUFFER_DEPTH, rb);
 	}
 
 	/* Software renderbuffers. */




More information about the mesa-commit mailing list