summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2019-05-07 10:50:59 +0200
committerGitHub <noreply@github.com>2019-05-07 10:50:59 +0200
commita206418846281911dfb810c60382fc33d3540220 (patch)
tree9dd8a1f01bc66cc6d96935acecb7228b88c32a6b
parentMerge pull request #2408 from FearlessTobi/port-4215 (diff)
parentshader/decode/texture: Remove unused variable (diff)
downloadyuzu-a206418846281911dfb810c60382fc33d3540220.tar
yuzu-a206418846281911dfb810c60382fc33d3540220.tar.gz
yuzu-a206418846281911dfb810c60382fc33d3540220.tar.bz2
yuzu-a206418846281911dfb810c60382fc33d3540220.tar.lz
yuzu-a206418846281911dfb810c60382fc33d3540220.tar.xz
yuzu-a206418846281911dfb810c60382fc33d3540220.tar.zst
yuzu-a206418846281911dfb810c60382fc33d3540220.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp4
-rw-r--r--src/video_core/shader/decode/texture.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index db73e746c..3cc945235 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -922,8 +922,8 @@ void RasterizerOpenGL::SyncViewport(OpenGLState& current_state) {
viewport.y = viewport_rect.bottom;
viewport.width = viewport_rect.GetWidth();
viewport.height = viewport_rect.GetHeight();
- viewport.depth_range_far = regs.viewports[i].depth_range_far;
- viewport.depth_range_near = regs.viewports[i].depth_range_near;
+ viewport.depth_range_far = src.depth_range_far;
+ viewport.depth_range_near = src.depth_range_near;
}
state.depth_clamp.far_plane = regs.view_volume_clip_control.depth_clamp_far != 0;
state.depth_clamp.near_plane = regs.view_volume_clip_control.depth_clamp_near != 0;
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp
index 819cc6131..8b574d4e5 100644
--- a/src/video_core/shader/decode/texture.cpp
+++ b/src/video_core/shader/decode/texture.cpp
@@ -541,7 +541,6 @@ Node4 ShaderIR::GetTld4Code(Instruction instr, TextureType texture_type, bool de
bool is_array, bool is_aoffi) {
const std::size_t coord_count = GetCoordCount(texture_type);
const std::size_t total_coord_count = coord_count + (is_array ? 1 : 0);
- const std::size_t total_reg_count = total_coord_count + (depth_compare ? 1 : 0);
// If enabled arrays index is always stored in the gpr8 field
const u64 array_register = instr.gpr8.Value();