wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 850263 - Use reasonable SkiaGL cache size and share between instances r=mattwoodrow

Browse Source 
--HG--
extra : rebase_source : 11a2e5ce90a693abdac91d5ca1308aaed3a29403
This commit is contained in:
James Willcox 2013-08-28 10:08:10 -04:00
parent 4104fc828d
commit 18bcc8779e
2 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gfx/2d/DrawTargetSkia.cpp
View File

@ -75,6 +75,59 @@ public:
ExtendMode mExtendMode;
};
#ifdef USE_SKIA_GPU
static std::vector<DrawTargetSkia*>&
GLDrawTargets()
{
static std::vector<DrawTargetSkia*> targets;
return targets;
}
#define SKIA_MAX_CACHE_ITEMS 256
// 64MB was chosen because it seems we can pass all of our tests
// on the current hardware (Tegra2) without running out of memory
#define SKIA_TOTAL_CACHE_SIZE 64*1024*1024
static void
SetCacheLimits()
{
std::vector<DrawTargetSkia*>& targets = GLDrawTargets();
uint32_t size = targets.size();
if (size == 0)
return;
int individualCacheSize = SKIA_TOTAL_CACHE_SIZE / size;
for (int i = 0; i < size; i++) {
targets[i]->SetCacheLimits(SKIA_MAX_CACHE_ITEMS, individualCacheSize);
}
}
#undef SKIA_MAX_CACHE_ITEMS
#undef SKIA_TOTAL_CACHE_SIZE
static void
AddGLDrawTarget(DrawTargetSkia* target)
{
GLDrawTargets().push_back(target);
SetCacheLimits();
}
static void
RemoveGLDrawTarget(DrawTargetSkia* target)
{
std::vector<DrawTargetSkia*>& targets = GLDrawTargets();
std::vector<DrawTargetSkia*>::iterator it = std::find(targets.begin(), targets.end(), target);
if (it != targets.end()) {
targets.erase(it);
SetCacheLimits();
}
}
#endif
DrawTargetSkia::DrawTargetSkia()
: mSnapshot(nullptr)
{
@ -87,6 +140,9 @@ DrawTargetSkia::DrawTargetSkia()
DrawTargetSkia::~DrawTargetSkia()
{
#ifdef USE_SKIA_GPU
RemoveGLDrawTarget(this);
#endif
}
TemporaryRef<SourceSurface>
@ -661,8 +717,6 @@ DrawTargetSkia::InitWithGLContextAndGrGLInterface(GenericRefCountedBase* aGLCont
SkAutoTUnref<GrContext> gr(GrContext::Create(kOpenGL_GrBackend, backendContext));
mGrContext = gr.get();
mGrContext->setTextureCacheLimits(128, 1024*1024*16);
GrBackendRenderTargetDesc targetDescriptor;
targetDescriptor.fWidth = mSize.width;
@ -676,7 +730,17 @@ DrawTargetSkia::InitWithGLContextAndGrGLInterface(GenericRefCountedBase* aGLCont
SkAutoTUnref<SkDevice> device(new SkGpuDevice(mGrContext.get(), target.get()));
SkAutoTUnref<SkCanvas> canvas(new SkCanvas(device.get()));
mCanvas = canvas.get();
AddGLDrawTarget(this);
}
void
DrawTargetSkia::SetCacheLimits(int aCount, int aSizeInBytes)
{
MOZ_ASSERT(mGrContext, "No GrContext!");
mGrContext->setTextureCacheLimits(aCount, aSizeInBytes);
}
#endif
void

2
gfx/2d/DrawTargetSkia.h
View File

@ -104,6 +104,8 @@ public:
GrGLInterface* aGrGLInterface,
const IntSize &aSize,
SurfaceFormat aFormat) MOZ_OVERRIDE;
void SetCacheLimits(int number, int sizeInBytes);
#endif
operator std::string() const {