Merge pull request #5161 from unknownbrackets/texcache2

Don't call SetTexture() in clear mode
This commit is contained in:
Henrik Rydgård committed 2014-01-20 01:15:36 -08:00
commit 88a6a0789a
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -166,7 +166,7 @@ static bool blendColorSimilar(Vec3f a, Vec3f b, float margin = 0.1f) {
void TransformDrawEngine::ApplyDrawState(int prim) {
// TODO: All this setup is soon so expensive that we'll need dirty flags, or simply do it in the command writes where we detect dirty by xoring. Silly to do all this work on every drawcall.
if (gstate_c.textureChanged) {
if (gstate_c.textureChanged && !gstate.isModeClear()) {
if (gstate.isTextureMapEnabled()) {
textureCache_->SetTexture();
}
+1 -1
View File
@@ -885,7 +885,7 @@ void TextureCache::SetTexture(bool force) {
u32 fb_addr = gstate.getFrameBufRawAddress() | 0x04000000;
if (fb_addr == gstate.getTextureAddress(0)) {
WARN_LOG_REPORT(HLE, "Render to self texture (%08x : %ix%i)", fb_addr, w, h);
WARN_LOG_REPORT(HLE, "Texturing from same buffer as target (%08x : %ix%i)", fb_addr, w, h);
}
GETextureFormat format = gstate.getTextureFormat();