summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_rasterizer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp117
1 files changed, 26 insertions, 91 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 3fbf8e1f9..bc463fc30 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -146,7 +146,6 @@ std::pair<u8*, GLintptr> RasterizerOpenGL::SetupVertexArrays(u8* array_ptr,
u64 size = end - start + 1;
// Copy vertex array data
- res_cache.FlushRegion(start, size, nullptr);
Memory::ReadBlock(*memory_manager->GpuToCpuAddress(start), array_ptr, size);
// Bind the vertex array to the buffer at the current offset.
@@ -325,29 +324,22 @@ void RasterizerOpenGL::DrawArrays() {
std::tie(color_surface, depth_surface, surfaces_rect) =
res_cache.GetFramebufferSurfaces(using_color_fb, using_depth_fb, viewport_rect);
- const u16 res_scale = color_surface != nullptr
- ? color_surface->res_scale
- : (depth_surface == nullptr ? 1u : depth_surface->res_scale);
-
MathUtil::Rectangle<u32> draw_rect{
+ static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + viewport_rect.left,
+ surfaces_rect.left, surfaces_rect.right)), // Left
+ static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + viewport_rect.top,
+ surfaces_rect.bottom, surfaces_rect.top)), // Top
+ static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + viewport_rect.right,
+ surfaces_rect.left, surfaces_rect.right)), // Right
static_cast<u32>(
- std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + viewport_rect.left * res_scale,
- surfaces_rect.left, surfaces_rect.right)), // Left
- static_cast<u32>(
- std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + viewport_rect.top * res_scale,
- surfaces_rect.bottom, surfaces_rect.top)), // Top
- static_cast<u32>(
- std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + viewport_rect.right * res_scale,
- surfaces_rect.left, surfaces_rect.right)), // Right
- static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) +
- viewport_rect.bottom * res_scale,
- surfaces_rect.bottom, surfaces_rect.top))}; // Bottom
+ std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + viewport_rect.bottom,
+ surfaces_rect.bottom, surfaces_rect.top))}; // Bottom
// Bind the framebuffer surfaces
BindFramebufferSurfaces(color_surface, depth_surface, has_stencil);
// Sync the viewport
- SyncViewport(surfaces_rect, res_scale);
+ SyncViewport(surfaces_rect);
// Sync the blend state registers
SyncBlendState();
@@ -442,44 +434,23 @@ void RasterizerOpenGL::DrawArrays() {
state.Apply();
// Mark framebuffer surfaces as dirty
- MathUtil::Rectangle<u32> draw_rect_unscaled{
- draw_rect.left / res_scale, draw_rect.top / res_scale, draw_rect.right / res_scale,
- draw_rect.bottom / res_scale};
-
if (color_surface != nullptr && write_color_fb) {
- auto interval = color_surface->GetSubRectInterval(draw_rect_unscaled);
- res_cache.InvalidateRegion(boost::icl::first(interval), boost::icl::length(interval),
- color_surface);
+ res_cache.FlushSurface(color_surface);
}
if (depth_surface != nullptr && write_depth_fb) {
- auto interval = depth_surface->GetSubRectInterval(draw_rect_unscaled);
- res_cache.InvalidateRegion(boost::icl::first(interval), boost::icl::length(interval),
- depth_surface);
+ res_cache.FlushSurface(depth_surface);
}
}
void RasterizerOpenGL::NotifyMaxwellRegisterChanged(u32 method) {}
-void RasterizerOpenGL::FlushAll() {
- MICROPROFILE_SCOPE(OpenGL_CacheManagement);
- res_cache.FlushAll();
-}
+void RasterizerOpenGL::FlushAll() {}
-void RasterizerOpenGL::FlushRegion(Tegra::GPUVAddr addr, u64 size) {
- MICROPROFILE_SCOPE(OpenGL_CacheManagement);
- res_cache.FlushRegion(addr, size);
-}
+void RasterizerOpenGL::FlushRegion(Tegra::GPUVAddr addr, u64 size) {}
-void RasterizerOpenGL::InvalidateRegion(Tegra::GPUVAddr addr, u64 size) {
- MICROPROFILE_SCOPE(OpenGL_CacheManagement);
- res_cache.InvalidateRegion(addr, size, nullptr);
-}
+void RasterizerOpenGL::InvalidateRegion(Tegra::GPUVAddr addr, u64 size) {}
-void RasterizerOpenGL::FlushAndInvalidateRegion(Tegra::GPUVAddr addr, u64 size) {
- MICROPROFILE_SCOPE(OpenGL_CacheManagement);
- res_cache.FlushRegion(addr, size);
- res_cache.InvalidateRegion(addr, size, nullptr);
-}
+void RasterizerOpenGL::FlushAndInvalidateRegion(Tegra::GPUVAddr addr, u64 size) {}
bool RasterizerOpenGL::AccelerateDisplayTransfer(const void* config) {
MICROPROFILE_SCOPE(OpenGL_Blits);
@@ -500,44 +471,8 @@ bool RasterizerOpenGL::AccelerateFill(const void* config) {
bool RasterizerOpenGL::AccelerateDisplay(const Tegra::FramebufferConfig& framebuffer,
VAddr framebuffer_addr, u32 pixel_stride,
ScreenInfo& screen_info) {
- if (framebuffer_addr == 0) {
- return false;
- }
- MICROPROFILE_SCOPE(OpenGL_CacheManagement);
-
- SurfaceParams src_params;
- src_params.cpu_addr = framebuffer_addr;
- src_params.addr = res_cache.TryFindFramebufferGpuAddress(framebuffer_addr).get_value_or(0);
- src_params.width = std::min(framebuffer.width, pixel_stride);
- src_params.height = framebuffer.height;
- src_params.stride = pixel_stride;
- src_params.is_tiled = true;
- src_params.block_height = Tegra::Texture::TICEntry::DefaultBlockHeight;
- src_params.pixel_format =
- SurfaceParams::PixelFormatFromGPUPixelFormat(framebuffer.pixel_format);
- src_params.component_type =
- SurfaceParams::ComponentTypeFromGPUPixelFormat(framebuffer.pixel_format);
- src_params.UpdateParams();
-
- MathUtil::Rectangle<u32> src_rect;
- Surface src_surface;
- std::tie(src_surface, src_rect) =
- res_cache.GetSurfaceSubRect(src_params, ScaleMatch::Ignore, true);
-
- if (src_surface == nullptr) {
- return false;
- }
-
- u32 scaled_width = src_surface->GetScaledWidth();
- u32 scaled_height = src_surface->GetScaledHeight();
-
- screen_info.display_texcoords = MathUtil::Rectangle<float>(
- (float)src_rect.bottom / (float)scaled_height, (float)src_rect.left / (float)scaled_width,
- (float)src_rect.top / (float)scaled_height, (float)src_rect.right / (float)scaled_width);
-
- screen_info.display_texture = src_surface->texture.handle;
-
- return true;
+ // TODO(bunnei): ImplementMe
+ return false;
}
void RasterizerOpenGL::SamplerInfo::Create() {
@@ -674,7 +609,7 @@ u32 RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, GLuint program,
texture_samplers[current_bindpoint].SyncWithConfig(texture.tsc);
Surface surface = res_cache.GetTextureSurface(texture);
if (surface != nullptr) {
- state.texture_units[current_bindpoint].texture_2d = surface->texture.handle;
+ state.texture_units[current_bindpoint].texture_2d = surface->Texture().handle;
state.texture_units[current_bindpoint].swizzle.r =
MaxwellToGL::SwizzleSource(texture.tic.x_source);
state.texture_units[current_bindpoint].swizzle.g =
@@ -700,16 +635,16 @@ void RasterizerOpenGL::BindFramebufferSurfaces(const Surface& color_surface,
state.Apply();
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
- color_surface != nullptr ? color_surface->texture.handle : 0, 0);
+ color_surface != nullptr ? color_surface->Texture().handle : 0, 0);
if (depth_surface != nullptr) {
if (has_stencil) {
// attach both depth and stencil
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D,
- depth_surface->texture.handle, 0);
+ depth_surface->Texture().handle, 0);
} else {
// attach depth
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D,
- depth_surface->texture.handle, 0);
+ depth_surface->Texture().handle, 0);
// clear stencil attachment
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0);
}
@@ -720,14 +655,14 @@ void RasterizerOpenGL::BindFramebufferSurfaces(const Surface& color_surface,
}
}
-void RasterizerOpenGL::SyncViewport(const MathUtil::Rectangle<u32>& surfaces_rect, u16 res_scale) {
+void RasterizerOpenGL::SyncViewport(const MathUtil::Rectangle<u32>& surfaces_rect) {
const auto& regs = Core::System().GetInstance().GPU().Maxwell3D().regs;
const MathUtil::Rectangle<s32> viewport_rect{regs.viewport_transform[0].GetRect()};
- state.viewport.x = static_cast<GLint>(surfaces_rect.left) + viewport_rect.left * res_scale;
- state.viewport.y = static_cast<GLint>(surfaces_rect.bottom) + viewport_rect.bottom * res_scale;
- state.viewport.width = static_cast<GLsizei>(viewport_rect.GetWidth() * res_scale);
- state.viewport.height = static_cast<GLsizei>(viewport_rect.GetHeight() * res_scale);
+ state.viewport.x = static_cast<GLint>(surfaces_rect.left) + viewport_rect.left;
+ state.viewport.y = static_cast<GLint>(surfaces_rect.bottom) + viewport_rect.bottom;
+ state.viewport.width = static_cast<GLsizei>(viewport_rect.GetWidth());
+ state.viewport.height = static_cast<GLsizei>(viewport_rect.GetHeight());
}
void RasterizerOpenGL::SyncClipEnabled() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 09:03:48 +0200