AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't reuse failed buffers as scratch

Browse Source 
This is/was occurring for ANGLE D3D configs

Change-Id: I45d4c40143ce4ac4989612c7bfe7aefd178842da
Reviewed-on: https://skia-review.googlesource.com/19076
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2017-06-08 15:34:16 -04:00 committed by Skia Commit-Bot
parent cdabbcc3b5
commit a5b39fa902
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gpu/GrBuffer.cpp
View File

@ -25,22 +25,22 @@ GrBuffer* GrBuffer::CreateCPUBacked(GrGpu* gpu, size_t sizeInBytes, GrBufferType
}
GrBuffer::GrBuffer(GrGpu* gpu, size_t sizeInBytes, GrBufferType type, void* cpuData)
: INHERITED(gpu),
fMapPtr(nullptr),
fSizeInBytes(sizeInBytes),
fAccessPattern(kDynamic_GrAccessPattern),
fCPUData(cpuData),
fIntendedType(type) {
: INHERITED(gpu)
, fMapPtr(nullptr)
, fSizeInBytes(sizeInBytes)
, fAccessPattern(kDynamic_GrAccessPattern)
, fCPUData(cpuData)
, fIntendedType(type) {
this->registerWithCache(SkBudgeted::kNo);
}
GrBuffer::GrBuffer(GrGpu* gpu, size_t sizeInBytes, GrBufferType type, GrAccessPattern pattern)
: INHERITED(gpu),
fMapPtr(nullptr),
fSizeInBytes(sizeInBytes),
fAccessPattern(pattern),
fCPUData(nullptr),
fIntendedType(type) {
: INHERITED(gpu)
, fMapPtr(nullptr)
, fSizeInBytes(sizeInBytes)
, fAccessPattern(pattern)
, fCPUData(nullptr)
, fIntendedType(type) {
// Subclass registers with cache.
}

19
src/gpu/gl/GrGLBuffer.cpp
View File

@ -7,6 +7,7 @@
#include "GrGLBuffer.h"
#include "GrGLGpu.h"
#include "GrGpuResourcePriv.h"
#include "SkTraceMemoryDump.h"
#define GL_CALL(X) GR_GL_CALL(this->glGpu()->glInterface(), X)
@ -86,12 +87,12 @@ inline static GrGLenum gr_to_gl_access_pattern(GrBufferType bufferType,
GrGLBuffer::GrGLBuffer(GrGLGpu* gpu, size_t size, GrBufferType intendedType,
GrAccessPattern accessPattern, const void* data)
: INHERITED(gpu, size, intendedType, accessPattern),
fIntendedType(intendedType),
fBufferID(0),
fUsage(gr_to_gl_access_pattern(intendedType, accessPattern)),
fGLSizeInBytes(0),
fHasAttachedToTexture(false) {
: INHERITED(gpu, size, intendedType, accessPattern)
, fIntendedType(intendedType)
, fBufferID(0)
, fUsage(gr_to_gl_access_pattern(intendedType, accessPattern))
, fGLSizeInBytes(0)
, fHasAttachedToTexture(false) {
GL_CALL(GenBuffers(1, &fBufferID));
if (fBufferID) {
GrGLenum target = gpu->bindBuffer(fIntendedType, this);
@ -110,6 +111,9 @@ GrGLBuffer::GrGLBuffer(GrGLGpu* gpu, size_t size, GrBufferType intendedType,
}
VALIDATE();
this->registerWithCache(SkBudgeted::kYes);
if (!fBufferID) {
this->resourcePriv().removeScratchKey();
}
}
inline GrGLGpu* GrGLBuffer::glGpu() const {
@ -147,6 +151,7 @@ void GrGLBuffer::onAbandon() {
}
void GrGLBuffer::onMap() {
SkASSERT(fBufferID);
if (this->wasDestroyed()) {
return;
}
@ -201,6 +206,7 @@ void GrGLBuffer::onMap() {
}
void GrGLBuffer::onUnmap() {
SkASSERT(fBufferID);
if (this->wasDestroyed()) {
return;
}
@ -231,6 +237,7 @@ void GrGLBuffer::onUnmap() {
}
bool GrGLBuffer::onUpdateData(const void* src, size_t srcSizeInBytes) {
SkASSERT(fBufferID);
if (this->wasDestroyed()) {
return false;
}