[Mesa-dev] [PATCH 5/9] radeon: take ownership rather than adding reference for new renderbuffers

[Timothy Arceri]

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)
---
 src/mesa/drivers/dri/radeon/radeon_screen.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c 
b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 0690134..fab2eea 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -670,49 +670,49 @@ radeonCreateBuffer( __DRIscreen *driScrnPriv,
 
     if (mesaVis->redBits == 5)
         rgbFormat = _mesa_little_endian() ? MESA_FORMAT_B5G6R5_UNORM : 
MESA_FORMAT_R5G6B5_UNORM;
     else if (mesaVis->alphaBits == 0)
         rgbFormat = _mesa_little_endian() ? MESA_FORMAT_B8G8R8X8_UNORM : 
MESA_FORMAT_X8R8G8B8_UNORM;
     else
         rgbFormat = _mesa_little_endian() ? MESA_FORMAT_B8G8R8A8_UNORM : 
MESA_FORMAT_A8R8G8B8_UNORM;
 
     /* front color renderbuffer */
     rfb->color_rb[0] = radeon_create_renderbuffer(rgbFormat, driDrawPriv);
-    _mesa_add_renderbuffer(&rfb->base, BUFFER_FRONT_LEFT, 
&rfb->color_rb[0]->base.Base);
+    _mesa_add_renderbuffer_without_ref(&rfb->base, BUFFER_FRONT_LEFT, 
&rfb->color_rb[0]->base.Base);
     rfb->color_rb[0]->has_surface = 1;
 
     /* back color renderbuffer */
     if (mesaVis->doubleBufferMode) {
       rfb->color_rb[1] = radeon_create_renderbuffer(rgbFormat, driDrawPriv);
-       _mesa_add_renderbuffer(&rfb->base, BUFFER_BACK_LEFT, 
&rfb->color_rb[1]->base.Base);
+       _mesa_add_renderbuffer_without_ref(&rfb->base, BUFFER_BACK_LEFT, 
&rfb->color_rb[1]->base.Base);
        rfb->color_rb[1]->has_surface = 1;
     }
 
     if (mesaVis->depthBits == 24) {
       if (mesaVis->stencilBits == 8) {
        struct radeon_renderbuffer *depthStencilRb =
            radeon_create_renderbuffer(MESA_FORMAT_Z24_UNORM_S8_UINT, 
driDrawPriv);
-       _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, 
&depthStencilRb->base.Base);
+       _mesa_add_renderbuffer_without_ref(&rfb->base, BUFFER_DEPTH, 
&depthStencilRb->base.Base);
        _mesa_add_renderbuffer(&rfb->base, BUFFER_STENCIL, 
&depthStencilRb->base.Base);
        depthStencilRb->has_surface = screen->depthHasSurface;
       } else {
        /* depth renderbuffer */
        struct radeon_renderbuffer *depth =
            radeon_create_renderbuffer(MESA_FORMAT_Z24_UNORM_X8_UINT, 
driDrawPriv);
-       _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depth->base.Base);
+       _mesa_add_renderbuffer_without_ref(&rfb->base, BUFFER_DEPTH, 
&depth->base.Base);
        depth->has_surface = screen->depthHasSurface;
       }
     } else if (mesaVis->depthBits == 16) {
         /* just 16-bit depth buffer, no hw stencil */
        struct radeon_renderbuffer *depth =
            radeon_create_renderbuffer(MESA_FORMAT_Z_UNORM16, driDrawPriv);
-       _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depth->base.Base);
+       _mesa_add_renderbuffer_without_ref(&rfb->base, BUFFER_DEPTH, 
&depth->base.Base);
        depth->has_surface = screen->depthHasSurface;
     }
 
     _swrast_add_soft_renderbuffers(&rfb->base,
            GL_FALSE, /* color */
            swDepth,
            swStencil,
            swAccum,
            swAlpha,
            GL_FALSE /* aux */);
-- 
2.9.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev