Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Windows fixes

Browse source
This commit is contained in:
Henrik Rydgård 2022-07-24 13:58:20 +02:00
parent 861d66a4d4
commit d3d601dced
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
GPU/Directx9/FramebufferManagerDX9.cpp
View file

@ -369,7 +369,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = {
// TODO: Handle the other formats? We don't currently create them, I think. // TODO: Handle the other formats? We don't currently create them, I think.
const int dstByteOffset = (y * vfb->fb_stride + x) * dstBpp; const int dstByteOffset = (y * vfb->fb_stride + x) * dstBpp;
// Pixel size always 4 here because we always request BGRA8888. // Pixel size always 4 here because we always request BGRA8888.
ConvertFromBGRA8888(Memory::GetPointer(fb_address + dstByteOffset), (u8 *)locked.pBits, vfb->fb_stride, locked.Pitch / 4, w, h, vfb->format); ConvertFromBGRA8888(Memory::GetPointerWrite(fb_address + dstByteOffset), (u8 *)locked.pBits, vfb->fb_stride, locked.Pitch / 4, w, h, vfb->format);
offscreen->UnlockRect(); offscreen->UnlockRect();
} else { } else {
ERROR_LOG_REPORT(G3D, "Unable to lock rect from %08x: %d,%d %dx%d of %dx%d", fb_address, (int)rect.left, (int)rect.top, (int)rect.right, (int)rect.bottom, vfb->renderWidth, vfb->renderHeight); ERROR_LOG_REPORT(G3D, "Unable to lock rect from %08x: %d,%d %dx%d of %dx%d", fb_address, (int)rect.left, (int)rect.top, (int)rect.right, (int)rect.bottom, vfb->renderWidth, vfb->renderHeight);
@ -464,7 +464,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = {
if (!Memory::IsValidAddress(fb_address)) if (!Memory::IsValidAddress(fb_address))
return false; return false;
// If there's no vfb and we're drawing there, must be memory? // If there's no vfb and we're drawing there, must be memory?
buffer = GPUDebugBuffer(Memory::GetPointer(fb_address), fb_stride, 512, fb_format); buffer = GPUDebugBuffer(Memory::GetPointerWrite(fb_address), fb_stride, 512, fb_format);
return true; return true;
} }
LPDIRECT3DSURFACE9 renderTarget = vfb->fbo ? (LPDIRECT3DSURFACE9)draw_->GetFramebufferAPITexture(vfb->fbo, Draw::FB_COLOR_BIT | Draw::FB_SURFACE_BIT, 0) : nullptr; LPDIRECT3DSURFACE9 renderTarget = vfb->fbo ? (LPDIRECT3DSURFACE9)draw_->GetFramebufferAPITexture(vfb->fbo, Draw::FB_COLOR_BIT | Draw::FB_SURFACE_BIT, 0) : nullptr;
@ -541,7 +541,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = {
if (!vfb) { if (!vfb) {
// If there's no vfb and we're drawing there, must be memory? // If there's no vfb and we're drawing there, must be memory?
buffer = GPUDebugBuffer(Memory::GetPointer(z_address), z_stride, 512, GPU_DBG_FORMAT_16BIT); buffer = GPUDebugBuffer(Memory::GetPointerWrite(z_address), z_stride, 512, GPU_DBG_FORMAT_16BIT);
return true; return true;
} }
@ -579,7 +579,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = {
if (!vfb) { if (!vfb) {
// If there's no vfb and we're drawing there, must be memory? // If there's no vfb and we're drawing there, must be memory?
buffer = GPUDebugBuffer(Memory::GetPointer(vfb->z_address), vfb->z_stride, 512, GPU_DBG_FORMAT_16BIT); buffer = GPUDebugBuffer(Memory::GetPointerWrite(vfb->z_address), vfb->z_stride, 512, GPU_DBG_FORMAT_16BIT);
return true; return true;
} }

4
Windows/Debugger/CtrlMemView.cpp
View file

@ -779,7 +779,7 @@ std::vector<u32> CtrlMemView::searchString(const std::string &searchQuery) {
return searchResAddrs; return searchResAddrs;
} }
u8 *ptr = Memory::GetPointerUnchecked(pos); const u8 *ptr = Memory::GetPointerUnchecked(pos);
if (memcmp(ptr, searchData.data(), searchData.size()) == 0) { if (memcmp(ptr, searchData.data(), searchData.size()) == 0) {
searchResAddrs.push_back(pos); searchResAddrs.push_back(pos);
} }
@ -798,7 +798,7 @@ void CtrlMemView::search(bool continueSearch)
u32 searchAddress = 0; u32 searchAddress = 0;
u32 segmentStart = 0; u32 segmentStart = 0;
u32 segmentEnd = 0; u32 segmentEnd = 0;
u8* dataPointer = 0; const u8* dataPointer = 0;
if (continueSearch == false || searchQuery.empty()) if (continueSearch == false || searchQuery.empty())
{ {
if (InputBox_GetString(GetModuleHandle(NULL), wnd, L"Search for", searchQuery, searchQuery) == false) if (InputBox_GetString(GetModuleHandle(NULL), wnd, L"Search for", searchQuery, searchQuery) == false)