Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #106 from billhollings/master

Browse Source 
Fix memory issues.
This commit is contained in:
Bill Hollings 2018-03-15 22:59:50 -04:00 committed by GitHub
commit 2a6a186337
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MoltenVK/MoltenVK/GPUObjects/MVKQueue.mm
View File

@ -53,10 +53,14 @@ MVKQueueFamily::~MVKQueueFamily() {
#pragma mark Queue submissions
/** Submits the specified submission object to the execution queue. */
/**
* Submits the specified submission object to the execution queue, wrapping each submission
* in a dedicated autorelease pool. Relying on the dispatch queue to find time to drain the
* autorelease pool can result in significant memory creep under heavy workloads.
*/
void MVKQueue::submit(MVKQueueSubmission* qSubmit) {
if ( !qSubmit ) { return; } // Ignore nils
dispatch_async( _execQueue, ^{ qSubmit->execute(); } );
dispatch_async( _execQueue, ^{ @autoreleasepool { qSubmit->execute(); } } );
}
VkResult MVKQueue::submit(uint32_t submitCount, const VkSubmitInfo* pSubmits,

9
MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm
View File

@ -161,10 +161,11 @@ void MVKSwapchain::markFrameInterval() {
if (perfLogCntLimit > 0) {
_currentPerfLogFrameCount++;
if (_currentPerfLogFrameCount >= perfLogCntLimit) {
MVKLogInfo("Frame interval: %.2f ms. Avg frame interval: %.2f ms. FPS: %.2f.",
MVKLogInfo("Frame interval: %.2f ms. Avg frame interval: %.2f ms. FPS: %.2f. Elapsed time: %.3f seconds.",
_performanceStatistics.lastFrameInterval,
_performanceStatistics.averageFrameInterval,
_performanceStatistics.averageFramesPerSecond);
_performanceStatistics.averageFramesPerSecond,
mvkGetElapsedMilliseconds() / 1000.0);
_currentPerfLogFrameCount = 0;
}
}
@ -257,8 +258,8 @@ void MVKSwapchain::initFrameIntervalTracking() {
_lastFrameTime = mvkGetTimestamp();
// Establish the alpha parameter of a low-pass filter for averaging frame intervals.
double RC_over_dt = 10;
_averageFrameIntervalFilterAlpha = 1.0 / (1 + RC_over_dt);
double RC_over_dt = 10.0;
_averageFrameIntervalFilterAlpha = 1.0 / (1.0 + RC_over_dt);
}
MVKSwapchain::~MVKSwapchain() {

9
MoltenVK/MoltenVK/Vulkan/mvk_datatypes.mm
View File

@ -427,8 +427,9 @@ typedef unordered_map<uint32_t, uint32_t> MVKFormatIndexByVkFormatMap;
// Vulkan core formats have small values and are mapped by simple lookup array.
// Vulkan extension formats have larger values and are mapped by a map.
// MVKFormatIndexByVkFormatMap held as global pointer to allow it to be populated during global init functions.
static uint16_t _fmtDescIndicesByVkFormatsCore[_vkFormatCoreCount];
static MVKFormatIndexByVkFormatMap _fmtDescIndicesByVkFormatsExt;
static MVKFormatIndexByVkFormatMap* _pFmtDescIndicesByVkFormatsExt;
// Metal formats have small values and are mapped by simple lookup array.
static uint16_t _fmtDescIndicesByMTLPixelFormats[_mtlFormatCount];
@ -449,7 +450,7 @@ static void MVKInitFormatMaps() {
memset(_fmtDescIndicesByVkFormatsCore, 0, sizeof(_fmtDescIndicesByVkFormatsCore));
memset(_fmtDescIndicesByMTLPixelFormats, 0, sizeof(_fmtDescIndicesByMTLPixelFormats));
_fmtDescIndicesByVkFormatsExt = MVKFormatIndexByVkFormatMap();
_pFmtDescIndicesByVkFormatsExt = new MVKFormatIndexByVkFormatMap();
// Iterate through the format descriptions and populate the lookup maps.
uint32_t fmtCnt = sizeof(_formatDescriptions) / sizeof(MVKFormatDesc);
@ -465,7 +466,7 @@ static void MVKInitFormatMaps() {
if (tfm.vk < _vkFormatCoreCount) {
_fmtDescIndicesByVkFormatsCore[tfm.vk] = fmtIdx;
} else {
_fmtDescIndicesByVkFormatsExt[tfm.vk] = fmtIdx;
(*_pFmtDescIndicesByVkFormatsExt)[tfm.vk] = fmtIdx;
}
}
@ -477,7 +478,7 @@ static void MVKInitFormatMaps() {
// Return a reference to the format description corresponding to the VkFormat.
inline const MVKFormatDesc& formatDescForVkFormat(VkFormat vkFormat) {
uint16_t fmtIdx = (vkFormat < _vkFormatCoreCount) ? _fmtDescIndicesByVkFormatsCore[vkFormat] : _fmtDescIndicesByVkFormatsExt[vkFormat];
uint16_t fmtIdx = (vkFormat < _vkFormatCoreCount) ? _fmtDescIndicesByVkFormatsCore[vkFormat] : (*_pFmtDescIndicesByVkFormatsExt)[vkFormat];
return _formatDescriptions[fmtIdx];
}