Merge pull request #578 from RachelBryk/IR

Cleanup Renderer::CalculateTargetSize(), and allow IRs higher than 4x to be set via INI.
This commit is contained in:
Tony Wasserka
2014-09-30 19:21:21 +02:00
7 changed files with 65 additions and 43 deletions

View File

@ -1370,4 +1370,9 @@ void Renderer::SetInterlacingMode()
// TODO
}
int Renderer::GetMaxTextureSize()
{
return DX11::D3D::GetMaxTextureSize();
}
} // namespace DX11

View File

@ -49,6 +49,8 @@ public:
bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) override;
static bool CheckForResize();
int GetMaxTextureSize() override;
};
}

View File

@ -1904,4 +1904,11 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
}
int Renderer::GetMaxTextureSize()
{
int max_size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_size);
return max_size;
}
}

View File

@ -84,6 +84,8 @@ public:
bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) override;
int GetMaxTextureSize() override;
private:
void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, const TargetRectangle& targetPixelRc, const u32* data);
};