TechnoHector/suyu
2
1
Fork 0
forked from suyu/suyu
Code Pull requests Activity

gl_texture_cache: Simplify scaling procedures

Browse source
This commit is contained in:
ameerj 2021-10-22 22:11:23 -04:00 committed by Fernando Sahmkow
parent 5c6fa88935
commit 172d4f1e3b
2 changed files with 28 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/video_core/renderer_opengl/gl_texture_cache.cpp
View file

@ -883,7 +883,7 @@ void Image::CopyImageToBuffer(const VideoCommon::BufferImageCopy& copy, size_t b
} }
} }
bool Image::Scale(bool up_scale) { void Image::Scale(bool up_scale) {
const auto format_type = GetFormatType(info.format); const auto format_type = GetFormatType(info.format);
const GLenum attachment = [format_type] { const GLenum attachment = [format_type] {
switch (format_type) { switch (format_type) {
@ -942,77 +942,54 @@ bool Image::Scale(bool up_scale) {
dst_info.size.height = scaled_height; dst_info.size.height = scaled_height;
upscaled_backup = MakeImage(dst_info, gl_internal_format); upscaled_backup = MakeImage(dst_info, gl_internal_format);
} }
auto& state_tracker = runtime->GetStateTracker(); const u32 src_width = up_scale ? original_width : scaled_width;
state_tracker.NotifyViewport0(); const u32 src_height = up_scale ? original_height : scaled_height;
state_tracker.NotifyScissor0(); const u32 dst_width = up_scale ? scaled_width : original_width;
// TODO (ameerj): Investigate other GL states that affect blitting. const u32 dst_height = up_scale ? scaled_height : original_height;
GLboolean scissor_test; const auto src_handle = up_scale ? texture.handle : upscaled_backup.handle;
glGetBooleani_v(GL_SCISSOR_TEST, 0, &scissor_test); const auto dst_handle = up_scale ? upscaled_backup.handle : texture.handle;
glDisablei(GL_SCISSOR_TEST, 0);
if (up_scale) {
glViewportIndexedf(0, 0.0f, 0.0f, static_cast<GLfloat>(scaled_width),
static_cast<GLfloat>(scaled_height));
} else {
glViewportIndexedf(0, 0.0f, 0.0f, static_cast<GLfloat>(original_width),
static_cast<GLfloat>(original_height));
}
// TODO (ameerj): Investigate other GL states that affect blitting.
glDisablei(GL_SCISSOR_TEST, 0);
glViewportIndexedf(0, 0.0f, 0.0f, static_cast<GLfloat>(dst_width),
static_cast<GLfloat>(dst_height));
const GLuint read_fbo = runtime->rescale_read_fbos[fbo_index].handle; const GLuint read_fbo = runtime->rescale_read_fbos[fbo_index].handle;
const GLuint draw_fbo = runtime->rescale_draw_fbos[fbo_index].handle; const GLuint draw_fbo = runtime->rescale_draw_fbos[fbo_index].handle;
for (s32 layer = 0; layer < info.resources.layers; ++layer) { for (s32 layer = 0; layer < info.resources.layers; ++layer) {
for (s32 level = 0; level < info.resources.levels; ++level) { for (s32 level = 0; level < info.resources.levels; ++level) {
const u32 src_level_width = const u32 src_level_width = std::max(1u, src_width >> level);
std::max(1u, (up_scale ? original_width : scaled_width) >> level); const u32 src_level_height = std::max(1u, src_height >> level);
const u32 src_level_height = const u32 dst_level_width = std::max(1u, dst_width >> level);
std::max(1u, (up_scale ? original_height : scaled_height) >> level); const u32 dst_level_height = std::max(1u, dst_height >> level);
const u32 dst_level_width =
std::max(1u, (up_scale ? scaled_width : original_width) >> level);
const u32 dst_level_height =
std::max(1u, (up_scale ? scaled_height : original_height) >> level);
if (up_scale) { glNamedFramebufferTextureLayer(read_fbo, attachment, src_handle, level, layer);
glNamedFramebufferTextureLayer(read_fbo, attachment, texture.handle, level, layer); glNamedFramebufferTextureLayer(draw_fbo, attachment, dst_handle, level, layer);
glNamedFramebufferTextureLayer(draw_fbo, attachment, upscaled_backup.handle, level,
layer);
} else {
glNamedFramebufferTextureLayer(read_fbo, attachment, upscaled_backup.handle, level,
layer);
glNamedFramebufferTextureLayer(draw_fbo, attachment, texture.handle, level, layer);
}
glBlitNamedFramebuffer(read_fbo, draw_fbo, 0, 0, src_level_width, src_level_height, 0, glBlitNamedFramebuffer(read_fbo, draw_fbo, 0, 0, src_level_width, src_level_height, 0,
0, dst_level_width, dst_level_height, mask, filter); 0, dst_level_width, dst_level_height, mask, filter);
} }
} }
if (scissor_test != GL_FALSE) { current_texture = dst_handle;
glEnablei(GL_SCISSOR_TEST, 0); auto& state_tracker = runtime->GetStateTracker();
} state_tracker.NotifyViewport0();
if (up_scale) { state_tracker.NotifyScissor0();
current_texture = upscaled_backup.handle;
} else {
current_texture = texture.handle;
}
return true;
} }
bool Image::ScaleUp(bool ignore) { bool Image::ScaleUp(bool ignore) {
if (True(flags & ImageFlagBits::Rescaled)) { if (True(flags & ImageFlagBits::Rescaled)) {
return false; return false;
} }
flags |= ImageFlagBits::Rescaled;
if (!runtime->resolution.active) {
return false;
}
if (gl_format == 0 && gl_type == 0) { if (gl_format == 0 && gl_type == 0) {
// compressed textures // compressed textures
flags &= ~ImageFlagBits::Rescaled;
return false; return false;
} }
if (info.type == ImageType::Linear) { if (info.type == ImageType::Linear) {
UNREACHABLE(); UNREACHABLE();
flags &= ~ImageFlagBits::Rescaled; return false;
}
flags |= ImageFlagBits::Rescaled;
if (!runtime->resolution.active) {
return false; return false;
} }
has_scaled = true; has_scaled = true;
@ -1020,10 +997,7 @@ bool Image::ScaleUp(bool ignore) {
current_texture = upscaled_backup.handle; current_texture = upscaled_backup.handle;
return true; return true;
} }
if (!Scale()) { Scale(true);
flags &= ~ImageFlagBits::Rescaled;
return false;
}
return true; return true;
} }
@ -1039,10 +1013,7 @@ bool Image::ScaleDown(bool ignore) {
current_texture = texture.handle; current_texture = texture.handle;
return true; return true;
} }
if (!Scale(false)) { Scale(false);
flags &= ~ImageFlagBits::Rescaled;
return false;
}
return true; return true;
} }

2
src/video_core/renderer_opengl/gl_texture_cache.h
View file

@ -209,7 +209,7 @@ private:
void CopyImageToBuffer(const VideoCommon::BufferImageCopy& copy, size_t buffer_offset); void CopyImageToBuffer(const VideoCommon::BufferImageCopy& copy, size_t buffer_offset);
bool Scale(bool up_scale = true); void Scale(bool up_scale);
OGLTexture texture; OGLTexture texture;
OGLTexture upscaled_backup; OGLTexture upscaled_backup;