diff options
| author | 2019-05-07 05:50:59 -0300 | |
|---|---|---|
| committer | 2019-05-07 05:50:59 -0300 | |
| commit | a206418846281911dfb810c60382fc33d3540220 (patch) | |
| tree | 9dd8a1f01bc66cc6d96935acecb7228b88c32a6b /src | |
| parent | Merge pull request #2408 from FearlessTobi/port-4215 (diff) | |
| parent | shader/decode/texture: Remove unused variable (diff) | |
| download | yuzu-a206418846281911dfb810c60382fc33d3540220.tar.gz yuzu-a206418846281911dfb810c60382fc33d3540220.tar.xz yuzu-a206418846281911dfb810c60382fc33d3540220.zip | |
Merge pull request #2449 from lioncash/unused-var
gl_rasterizer: Silence unused variable warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/shader/decode/texture.cpp | 1 |
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) { | |||
| 922 | viewport.y = viewport_rect.bottom; | 922 | viewport.y = viewport_rect.bottom; |
| 923 | viewport.width = viewport_rect.GetWidth(); | 923 | viewport.width = viewport_rect.GetWidth(); |
| 924 | viewport.height = viewport_rect.GetHeight(); | 924 | viewport.height = viewport_rect.GetHeight(); |
| 925 | viewport.depth_range_far = regs.viewports[i].depth_range_far; | 925 | viewport.depth_range_far = src.depth_range_far; |
| 926 | viewport.depth_range_near = regs.viewports[i].depth_range_near; | 926 | viewport.depth_range_near = src.depth_range_near; |
| 927 | } | 927 | } |
| 928 | state.depth_clamp.far_plane = regs.view_volume_clip_control.depth_clamp_far != 0; | 928 | state.depth_clamp.far_plane = regs.view_volume_clip_control.depth_clamp_far != 0; |
| 929 | state.depth_clamp.near_plane = regs.view_volume_clip_control.depth_clamp_near != 0; | 929 | 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 | |||
| 541 | bool is_array, bool is_aoffi) { | 541 | bool is_array, bool is_aoffi) { |
| 542 | const std::size_t coord_count = GetCoordCount(texture_type); | 542 | const std::size_t coord_count = GetCoordCount(texture_type); |
| 543 | const std::size_t total_coord_count = coord_count + (is_array ? 1 : 0); | 543 | const std::size_t total_coord_count = coord_count + (is_array ? 1 : 0); |
| 544 | const std::size_t total_reg_count = total_coord_count + (depth_compare ? 1 : 0); | ||
| 545 | 544 | ||
| 546 | // If enabled arrays index is always stored in the gpr8 field | 545 | // If enabled arrays index is always stored in the gpr8 field |
| 547 | const u64 array_register = instr.gpr8.Value(); | 546 | const u64 array_register = instr.gpr8.Value(); |