Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-06 04:17:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent possible crash in texture buffering thread

Browse source
This commit is contained in:
Brad Davis 2017-05-01 14:13:59 -07:00
parent 40e4e2f307
commit f81d01f179
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
View file

@ -150,6 +150,7 @@ GLExternalTexture::~GLExternalTexture() {
// Variable sized textures // Variable sized textures
using MemoryPressureState = GLVariableAllocationSupport::MemoryPressureState; using MemoryPressureState = GLVariableAllocationSupport::MemoryPressureState;
using WorkQueue = GLVariableAllocationSupport::WorkQueue; using WorkQueue = GLVariableAllocationSupport::WorkQueue;
using TransferJobPointer = GLVariableAllocationSupport::TransferJobPointer;
std::list<TextureWeakPointer> GLVariableAllocationSupport::_memoryManagedTextures; std::list<TextureWeakPointer> GLVariableAllocationSupport::_memoryManagedTextures;
MemoryPressureState GLVariableAllocationSupport::_memoryPressureState { MemoryPressureState::Idle }; MemoryPressureState GLVariableAllocationSupport::_memoryPressureState { MemoryPressureState::Idle };
@ -159,6 +160,7 @@ WorkQueue GLVariableAllocationSupport::_transferQueue;
WorkQueue GLVariableAllocationSupport::_promoteQueue; WorkQueue GLVariableAllocationSupport::_promoteQueue;
WorkQueue GLVariableAllocationSupport::_demoteQueue; WorkQueue GLVariableAllocationSupport::_demoteQueue;
TexturePointer GLVariableAllocationSupport::_currentTransferTexture; TexturePointer GLVariableAllocationSupport::_currentTransferTexture;
TransferJobPointer GLVariableAllocationSupport::_currentTransferJob;
size_t GLVariableAllocationSupport::_frameTexturesCreated { 0 }; size_t GLVariableAllocationSupport::_frameTexturesCreated { 0 };
#define OVERSUBSCRIBED_PRESSURE_VALUE 0.95f #define OVERSUBSCRIBED_PRESSURE_VALUE 0.95f
@ -553,9 +555,15 @@ void GLVariableAllocationSupport::executeNextTransfer(const TexturePointer& curr
if (!_pendingTransfers.empty()) { if (!_pendingTransfers.empty()) {
// Keeping hold of a strong pointer during the transfer ensures that the transfer thread cannot try to access a destroyed texture // Keeping hold of a strong pointer during the transfer ensures that the transfer thread cannot try to access a destroyed texture
_currentTransferTexture = currentTexture; _currentTransferTexture = currentTexture;
if (_pendingTransfers.front()->tryTransfer()) { // Keeping hold of a strong pointer to the transfer job ensures that if the pending transfer queue is rebuilt, the transfer job
// doesn't leave scope, causing a crash in the buffering thread
_currentTransferJob = _pendingTransfers.front();
// transfer jobs use asynchronous buffering of the texture data because it may involve disk IO, so we execute a try here to determine if the buffering
// is complete
if (_currentTransferJob->tryTransfer()) {
_pendingTransfers.pop(); _pendingTransfers.pop();
_currentTransferTexture.reset(); _currentTransferTexture.reset();
_currentTransferJob.reset();
} }
} }
} }

4
libraries/gpu-gl/src/gpu/gl/GLTexture.h
View file

@ -86,7 +86,8 @@ public:
void transfer(); void transfer();
}; };
using TransferQueue = std::queue<std::unique_ptr<TransferJob>>; using TransferJobPointer = std::shared_ptr<TransferJob>;
using TransferQueue = std::queue<TransferJobPointer>;
static MemoryPressureState _memoryPressureState; static MemoryPressureState _memoryPressureState;
public: public:
@ -100,6 +101,7 @@ protected:
static WorkQueue _promoteQueue; static WorkQueue _promoteQueue;
static WorkQueue _demoteQueue; static WorkQueue _demoteQueue;
static TexturePointer _currentTransferTexture; static TexturePointer _currentTransferTexture;
static TransferJobPointer _currentTransferJob;
static const uvec3 INITIAL_MIP_TRANSFER_DIMENSIONS; static const uvec3 INITIAL_MIP_TRANSFER_DIMENSIONS;
static const uvec3 MAX_TRANSFER_DIMENSIONS; static const uvec3 MAX_TRANSFER_DIMENSIONS;
static const size_t MAX_TRANSFER_SIZE; static const size_t MAX_TRANSFER_SIZE;