thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GLES: Use linear for high-res FBO tex copies.

Browse source
This commit is contained in:
Unknown W. Brackets 2018-01-20 09:05:52 -08:00 • committed by Henrik Rydgård
parent e56ae322fd
commit 38161f3c69
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GPU/GLES/FramebufferManagerGLES.cpp
View file

@ -494,7 +494,7 @@ void FramebufferManagerGLES::BlitFramebufferDepth(VirtualFramebuffer *src, Virtu
void FramebufferManagerGLES::BindFramebufferAsColorTexture(int stage, VirtualFramebuffer *framebuffer, int flags) { void FramebufferManagerGLES::BindFramebufferAsColorTexture(int stage, VirtualFramebuffer *framebuffer, int flags) {
if (!framebuffer->fbo || !useBufferedRendering_) { if (!framebuffer->fbo || !useBufferedRendering_) {
render_->BindTexture(0, nullptr); render_->BindTexture(stage, nullptr);
gstate_c.skipDrawReason |= SKIPDRAW_BAD_FB_TEXTURE; gstate_c.skipDrawReason |= SKIPDRAW_BAD_FB_TEXTURE;
return; return;
} }

3
GPU/GLES/StateMappingGLES.cpp
View file

@ -319,6 +319,9 @@ void DrawEngineGLES::ApplyDrawStateLate(bool setStencil, int stencilValue) {
// Note that this is positions, not UVs, that we need the copy from. // Note that this is positions, not UVs, that we need the copy from.
framebufferManager_->BindFramebufferAsColorTexture(1, framebufferManager_->GetCurrentRenderVFB(), BINDFBCOLOR_MAY_COPY); framebufferManager_->BindFramebufferAsColorTexture(1, framebufferManager_->GetCurrentRenderVFB(), BINDFBCOLOR_MAY_COPY);
framebufferManager_->RebindFramebuffer(); framebufferManager_->RebindFramebuffer();
GLRenderManager *renderManager = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
// If we are rendering at a higher resolution, linear is probably best for the dest color.
renderManager->SetTextureSampler(GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR, 0.0f);
fboTexBound_ = true; fboTexBound_ = true;
fboTexNeedBind_ = false; fboTexNeedBind_ = false;
} }

4
ext/native/thin3d/GLQueueRunner.cpp
View file

@ -1056,8 +1056,8 @@ void GLQueueRunner::fbo_ext_create(const GLRInitStep &step) {
fbo->color_texture.target = GL_TEXTURE_2D; fbo->color_texture.target = GL_TEXTURE_2D;
fbo->color_texture.wrapS = GL_CLAMP_TO_EDGE; fbo->color_texture.wrapS = GL_CLAMP_TO_EDGE;
fbo->color_texture.wrapT = GL_CLAMP_TO_EDGE; fbo->color_texture.wrapT = GL_CLAMP_TO_EDGE;
fbo->color_texture.magFilter = step.texture_image.linearFilter ? GL_LINEAR : GL_NEAREST; fbo->color_texture.magFilter = GL_LINEAR;
fbo->color_texture.minFilter = step.texture_image.linearFilter ? GL_LINEAR : GL_NEAREST; fbo->color_texture.minFilter = GL_LINEAR;
fbo->color_texture.maxLod = 0.0f; fbo->color_texture.maxLod = 0.0f;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, fbo->color_texture.wrapS); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, fbo->color_texture.wrapS);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, fbo->color_texture.wrapT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, fbo->color_texture.wrapT);