From 1d78b910518eed73073e511cb93cd39e5a3497c1 Mon Sep 17 00:00:00 2001
From: Artem Kharytoniuk <artemalive@gmail.com>
Date: Mon, 1 May 2017 23:35:04 +0300
Subject: [PATCH] Fixed incorrect model positioning in model selection menu. In
 general scissor and viewport  rectangles are different: scissor should be
 inside renderable area, viewport has no such restriction.

---
 src/engine/renderer/tr_backend.c |  2 +-
 src/engine/renderer/vk.cpp       | 86 ++++++++++++++++++--------------
 src/engine/renderer/vk.h         |  2 +-
 3 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/engine/renderer/tr_backend.c b/src/engine/renderer/tr_backend.c
index 9a000de..27966b7 100644
--- a/src/engine/renderer/tr_backend.c
+++ b/src/engine/renderer/tr_backend.c
@@ -457,7 +457,7 @@ void RB_BeginDrawingView (void) {
         }
 
         VkClearRect clear_rect[2];
-		clear_rect[0].rect = vk_get_viewport_rect();
+		clear_rect[0].rect = vk_get_scissor_rect();
 		clear_rect[0].baseArrayLayer = 0;
 		clear_rect[0].layerCount = 1;
 		int rect_count = 1;
diff --git a/src/engine/renderer/vk.cpp b/src/engine/renderer/vk.cpp
index dfc4d39..a6c84eb 100644
--- a/src/engine/renderer/vk.cpp
+++ b/src/engine/renderer/vk.cpp
@@ -1617,9 +1617,8 @@ VkPipeline vk_find_pipeline(const Vk_Pipeline_Def& def) {
     return pipeline;
 }
 
-VkRect2D vk_get_viewport_rect() {
+static VkRect2D get_viewport_rect() {
     VkRect2D r;
-
     if (backEnd.projection2D) {
         r.offset.x = 0.0f;
         r.offset.y = 0.0f;
@@ -1627,24 +1626,56 @@ VkRect2D vk_get_viewport_rect() {
         r.extent.height = glConfig.vidHeight;
     } else {
         r.offset.x = backEnd.viewParms.viewportX;
-        if (r.offset.x < 0)
-            r.offset.x = 0;
-
         r.offset.y = glConfig.vidHeight - (backEnd.viewParms.viewportY + backEnd.viewParms.viewportHeight);
-        if (r.offset.y < 0)
-            r.offset.y = 0;
-
         r.extent.width = backEnd.viewParms.viewportWidth;
-        if (r.offset.x + r.extent.width > glConfig.vidWidth)
-            r.extent.width = glConfig.vidWidth - r.offset.x;
-
         r.extent.height = backEnd.viewParms.viewportHeight;
-        if (r.offset.y + r.extent.height > glConfig.vidHeight)
-            r.extent.height = glConfig.vidHeight - r.offset.y;
     }
     return r;
 }
 
+static VkViewport get_viewport(bool sky_depth_range) {
+    VkRect2D r = get_viewport_rect();
+
+    VkViewport viewport;
+    viewport.x = (float)r.offset.x;
+    viewport.y = (float)r.offset.y;
+    viewport.width = (float)r.extent.width;
+    viewport.height = (float)r.extent.height;
+    viewport.minDepth = 0.0f;
+    viewport.maxDepth = 1.0f;
+
+    if (backEnd.currentEntity->e.renderfx & RF_DEPTHHACK) {
+        viewport.maxDepth = 0.3f;
+    }
+
+    if (sky_depth_range) {
+        if (r_showsky->integer) {
+            viewport.minDepth = 0.0f;
+            viewport.maxDepth = 0.0f;
+        } else {
+            viewport.minDepth = 1.0f;
+            viewport.maxDepth = 1.0f;
+        }
+    }
+    return viewport;
+}
+
+VkRect2D vk_get_scissor_rect() {
+    VkRect2D r = get_viewport_rect();
+
+    if (r.offset.x < 0)
+        r.offset.x = 0;
+    if (r.offset.y < 0)
+        r.offset.y = 0;
+
+    if (r.offset.x + r.extent.width > glConfig.vidWidth)
+        r.extent.width = glConfig.vidWidth - r.offset.x;
+    if (r.offset.y + r.extent.height > glConfig.vidHeight)
+        r.extent.height = glConfig.vidHeight - r.offset.y;
+
+    return r;
+}
+
 static void get_mvp_transform(float* mvp) {
     if (backEnd.projection2D) {
         float mvp0 = 2.0f / glConfig.vidWidth;
@@ -1743,7 +1774,7 @@ void vk_bind_resources_shared_between_stages() {
     vkCmdPushConstants(vk.command_buffer, vk.pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT, 0, push_constants_size, push_constants);
 }
 
-void vk_bind_stage_specific_resources(VkPipeline pipeline, bool multitexture, bool sky) {
+void vk_bind_stage_specific_resources(VkPipeline pipeline, bool multitexture, bool sky_depth_range) {
     //
     // Specify color/st for each draw call since they are regenerated for each Q3 shader's stage.
     // xyz are specified only once for all stages.
@@ -1801,31 +1832,10 @@ void vk_bind_stage_specific_resources(VkPipeline pipeline, bool multitexture, bo
     vkCmdBindPipeline(vk.command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
 
     // configure pipeline's dynamic state
-    VkRect2D r = vk_get_viewport_rect();
-    vkCmdSetScissor(vk.command_buffer, 0, 1, &r);
-
-    VkViewport viewport;
-    viewport.x = (float)r.offset.x;
-    viewport.y = (float)r.offset.y;
-    viewport.width = (float)r.extent.width;
-    viewport.height = (float)r.extent.height;
-    viewport.minDepth = 0.0f;
-    viewport.maxDepth = 1.0f;
-
-	if (backEnd.currentEntity->e.renderfx & RF_DEPTHHACK) {
-		viewport.maxDepth = 0.3f;
-	}
-
-	if (sky) {
-		if (r_showsky->integer) {
-			viewport.minDepth = 0.0f;
-			viewport.maxDepth = 0.0f;
-		} else {
-			viewport.minDepth = 1.0f;
-			viewport.maxDepth = 1.0f;
-		}
-	}
+    VkRect2D scissor_rect = vk_get_scissor_rect();
+    vkCmdSetScissor(vk.command_buffer, 0, 1, &scissor_rect);
 
+    VkViewport viewport = get_viewport(sky_depth_range);
     vkCmdSetViewport(vk.command_buffer, 0, 1, &viewport);
 
     if (tess.shader->polygonOffset) {
diff --git a/src/engine/renderer/vk.h b/src/engine/renderer/vk.h
index acbe9fe..daf216b 100644
--- a/src/engine/renderer/vk.h
+++ b/src/engine/renderer/vk.h
@@ -70,7 +70,7 @@ VkPipeline vk_find_pipeline(const Vk_Pipeline_Def& def);
 //
 // Rendering setup.
 //
-VkRect2D vk_get_viewport_rect();
+VkRect2D vk_get_scissor_rect();
 void vk_bind_resources_shared_between_stages();
 void vk_bind_stage_specific_resources(VkPipeline pipeline, bool multitexture, bool sky);
 void vk_begin_frame();