From 4fda9135da2c03838f593f5994fb82cc20ba328c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 14 Jan 2014 10:51:45 +0100 Subject: [PATCH] Log dimensions of framebuffer/texture collisions. Update native. --- GPU/GLES/TextureCache.cpp | 7 ++++--- native | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index e714e9fdc7..100e3065c9 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -877,9 +877,12 @@ void TextureCache::SetTexture(bool force) { return; } + int w = gstate.getTextureWidth(0); + int h = gstate.getTextureHeight(0); + u32 fb_addr = gstate.getFrameBufRawAddress() | 0x04000000; if (fb_addr == gstate.getTextureAddress(0)) { - WARN_LOG_REPORT(HLE, "Render to self texture (%08x)", fb_addr); + WARN_LOG_REPORT(HLE, "Render to self texture (%08x : %ix%i)", fb_addr, w, h); } GETextureFormat format = gstate.getTextureFormat(); @@ -904,8 +907,6 @@ void TextureCache::SetTexture(bool force) { } int bufw = GetTextureBufw(0, texaddr, format); - int w = gstate.getTextureWidth(0); - int h = gstate.getTextureHeight(0); int maxLevel = ((gstate.texmode >> 16) & 0x7); u32 texhash = MiniHash((const u32 *)Memory::GetPointer(texaddr)); diff --git a/native b/native index fa55a39060..1d1ee54982 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit fa55a3906076caae33951ae2c712a00361736e5e +Subproject commit 1d1ee549824d0e9ad05a27d95ef2e0043a0c5c60