OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove last of _mesa_unreference_framebuffer() calls

Browse Source
This commit is contained in:
Brian Paul
2009-03-07 11:32:18 -07:00
parent b125af1d25
commit 0f04a1d3f8
21 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/fb/fb_dri.c
View File

@@ -480,7 +480,7 @@ fbCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
fbDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) fbDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }

2
src/mesa/drivers/dri/ffb/ffb_xmesa.c
View File

@@ -394,7 +394,7 @@ ffbCreateBuffer(__DRIscreenPrivate *driScrnPriv,
static void static void
ffbDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) ffbDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }

2
src/mesa/drivers/dri/gamma/gamma_xmesa.c
View File

@@ -96,7 +96,7 @@ gammaCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
gammaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) gammaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
static void static void

2
src/mesa/drivers/dri/i810/i810screen.c
View File

@@ -341,7 +341,7 @@ i810CreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
i810DestroyBuffer(__DRIdrawablePrivate *driDrawPriv) i810DestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
const struct __DriverAPIRec driDriverAPI = { const struct __DriverAPIRec driDriverAPI = {

2
src/mesa/drivers/dri/intel/intel_screen.c
View File

@@ -394,7 +394,7 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv,
static void static void
intelDestroyBuffer(__DRIdrawablePrivate * driDrawPriv) intelDestroyBuffer(__DRIdrawablePrivate * driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }

2
src/mesa/drivers/dri/mach64/mach64_screen.c
View File

@@ -374,7 +374,7 @@ mach64CreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
mach64DestroyBuffer(__DRIdrawablePrivate *driDrawPriv) mach64DestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }

2
src/mesa/drivers/dri/mga/mga_xmesa.c
View File

@@ -816,7 +816,7 @@ mgaCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
mgaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) mgaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
static void static void

2
src/mesa/drivers/dri/r128/r128_screen.c
View File

@@ -353,7 +353,7 @@ r128CreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
r128DestroyBuffer(__DRIdrawablePrivate *driDrawPriv) r128DestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }

2
src/mesa/drivers/dri/radeon/radeon_screen.c
View File

@@ -1117,7 +1117,7 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
radeonDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) radeonDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300) #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)

2
src/mesa/drivers/dri/s3v/s3v_xmesa.c
View File

@@ -131,7 +131,7 @@ s3vCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
s3vDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) s3vDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
static void static void

2
src/mesa/drivers/dri/savage/savage_xmesa.c
View File

@@ -678,7 +678,7 @@ savageCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
savageDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) savageDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
#if 0 #if 0

2
src/mesa/drivers/dri/sis/sis_screen.c
View File

@@ -221,7 +221,7 @@ sisCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
sisDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) sisDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
static void sisCopyBuffer( __DRIdrawablePrivate *dPriv ) static void sisCopyBuffer( __DRIdrawablePrivate *dPriv )

2
src/mesa/drivers/dri/swrast/swrast.c
View File

@@ -476,7 +476,7 @@ driDestroyDrawable(__DRIdrawable *buf)
_mesa_free(buf->row); _mesa_free(buf->row);
fb->DeletePending = GL_TRUE; fb->DeletePending = GL_TRUE;
_mesa_unreference_framebuffer(&fb); _mesa_reference_framebuffer(&fb, NULL);
} }
} }

2
src/mesa/drivers/dri/tdfx/tdfx_screen.c
View File

@@ -232,7 +232,7 @@ tdfxCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
tdfxDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) tdfxDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }

2
src/mesa/drivers/dri/trident/trident_context.c
View File

@@ -281,7 +281,7 @@ tridentCreateBuffer( __DRIscreenPrivate *driScrnPriv,
static void static void
tridentDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) tridentDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
static void static void

2
src/mesa/drivers/dri/unichrome/via_screen.c
View File

@@ -316,7 +316,7 @@ viaCreateBuffer(__DRIscreenPrivate *driScrnPriv,
static void static void
viaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv) viaDestroyBuffer(__DRIdrawablePrivate *driDrawPriv)
{ {
_mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate))); _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
} }
static const __DRIconfig ** static const __DRIconfig **

2
src/mesa/drivers/windows/gdi/mesa.def
View File

@@ -940,7 +940,7 @@ EXPORTS
_mesa_store_texsubimage3d _mesa_store_texsubimage3d
_mesa_strcmp _mesa_strcmp
_mesa_test_proxy_teximage _mesa_test_proxy_teximage
_mesa_unreference_framebuffer _mesa_reference_framebuffer
_mesa_update_framebuffer_visual _mesa_update_framebuffer_visual
_mesa_use_program _mesa_use_program
_mesa_Viewport _mesa_Viewport

2
src/mesa/drivers/windows/gdi/wmesa.c
View File

@@ -62,7 +62,7 @@ wmesa_free_framebuffer(HDC hdc)
else else
prev->next = pwfb->next; prev->next = pwfb->next;
fb = &pwfb->Base; fb = &pwfb->Base;
_mesa_unreference_framebuffer(&fb); _mesa_reference_framebuffer(&fb, NULL);
} }
} }

16
src/mesa/main/framebuffer.c
View File

@@ -251,22 +251,6 @@ _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
} }
/**
* XXX this function is deprecated.
* Undo/remove a reference to a framebuffer object.
* Decrement the framebuffer object's reference count and delete it when
* the refcount hits zero.
* Note: we pass the address of a pointer and set it to NULL.
*/
void
_mesa_unreference_framebuffer(struct gl_framebuffer **fb)
{
_mesa_reference_framebuffer(fb, NULL);
}
/** /**
* Resize the given framebuffer's renderbuffers to the new width and height. * Resize the given framebuffer's renderbuffers to the new width and height.
* This should only be used for window-system framebuffers, not * This should only be used for window-system framebuffers, not

3
src/mesa/main/framebuffer.h
View File

@@ -46,9 +46,6 @@ extern void
_mesa_reference_framebuffer(struct gl_framebuffer **ptr, _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
struct gl_framebuffer *fb); struct gl_framebuffer *fb);
extern void
_mesa_unreference_framebuffer(struct gl_framebuffer **fb);
extern void extern void
_mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb, _mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
GLuint width, GLuint height); GLuint width, GLuint height);

2
src/mesa/state_tracker/st_framebuffer.c
View File

@@ -154,7 +154,7 @@ void st_resize_framebuffer( struct st_framebuffer *stfb,
void st_unreference_framebuffer( struct st_framebuffer *stfb ) void st_unreference_framebuffer( struct st_framebuffer *stfb )
{ {
_mesa_unreference_framebuffer((struct gl_framebuffer **) &stfb); _mesa_reference_framebuffer((struct gl_framebuffer **) &stfb, NULL);
} }