libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-25 09:09:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Logging changes and cleanup

Browse Source
This commit is contained in:
Henrik Rydgard 2013-03-15 21:00:03 +01:00
parent 17bf9a4616
commit 1f5b6b7f59
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/HLE/sceFont.cpp
View File

@ -739,7 +739,7 @@ int sceFontGetFontInfo(u32 fontHandle, u32 fontInfoPtr) {
}
int sceFontGetFontInfoByIndexNumber(u32 libHandle, u32 fontInfoPtr, u32 unknown, u32 fontIndex) {
ERROR_LOG(HLE, "HACK sceFontGetFontInfoByIndexNumber(%x, %x, %i, %i)", libHandle, fontInfoPtr, unknown, fontIndex);
INFO_LOG(HLE, "sceFontGetFontInfoByIndexNumber(%x, %x, %i, %i)", libHandle, fontInfoPtr, unknown, fontIndex);
FontLib *fl = GetFontLib(libHandle);
u32 fontHandle = fl->GetFontHandle(fontIndex);
return sceFontGetFontInfo(fontHandle, fontInfoPtr);
@ -770,7 +770,7 @@ int sceFontGetShadowInfo(u32 fontHandle, u32 charCode, u32 shadowCharInfoPtr) {
}
int sceFontGetCharImageRect(u32 fontHandle, u32 charCode, u32 charRectPtr) {
ERROR_LOG(HLE, "HACK sceFontGetCharImageRect(%08x, %i, %08x)", fontHandle, charCode, charRectPtr);
INFO_LOG(HLE, "sceFontGetCharImageRect(%08x, %i, %08x)", fontHandle, charCode, charRectPtr);
if (!Memory::IsValidAddress(charRectPtr))
return -1;
@ -792,7 +792,7 @@ int sceFontGetShadowImageRect(u32 fontHandle, u32 charCode, u32 charRectPtr) {
}
int sceFontGetCharGlyphImage(u32 fontHandle, u32 charCode, u32 glyphImagePtr) {
ERROR_LOG(HLE, "HACK sceFontGetCharGlyphImage(%x, %x, %x)", fontHandle, charCode, glyphImagePtr);
INFO_LOG(HLE, "sceFontGetCharGlyphImage(%x, %x, %x)", fontHandle, charCode, glyphImagePtr);
int pixelFormat = Memory::Read_U32(glyphImagePtr);
int xPos64 = Memory::Read_U32(glyphImagePtr+4);
@ -813,7 +813,7 @@ int sceFontGetCharGlyphImage(u32 fontHandle, u32 charCode, u32 glyphImagePtr) {
}
int sceFontGetCharGlyphImage_Clip(u32 fontHandle, u32 charCode, u32 glyphImagePtr, int clipXPos, int clipYPos, int clipWidth, int clipHeight) {
ERROR_LOG(HLE, "sceFontGetCharGlyphImage_Clip(%08x, %i, %08x, %i, %i, %i, %i)", fontHandle, charCode, glyphImagePtr, clipXPos, clipYPos, clipWidth, clipHeight);
INFO_LOG(HLE, "sceFontGetCharGlyphImage_Clip(%08x, %i, %08x, %i, %i, %i, %i)", fontHandle, charCode, glyphImagePtr, clipXPos, clipYPos, clipWidth, clipHeight);
int pixelFormat = Memory::Read_U32(glyphImagePtr);
int xPos64 = Memory::Read_U32(glyphImagePtr+4);

7
Core/HLE/sceNet.cpp
View File

@ -96,9 +96,14 @@ const HLEFunction sceNetAdhoc[] =
{0x7a662d6b, 0, "sceNetAdhocPollSocket"},
};
int sceNetAdhocMatchingInit(u32 memsize) {
ERROR_LOG(HLE, "UNIMPL sceNetAdhocMatchingInit(%08x)", memsize);
return 0;
}
const HLEFunction sceNetAdhocMatching[] =
{
{0x2a2a1e07, 0, "sceNetAdhocMatchingInit"},
{0x2a2a1e07, WrapI_U<sceNetAdhocMatchingInit>, "sceNetAdhocMatchingInit"},
{0x7945ecda, 0, "sceNetAdhocMatchingTerm"},
{0xca5eda6f, 0, "sceNetAdhocMatchingCreate"},
{0x93ef3843, 0, "sceNetAdhocMatchingStart"},

3
GPU/GLES/Framebuffer.cpp
View File

@ -430,7 +430,7 @@ void FramebufferManager::CopyDisplayToOutput() {
VirtualFramebuffer *vfb = GetDisplayFBO();
if (!vfb) {
DEBUG_LOG(HLE, "Found no FBO! displayFBPtr = %08x", displayFramebufPtr_);
DEBUG_LOG(HLE, "Found no FBO to display! displayFBPtr = %08x", displayFramebufPtr_);
// No framebuffer to display! Clear to black.
glstate.depthWrite.set(GL_TRUE);
glstate.colorMask.set(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@ -558,6 +558,7 @@ void FramebufferManager::DestroyAllFBOs() {
VirtualFramebuffer *vfb = *iter;
textureCache_->NotifyFramebufferDestroyed(vfb->fb_address, vfb);
if (vfb->fbo) {
INFO_LOG(HLE, "Destroying FBO for %08x : %i x %i x %i", vfb->fb_address, vfb->width, vfb->height, vfb->format);
fbo_destroy(vfb->fbo);
vfb->fbo = 0;
}

23
GPU/GLES/TextureCache.cpp
View File

@ -145,9 +145,8 @@ void TextureCache::NotifyFramebuffer(u32 address, VirtualFramebuffer *framebuffe
void TextureCache::NotifyFramebufferDestroyed(u32 address, VirtualFramebuffer *fbo) {
TexCacheEntry *entry = GetEntryAt(address | 0x04000000);
if (entry && entry->framebuffer) {
if (entry)
entry->framebuffer = 0;
}
}
static u32 GetClutAddr(u32 clutEntrySize) {
@ -702,19 +701,19 @@ void TextureCache::SetTexture() {
// Check for FBO - slow!
if (entry->framebuffer) {
entry->framebuffer->usageFlags |= FB_USAGE_TEXTURE;
if (entry->framebuffer->fbo) {
if (!g_Config.bBufferedRendering) {
ERROR_LOG(HLE, "Buffered rendering is off! How did we end up trying to set an fbo as texture? fbo = %p", entry->framebuffer->fbo);
} else {
fbo_bind_color_as_texture(entry->framebuffer->fbo, 0);
}
} else {
if (!g_Config.bBufferedRendering) {
glBindTexture(GL_TEXTURE_2D, 0);
gstate_c.skipDrawReason |= SKIPDRAW_BAD_FB_TEXTURE;
entry->lastFrame = gpuStats.numFrames;
} else {
if (entry->framebuffer->fbo) {
fbo_bind_color_as_texture(entry->framebuffer->fbo, 0);
} else {
glBindTexture(GL_TEXTURE_2D, 0);
gstate_c.skipDrawReason |= SKIPDRAW_BAD_FB_TEXTURE;
}
UpdateSamplingParams(*entry, false);
}
UpdateSamplingParams(*entry, false);
// This isn't right.
gstate_c.curTextureWidth = entry->framebuffer->width;
gstate_c.curTextureHeight = entry->framebuffer->height;

2
native

@ -1 +1 @@
Subproject commit 22136ff2579ba7046b6f8271a4b45643b90e621d
Subproject commit b9486d43e999d5de403e36cd981842fa575a5488