diff options
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 29 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 1 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 16af8e6bd..d376d86d8 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -370,27 +370,32 @@ void RasterizerOpenGL::DrawTexture() { const auto& sampler = texture_cache.GetGraphicsSampler(draw_texture_state.src_sampler); const auto& texture = texture_cache.GetImageView(draw_texture_state.src_texture); + const auto Scale = [&](auto dim) -> s32 { + return Settings::values.resolution_info.ScaleUp(static_cast<s32>(dim)); + }; + + Region2D dst_region = { + Offset2D{.x = Scale(draw_texture_state.dst_x0), .y = Scale(draw_texture_state.dst_y0)}, + Offset2D{.x = Scale(draw_texture_state.dst_x1), .y = Scale(draw_texture_state.dst_y1)}}; + Region2D src_region = { + Offset2D{.x = Scale(draw_texture_state.src_x0), .y = Scale(draw_texture_state.src_y0)}, + Offset2D{.x = Scale(draw_texture_state.src_x1), .y = Scale(draw_texture_state.src_y1)}}; + Extent3D src_size = {static_cast<u32>(Scale(texture.size.width)), + static_cast<u32>(Scale(texture.size.height)), texture.size.depth}; + if (device.HasDrawTexture()) { state_tracker.BindFramebuffer(texture_cache.GetFramebuffer()->Handle()); - glDrawTextureNV(texture.DefaultHandle(), sampler->Handle(), draw_texture_state.dst_x0, - draw_texture_state.dst_y0, draw_texture_state.dst_x1, - draw_texture_state.dst_y1, 0, + glDrawTextureNV(texture.DefaultHandle(), sampler->Handle(), + static_cast<f32>(dst_region.start.x), static_cast<f32>(dst_region.start.y), + static_cast<f32>(dst_region.end.x), static_cast<f32>(dst_region.end.y), 0, draw_texture_state.src_x0 / static_cast<float>(texture.size.width), draw_texture_state.src_y0 / static_cast<float>(texture.size.height), draw_texture_state.src_x1 / static_cast<float>(texture.size.width), draw_texture_state.src_y1 / static_cast<float>(texture.size.height)); } else { - Region2D dst_region = {Offset2D{.x = static_cast<s32>(draw_texture_state.dst_x0), - .y = static_cast<s32>(draw_texture_state.dst_y0)}, - Offset2D{.x = static_cast<s32>(draw_texture_state.dst_x1), - .y = static_cast<s32>(draw_texture_state.dst_y1)}}; - Region2D src_region = {Offset2D{.x = static_cast<s32>(draw_texture_state.src_x0), - .y = static_cast<s32>(draw_texture_state.src_y0)}, - Offset2D{.x = static_cast<s32>(draw_texture_state.src_x1), - .y = static_cast<s32>(draw_texture_state.src_y1)}}; blit_image.BlitColor(texture_cache.GetFramebuffer()->Handle(), texture.DefaultHandle(), - sampler->Handle(), dst_region, src_region, texture.size); + sampler->Handle(), dst_region, src_region, src_size); state_tracker.InvalidateState(); } diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 50462cdde..c4bad6fca 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -215,6 +215,7 @@ ShaderCache::ShaderCache(Tegra::MaxwellDeviceMemoryManager& device_memory_, .support_gl_variable_aoffi = device.HasVariableAoffi(), .support_gl_sparse_textures = device.HasSparseTexture2(), .support_gl_derivative_control = device.HasDerivativeControl(), + .support_geometry_streams = true, .warp_size_potentially_larger_than_guest = device.IsWarpSizePotentiallyLargerThanGuest(), |