gl_framebuffer_cache: Optimize framebuffer key
Pack color attachment enumerations into a single u32. To determine the number of buffers, the highest color attachment with a shared pointer that doesn't point to null is used.
This commit is contained in:
parent
c34da106ed
commit
fb6cf12a17
|
@ -3,9 +3,12 @@
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
#include "common/cityhash.h"
|
#include <glad/glad.h>
|
||||||
#include "common/scope_exit.h"
|
|
||||||
|
#include "common/common_types.h"
|
||||||
#include "video_core/engines/maxwell_3d.h"
|
#include "video_core/engines/maxwell_3d.h"
|
||||||
#include "video_core/renderer_opengl/gl_framebuffer_cache.h"
|
#include "video_core/renderer_opengl/gl_framebuffer_cache.h"
|
||||||
#include "video_core/renderer_opengl/gl_state.h"
|
#include "video_core/renderer_opengl/gl_state.h"
|
||||||
|
@ -13,6 +16,7 @@
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
|
|
||||||
using Maxwell = Tegra::Engines::Maxwell3D::Regs;
|
using Maxwell = Tegra::Engines::Maxwell3D::Regs;
|
||||||
|
using VideoCore::Surface::SurfaceType;
|
||||||
|
|
||||||
FramebufferCacheOpenGL::FramebufferCacheOpenGL() = default;
|
FramebufferCacheOpenGL::FramebufferCacheOpenGL() = default;
|
||||||
|
|
||||||
|
@ -35,36 +39,49 @@ OGLFramebuffer FramebufferCacheOpenGL::CreateFramebuffer(const FramebufferCacheK
|
||||||
local_state.draw.draw_framebuffer = framebuffer.handle;
|
local_state.draw.draw_framebuffer = framebuffer.handle;
|
||||||
local_state.ApplyFramebufferState();
|
local_state.ApplyFramebufferState();
|
||||||
|
|
||||||
for (std::size_t index = 0; index < Maxwell::NumRenderTargets; ++index) {
|
if (key.zeta) {
|
||||||
if (key.colors[index]) {
|
const bool stencil = key.zeta->GetSurfaceParams().type == SurfaceType::DepthStencil;
|
||||||
key.colors[index]->Attach(GL_COLOR_ATTACHMENT0 + static_cast<GLenum>(index),
|
const GLenum attach_target = stencil ? GL_DEPTH_STENCIL_ATTACHMENT : GL_DEPTH_ATTACHMENT;
|
||||||
GL_DRAW_FRAMEBUFFER);
|
key.zeta->Attach(attach_target, GL_DRAW_FRAMEBUFFER);
|
||||||
}
|
|
||||||
}
|
|
||||||
if (key.colors_count) {
|
|
||||||
glDrawBuffers(key.colors_count, key.color_attachments.data());
|
|
||||||
} else {
|
|
||||||
glDrawBuffer(GL_NONE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (key.zeta) {
|
std::size_t num_buffers = 0;
|
||||||
key.zeta->Attach(key.stencil_enable ? GL_DEPTH_STENCIL_ATTACHMENT : GL_DEPTH_ATTACHMENT,
|
std::array<GLenum, Maxwell::NumRenderTargets> targets;
|
||||||
GL_DRAW_FRAMEBUFFER);
|
|
||||||
|
for (std::size_t index = 0; index < Maxwell::NumRenderTargets; ++index) {
|
||||||
|
if (!key.colors[index]) {
|
||||||
|
targets[index] = GL_NONE;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const GLenum attach_target = GL_COLOR_ATTACHMENT0 + static_cast<GLenum>(index);
|
||||||
|
key.colors[index]->Attach(attach_target, GL_DRAW_FRAMEBUFFER);
|
||||||
|
|
||||||
|
const u32 attachment = (key.color_attachments >> (BitsPerAttachment * index)) & 0b1111;
|
||||||
|
targets[index] = GL_COLOR_ATTACHMENT0 + attachment;
|
||||||
|
num_buffers = index + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (num_buffers > 0) {
|
||||||
|
glDrawBuffers(static_cast<GLsizei>(num_buffers), std::data(targets));
|
||||||
|
} else {
|
||||||
|
glDrawBuffer(GL_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
return framebuffer;
|
return framebuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::size_t FramebufferCacheKey::Hash() const {
|
std::size_t FramebufferCacheKey::Hash() const noexcept {
|
||||||
static_assert(sizeof(*this) % sizeof(u64) == 0, "Unaligned struct");
|
std::size_t hash = std::hash<View>{}(zeta);
|
||||||
return static_cast<std::size_t>(
|
for (const auto& color : colors) {
|
||||||
Common::CityHash64(reinterpret_cast<const char*>(this), sizeof(*this)));
|
hash ^= std::hash<View>{}(color);
|
||||||
|
}
|
||||||
|
hash ^= static_cast<std::size_t>(color_attachments) << 16;
|
||||||
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FramebufferCacheKey::operator==(const FramebufferCacheKey& rhs) const {
|
bool FramebufferCacheKey::operator==(const FramebufferCacheKey& rhs) const noexcept {
|
||||||
return std::tie(stencil_enable, colors_count, color_attachments, colors, zeta) ==
|
return std::tie(colors, zeta, color_attachments) ==
|
||||||
std::tie(rhs.stencil_enable, rhs.colors_count, rhs.color_attachments, rhs.colors,
|
std::tie(rhs.colors, rhs.zeta, rhs.color_attachments);
|
||||||
rhs.zeta);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace OpenGL
|
} // namespace OpenGL
|
||||||
|
|
|
@ -18,21 +18,24 @@
|
||||||
|
|
||||||
namespace OpenGL {
|
namespace OpenGL {
|
||||||
|
|
||||||
struct alignas(sizeof(u64)) FramebufferCacheKey {
|
constexpr std::size_t BitsPerAttachment = 4;
|
||||||
bool stencil_enable;
|
|
||||||
u16 colors_count;
|
|
||||||
|
|
||||||
std::array<GLenum, Tegra::Engines::Maxwell3D::Regs::NumRenderTargets> color_attachments{};
|
struct FramebufferCacheKey {
|
||||||
std::array<View, Tegra::Engines::Maxwell3D::Regs::NumRenderTargets> colors;
|
|
||||||
View zeta;
|
View zeta;
|
||||||
|
std::array<View, Tegra::Engines::Maxwell3D::Regs::NumRenderTargets> colors;
|
||||||
|
u32 color_attachments = 0;
|
||||||
|
|
||||||
std::size_t Hash() const;
|
std::size_t Hash() const noexcept;
|
||||||
|
|
||||||
bool operator==(const FramebufferCacheKey& rhs) const;
|
bool operator==(const FramebufferCacheKey& rhs) const noexcept;
|
||||||
|
|
||||||
bool operator!=(const FramebufferCacheKey& rhs) const {
|
bool operator!=(const FramebufferCacheKey& rhs) const noexcept {
|
||||||
return !operator==(rhs);
|
return !operator==(rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SetAttachment(std::size_t index, u32 attachment) {
|
||||||
|
color_attachments |= attachment << (BitsPerAttachment * index);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace OpenGL
|
} // namespace OpenGL
|
||||||
|
|
|
@ -372,33 +372,31 @@ void RasterizerOpenGL::ConfigureFramebuffers() {
|
||||||
UNIMPLEMENTED_IF(regs.rt_separate_frag_data == 0);
|
UNIMPLEMENTED_IF(regs.rt_separate_frag_data == 0);
|
||||||
|
|
||||||
// Bind the framebuffer surfaces
|
// Bind the framebuffer surfaces
|
||||||
FramebufferCacheKey fbkey;
|
FramebufferCacheKey key;
|
||||||
for (std::size_t index = 0; index < Maxwell::NumRenderTargets; ++index) {
|
const auto colors_count = static_cast<std::size_t>(regs.rt_control.count);
|
||||||
|
for (std::size_t index = 0; index < colors_count; ++index) {
|
||||||
View color_surface{texture_cache.GetColorBufferSurface(index, true)};
|
View color_surface{texture_cache.GetColorBufferSurface(index, true)};
|
||||||
|
if (!color_surface) {
|
||||||
if (color_surface) {
|
continue;
|
||||||
// Assume that a surface will be written to if it is used as a framebuffer, even
|
|
||||||
// if the shader doesn't actually write to it.
|
|
||||||
texture_cache.MarkColorBufferInUse(index);
|
|
||||||
}
|
}
|
||||||
|
// Assume that a surface will be written to if it is used as a framebuffer, even
|
||||||
|
// if the shader doesn't actually write to it.
|
||||||
|
texture_cache.MarkColorBufferInUse(index);
|
||||||
|
|
||||||
fbkey.color_attachments[index] = GL_COLOR_ATTACHMENT0 + regs.rt_control.GetMap(index);
|
key.SetAttachment(index, regs.rt_control.GetMap(index));
|
||||||
fbkey.colors[index] = std::move(color_surface);
|
key.colors[index] = std::move(color_surface);
|
||||||
}
|
}
|
||||||
fbkey.colors_count = static_cast<u16>(regs.rt_control.count);
|
|
||||||
|
|
||||||
if (depth_surface) {
|
if (depth_surface) {
|
||||||
// Assume that a surface will be written to if it is used as a framebuffer, even if
|
// Assume that a surface will be written to if it is used as a framebuffer, even if
|
||||||
// the shader doesn't actually write to it.
|
// the shader doesn't actually write to it.
|
||||||
texture_cache.MarkDepthBufferInUse();
|
texture_cache.MarkDepthBufferInUse();
|
||||||
|
key.zeta = std::move(depth_surface);
|
||||||
fbkey.stencil_enable = depth_surface->GetSurfaceParams().type == SurfaceType::DepthStencil;
|
|
||||||
fbkey.zeta = std::move(depth_surface);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
texture_cache.GuardRenderTargets(false);
|
texture_cache.GuardRenderTargets(false);
|
||||||
|
|
||||||
state.draw.draw_framebuffer = framebuffer_cache.GetFramebuffer(fbkey);
|
state.draw.draw_framebuffer = framebuffer_cache.GetFramebuffer(key);
|
||||||
SyncViewport(state);
|
SyncViewport(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -421,12 +419,8 @@ void RasterizerOpenGL::ConfigureClearFramebuffer(OpenGLState& current_state, boo
|
||||||
texture_cache.GuardRenderTargets(false);
|
texture_cache.GuardRenderTargets(false);
|
||||||
|
|
||||||
FramebufferCacheKey key;
|
FramebufferCacheKey key;
|
||||||
key.colors_count = color_surface ? 1 : 0;
|
|
||||||
key.colors[0] = color_surface;
|
key.colors[0] = color_surface;
|
||||||
key.color_attachments[0] = GL_COLOR_ATTACHMENT0;
|
|
||||||
key.zeta = depth_surface;
|
key.zeta = depth_surface;
|
||||||
key.stencil_enable = depth_surface && depth_surface->GetSurfaceParams().type ==
|
|
||||||
VideoCore::Surface::SurfaceType::DepthStencil;
|
|
||||||
|
|
||||||
current_state.draw.draw_framebuffer = framebuffer_cache.GetFramebuffer(key);
|
current_state.draw.draw_framebuffer = framebuffer_cache.GetFramebuffer(key);
|
||||||
current_state.ApplyFramebufferState();
|
current_state.ApplyFramebufferState();
|
||||||
|
|
Reference in New Issue