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

i965: When an RB gets a new region, clear the old from the state cache.

Browse Source 
This prevents memory usage explosion in blender due to the state cache
hanging on to old fake frontbuffer regions.  Sigh at blender still
using frontbuffer rendering.

Bug #24119.
This commit is contained in:
Eric Anholt
2010-05-04 22:02:18 -07:00
parent 453f0b1f24
commit ce914fff08
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/drivers/dri/intel/intel_context.c
View File

@@ -362,7 +362,7 @@ intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
if (buffers[i].attachment == __DRI_BUFFER_DEPTH) if (buffers[i].attachment == __DRI_BUFFER_DEPTH)
depth_region = region; depth_region = region;
intel_renderbuffer_set_region(rb, region); intel_renderbuffer_set_region(intel, rb, region);
intel_region_release(&region); intel_region_release(&region);
if (buffers[i].attachment == __DRI_BUFFER_DEPTH_STENCIL) { if (buffers[i].attachment == __DRI_BUFFER_DEPTH_STENCIL) {
@@ -374,7 +374,7 @@ intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
continue; continue;
intel_region_reference(&stencil_region, region); intel_region_reference(&stencil_region, region);
intel_renderbuffer_set_region(rb, stencil_region); intel_renderbuffer_set_region(intel, rb, stencil_region);
intel_region_release(&stencil_region); intel_region_release(&stencil_region);
} }
} }

13
src/mesa/drivers/dri/intel/intel_fbo.c
View File

@@ -42,7 +42,9 @@
#include "intel_fbo.h" #include "intel_fbo.h"
#include "intel_mipmap_tree.h" #include "intel_mipmap_tree.h"
#include "intel_regions.h" #include "intel_regions.h"
#ifndef I915
#include "brw_state.h"
#endif
#define FILE_DEBUG_FLAG DEBUG_FBO #define FILE_DEBUG_FLAG DEBUG_FBO
@@ -280,7 +282,8 @@ intel_nop_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
void void
intel_renderbuffer_set_region(struct intel_renderbuffer *rb, intel_renderbuffer_set_region(struct intel_context *intel,
struct intel_renderbuffer *rb,
struct intel_region *region) struct intel_region *region)
{ {
struct intel_region *old; struct intel_region *old;
@@ -288,6 +291,12 @@ intel_renderbuffer_set_region(struct intel_renderbuffer *rb,
old = rb->region; old = rb->region;
rb->region = NULL; rb->region = NULL;
intel_region_reference(&rb->region, region); intel_region_reference(&rb->region, region);
#ifndef I915
if (old) {
brw_state_cache_bo_delete(&brw_context(&intel->ctx)->surface_cache,
old->buffer);
}
#endif
intel_region_release(&old); intel_region_release(&old);
} }

3
src/mesa/drivers/dri/intel/intel_fbo.h
View File

@@ -82,7 +82,8 @@ intel_get_renderbuffer(struct gl_framebuffer *fb, int attIndex)
extern void extern void
intel_renderbuffer_set_region(struct intel_renderbuffer *irb, intel_renderbuffer_set_region(struct intel_context *intel,
struct intel_renderbuffer *irb,
struct intel_region *region); struct intel_region *region);

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

@@ -167,7 +167,7 @@ intel_stencil_drawpixels(GLcontext * ctx,
irb = intel_create_renderbuffer(MESA_FORMAT_ARGB8888); irb = intel_create_renderbuffer(MESA_FORMAT_ARGB8888);
irb->Base.Width = depth_irb->Base.Width; irb->Base.Width = depth_irb->Base.Width;
irb->Base.Height = depth_irb->Base.Height; irb->Base.Height = depth_irb->Base.Height;
intel_renderbuffer_set_region(irb, depth_irb->region); intel_renderbuffer_set_region(intel, irb, depth_irb->region);
/* Create a name for our renderbuffer, which lets us use other mesa /* Create a name for our renderbuffer, which lets us use other mesa
* rb functions for convenience. * rb functions for convenience.