Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Warn when an upscaling shader is being used.

Browse Source 
Otherwise it's potentially confusing that it doesn't change.  See #8310.
This commit is contained in:
Unknown W. Brackets 2015-12-27 12:05:12 -08:00
parent 1c852ac482
commit 517d5b7562
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
GPU/Common/FramebufferCommon.cpp
View File

@ -113,14 +113,17 @@ FramebufferManagerCommon::FramebufferManagerCommon() :
displayFramebufPtr_(0),
displayStride_(0),
displayFormat_(GE_FORMAT_565),
displayFramebuf_(0),
prevDisplayFramebuf_(0),
prevPrevDisplayFramebuf_(0),
displayFramebuf_(nullptr),
prevDisplayFramebuf_(nullptr),
prevPrevDisplayFramebuf_(nullptr),
frameLastFramebufUsed_(0),
currentRenderVfb_(0),
currentRenderVfb_(nullptr),
framebufRangeEnd_(0),
hackForce04154000Download_(false),
updateVRAM_(false) {
updateVRAM_(false),
usePostShader_(false),
postShaderAtOutputResolution_(false),
postShaderIsUpscalingFilter_(false),
hackForce04154000Download_(false) {
UpdateSize();
}
@ -889,6 +892,9 @@ void FramebufferManagerCommon::ShowScreenResolution() {
std::ostringstream messageStream;
messageStream << gr->T("Internal Resolution") << ": ";
messageStream << PSP_CoreParameter().renderWidth << "x" << PSP_CoreParameter().renderHeight << " ";
if (postShaderIsUpscalingFilter_) {
messageStream << gr->T("(upscaling)") << " ";
}
messageStream << gr->T("Window Size") << ": ";
messageStream << PSP_CoreParameter().pixelWidth << "x" << PSP_CoreParameter().pixelHeight;

3
GPU/Common/FramebufferCommon.h
View File

@ -273,6 +273,9 @@ protected:
bool useBufferedRendering_;
bool updateVRAM_;
bool usePostShader_;
bool postShaderAtOutputResolution_;
bool postShaderIsUpscalingFilter_;
std::vector<VirtualFramebuffer *> vfbs_;
std::set<std::pair<u32, u32>> knownFramebufferRAMCopies_;

3
GPU/GLES/Framebuffer.cpp
View File

@ -290,9 +290,6 @@ FramebufferManager::FramebufferManager() :
pixelDeltaLoc_(-1),
textureCache_(nullptr),
shaderManager_(nullptr),
usePostShader_(false),
postShaderAtOutputResolution_(false),
postShaderIsUpscalingFilter_(false),
resized_(false),
gameUsesSequentialCopies_(false),
pixelBufObj_(nullptr),

3
GPU/GLES/Framebuffer.h
View File

@ -166,9 +166,6 @@ private:
TextureCache *textureCache_;
ShaderManager *shaderManager_;
TransformDrawEngine *transformDraw_;
bool usePostShader_;
bool postShaderAtOutputResolution_;
bool postShaderIsUpscalingFilter_;
// Used by post-processing shader
std::vector<FBO *> extraFBOs_;