summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
-rw-r--r--src/video_core/renderer_vulkan/renderer_vulkan.cpp13
-rw-r--r--src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp5
-rw-r--r--src/video_core/renderer_vulkan/vk_rasterizer.cpp2
4 files changed, 13 insertions, 9 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index dab0afe6d..c9cfa6366 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -24,8 +24,8 @@
24#include "video_core/host_shaders/opengl_present_frag.h" 24#include "video_core/host_shaders/opengl_present_frag.h"
25#include "video_core/host_shaders/opengl_present_vert.h" 25#include "video_core/host_shaders/opengl_present_vert.h"
26#include "video_core/renderer_opengl/gl_rasterizer.h" 26#include "video_core/renderer_opengl/gl_rasterizer.h"
27#include "video_core/renderer_opengl/gl_shader_util.h"
28#include "video_core/renderer_opengl/gl_shader_manager.h" 27#include "video_core/renderer_opengl/gl_shader_manager.h"
28#include "video_core/renderer_opengl/gl_shader_util.h"
29#include "video_core/renderer_opengl/renderer_opengl.h" 29#include "video_core/renderer_opengl/renderer_opengl.h"
30#include "video_core/textures/decoders.h" 30#include "video_core/textures/decoders.h"
31 31
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
index 6fda06a7e..a8d04dc61 100644
--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
@@ -97,14 +97,19 @@ RendererVulkan::RendererVulkan(Core::TelemetrySession& telemetry_session_,
97 Core::Frontend::EmuWindow& emu_window, 97 Core::Frontend::EmuWindow& emu_window,
98 Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_, 98 Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_,
99 std::unique_ptr<Core::Frontend::GraphicsContext> context_) try 99 std::unique_ptr<Core::Frontend::GraphicsContext> context_) try
100 : RendererBase(emu_window, std::move(context_)), telemetry_session(telemetry_session_), 100 : RendererBase(emu_window, std::move(context_)),
101 cpu_memory(cpu_memory_), gpu(gpu_), library(OpenLibrary()), 101 telemetry_session(telemetry_session_),
102 cpu_memory(cpu_memory_),
103 gpu(gpu_),
104 library(OpenLibrary()),
102 instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type, 105 instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type,
103 true, Settings::values.renderer_debug.GetValue())), 106 true, Settings::values.renderer_debug.GetValue())),
104 debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr), 107 debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr),
105 surface(CreateSurface(instance, render_window)), 108 surface(CreateSurface(instance, render_window)),
106 device(CreateDevice(instance, dld, *surface)), memory_allocator(device, false), 109 device(CreateDevice(instance, dld, *surface)),
107 state_tracker(gpu), scheduler(device, state_tracker), 110 memory_allocator(device, false),
111 state_tracker(gpu),
112 scheduler(device, state_tracker),
108 swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, 113 swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width,
109 render_window.GetFramebufferLayout().height, false), 114 render_window.GetFramebufferLayout().height, false),
110 blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler, 115 blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler,
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index f0ae0b0d6..18482e1d0 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -503,9 +503,8 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
503 vertex_attributes.push_back({ 503 vertex_attributes.push_back({
504 .location = static_cast<u32>(index), 504 .location = static_cast<u32>(index),
505 .binding = 0, 505 .binding = 0,
506 .format = type == 1 ? VK_FORMAT_R32_SFLOAT 506 .format = type == 1 ? VK_FORMAT_R32_SFLOAT
507 : type == 2 ? VK_FORMAT_R32_SINT 507 : type == 2 ? VK_FORMAT_R32_SINT : VK_FORMAT_R32_UINT,
508 : VK_FORMAT_R32_UINT,
509 .offset = 0, 508 .offset = 0,
510 }); 509 });
511 } 510 }
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index 99576b826..c7a07fdd8 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -141,7 +141,7 @@ RasterizerVulkan::RasterizerVulkan(Core::Frontend::EmuWindow& emu_window_, Tegra
141 pipeline_cache(*this, maxwell3d, kepler_compute, gpu_memory, device, scheduler, 141 pipeline_cache(*this, maxwell3d, kepler_compute, gpu_memory, device, scheduler,
142 descriptor_pool, update_descriptor_queue, render_pass_cache, buffer_cache, 142 descriptor_pool, update_descriptor_queue, render_pass_cache, buffer_cache,
143 texture_cache, gpu.ShaderNotify()), 143 texture_cache, gpu.ShaderNotify()),
144 query_cache{*this, maxwell3d, gpu_memory, device, scheduler}, accelerate_dma{ buffer_cache }, 144 query_cache{*this, maxwell3d, gpu_memory, device, scheduler}, accelerate_dma{buffer_cache},
145 fence_manager(*this, gpu, texture_cache, buffer_cache, query_cache, device, scheduler), 145 fence_manager(*this, gpu, texture_cache, buffer_cache, query_cache, device, scheduler),
146 wfi_event(device.GetLogical().CreateEvent()) { 146 wfi_event(device.GetLogical().CreateEvent()) {
147 scheduler.SetQueryCache(query_cache); 147 scheduler.SetQueryCache(query_cache);