octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rasterizer_cache: Don't use float for viewport

Browse Source
This commit is contained in:
GPUCode
2023-04-29 13:09:34 +03:00
parent 8be2d6c09a
commit 512b990f3e
4 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video_core/rasterizer_cache/framebuffer_base.cpp
View File

@@ -31,10 +31,10 @@ FramebufferBase::FramebufferBase(const Pica::Regs& regs, const SurfaceBase* colo
surfaces_rect.bottom, surfaces_rect.top); surfaces_rect.bottom, surfaces_rect.top);
// Update viewport // Update viewport
viewport.x = static_cast<f32>(surfaces_rect.left + viewport_rect.left * res_scale); viewport.x = static_cast<s32>(surfaces_rect.left) + viewport_rect.left * res_scale;
viewport.y = static_cast<f32>(surfaces_rect.bottom + viewport_rect.bottom * res_scale); viewport.y = static_cast<s32>(surfaces_rect.bottom) + viewport_rect.bottom * res_scale;
viewport.width = static_cast<f32>(viewport_rect.GetWidth() * res_scale); viewport.width = static_cast<s32>(viewport_rect.GetWidth() * res_scale);
viewport.height = static_cast<f32>(viewport_rect.GetHeight() * res_scale); viewport.height = static_cast<s32>(viewport_rect.GetHeight() * res_scale);
// Scissor checks are window-, not viewport-relative, which means that if the cached texture // Scissor checks are window-, not viewport-relative, which means that if the cached texture
// sub-rect changes, the scissor bounds also need to be updated. // sub-rect changes, the scissor bounds also need to be updated.

8
src/video_core/rasterizer_cache/framebuffer_base.h
View File

@@ -16,10 +16,10 @@ namespace VideoCore {
class SurfaceBase; class SurfaceBase;
struct ViewportInfo { struct ViewportInfo {
f32 x; s32 x;
f32 y; s32 y;
f32 width; s32 width;
f32 height; s32 height;
}; };
/** /**

3
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@@ -389,8 +389,7 @@ bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
const Framebuffer framebuffer = const Framebuffer framebuffer =
res_cache.GetFramebufferSurfaces(using_color_fb, using_depth_fb); res_cache.GetFramebufferSurfaces(using_color_fb, using_depth_fb);
const bool has_color = framebuffer.HasAttachment(SurfaceType::Color); const bool has_color = framebuffer.HasAttachment(SurfaceType::Color);
const bool has_depth_stencil = framebuffer.HasAttachment(SurfaceType::DepthStencil); if (!has_color && shadow_rendering) {
if (!has_color && (shadow_rendering || !has_depth_stencil)) {
return true; return true;
} }

22
src/video_core/renderer_opengl/gl_texture_runtime.cpp
View File

@@ -427,15 +427,19 @@ void Surface::UploadCustom(const VideoCore::Material* material, u32 level) {
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glPixelStorei(GL_UNPACK_ROW_LENGTH, width); glPixelStorei(GL_UNPACK_ROW_LENGTH, width);
glBindTexture(GL_TEXTURE_2D, Handle(0)); const auto upload = [&](u32 index, VideoCore::CustomTexture* texture) {
glBindTexture(GL_TEXTURE_2D, Handle(index));
if (VideoCore::IsCustomFormatCompressed(custom_format)) { if (VideoCore::IsCustomFormatCompressed(custom_format)) {
const GLsizei image_size = static_cast<GLsizei>(color->data.size()); const GLsizei image_size = static_cast<GLsizei>(texture->data.size());
glCompressedTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, width, height, tuple.format, glCompressedTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, width, height, tuple.format,
image_size, color->data.data()); image_size, texture->data.data());
} else { } else {
glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, width, height, tuple.format, tuple.type, glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, width, height, tuple.format, tuple.type,
color->data.data()); texture->data.data());
} }
};
upload(0, color);
const VideoCore::TextureBlit blit = { const VideoCore::TextureBlit blit = {
.src_rect = filter_rect, .src_rect = filter_rect,
@@ -449,15 +453,7 @@ void Surface::UploadCustom(const VideoCore::Material* material, u32 level) {
if (!texture) { if (!texture) {
continue; continue;
} }
glBindTexture(GL_TEXTURE_2D, Handle(i + 1)); upload(i + 1, texture);
if (VideoCore::IsCustomFormatCompressed(custom_format)) {
const GLsizei image_size = static_cast<GLsizei>(texture->data.size());
glCompressedTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, width, height, tuple.format,
image_size, texture->data.data());
} else {
glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, width, height, tuple.format, tuple.type,
texture->data.data());
}
} }
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);