Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

GL: Use AllocateAlignedMemory to make sure localMemory is always aligned. Fixes #10666

Browse Source 
Seems the code that tries to align is faulty in some cases but this avoids the issue at least.
This commit is contained in:
Henrik Rydgård 2018-03-04 22:21:57 +01:00
parent 1ea4747242
commit 38bf10baaa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/native/thin3d/GLRenderManager.cpp
View File

@ -5,6 +5,7 @@
#include "thread/threadutil.h"
#include "base/logging.h"
#include "GPU/GPUState.h"
#include "Common/MemoryUtil.h"
#if 0 // def _DEBUG
#define VLOG ILOG
@ -592,7 +593,7 @@ void GLPushBuffer::Flush() {
bool GLPushBuffer::AddBuffer() {
BufInfo info;
info.localMemory = new uint8_t[size_];
info.localMemory = (uint8_t *)AllocateAlignedMemory(size_, 16);
info.buffer = render_->CreateBuffer(target_, size_, GL_DYNAMIC_DRAW);
buf_ = buffers_.size();
buffers_.push_back(info);
@ -603,7 +604,7 @@ void GLPushBuffer::Destroy() {
for (BufInfo &info : buffers_) {
// This will automatically unmap device memory, if needed.
render_->DeleteBuffer(info.buffer);
delete[] info.localMemory;
FreeAlignedMemory(info.localMemory);
}
buffers_.clear();
}
@ -637,7 +638,7 @@ void GLPushBuffer::Defragment() {
// Let's take this chance to jetison localMemory we don't need.
for (auto &info : buffers_) {
if (info.deviceMemory) {
delete[] info.localMemory;
FreeAlignedMemory(info.localMemory);
info.localMemory = nullptr;
}
}
@ -677,7 +678,7 @@ void GLPushBuffer::MapDevice() {
if (!info.deviceMemory && !info.localMemory) {
// Somehow it failed, let's dodge crashing.
info.localMemory = new uint8_t[info.buffer->size_];
info.localMemory = (uint8_t *)AllocateAlignedMemory(info.buffer->size_, 16);
mapChanged = true;
}