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

vk_shader_gen_spv: Fix scissor test

Browse Source
This commit is contained in:
GPUCode
2023-01-24 22:15:59 +02:00
parent 247b6900c7
commit 89217f8c4b
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@@ -787,13 +787,6 @@ bool RasterizerVulkan::Draw(bool accelerate, bool is_indexed) {
depth_surface); depth_surface);
} }
static int submit_threshold = 20;
submit_threshold--;
if (!submit_threshold) {
submit_threshold = 20;
scheduler.DispatchWork();
}
return succeeded; return succeeded;
} }

8
src/video_core/renderer_vulkan/vk_shader_gen_spv.cpp
View File

@@ -2,10 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/microprofile.h"
#include "core/core.h" #include "core/core.h"
#include "video_core/renderer_vulkan/vk_shader_gen_spv.h" #include "video_core/renderer_vulkan/vk_shader_gen_spv.h"
#include "video_core/shader/shader_uniforms.h"
using Pica::FramebufferRegs; using Pica::FramebufferRegs;
using Pica::LightingRegs; using Pica::LightingRegs;
@@ -43,7 +41,7 @@ void FragmentModule::Generate() {
} }
// Check if the fragment is outside scissor rectangle // Check if the fragment is outside scissor rectangle
// WriteScissor(); WriteScissor();
// Write shader bytecode to emulate all enabled PICA lights // Write shader bytecode to emulate all enabled PICA lights
if (config.state.lighting.enable) { if (config.state.lighting.enable) {
@@ -130,9 +128,7 @@ void FragmentModule::WriteScissor() {
return; return;
} }
const Id input_pointer_id{TypePointer(spv::StorageClass::Input, vec_ids.Get(4))}; const Id gl_frag_coord{OpLoad(vec_ids.Get(4), gl_frag_coord_id)};
const Id input_pointer{OpAccessChain(input_pointer_id, gl_frag_coord_id)};
const Id gl_frag_coord{OpLoad(vec_ids.Get(4), input_pointer)};
const Id gl_frag_coord_xy{OpVectorShuffle(vec_ids.Get(2), gl_frag_coord, gl_frag_coord, 0, 1)}; const Id gl_frag_coord_xy{OpVectorShuffle(vec_ids.Get(2), gl_frag_coord, gl_frag_coord, 0, 1)};
const Id scissor_x1{GetShaderDataMember(i32_id, ConstS32(6))}; const Id scissor_x1{GetShaderDataMember(i32_id, ConstS32(6))};