From aa2a9deb5fa6c3908a2818be2c33d8897eecbaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Wed, 8 Feb 2017 18:17:59 -0800
Subject: [PATCH] Cleanup.

---
 src/bgfx_p.h           | 27 ++++++++++++++++++++++++++-
 src/renderer_d3d11.cpp |  2 +-
 src/renderer_d3d12.cpp |  4 ++--
 src/renderer_d3d9.cpp  |  2 +-
 src/renderer_gl.cpp    |  2 +-
 src/renderer_mtl.mm    |  2 +-
 src/renderer_vk.cpp    |  4 ++--
 7 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index dcef0afdc..bdf38e85f 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -273,6 +273,18 @@ namespace bgfx
 
 	struct Rect
 	{
+		Rect()
+		{
+		}
+
+		Rect(uint16_t _x, uint16_t _y, uint16_t _width, uint16_t _height)
+			: m_x(_x)
+			, m_y(_y)
+			, m_width(_width)
+			, m_height(_height)
+		{
+		}
+
 		void clear()
 		{
 			m_x =
@@ -294,7 +306,15 @@ namespace bgfx
 				;
 		}
 
-		void intersect(const Rect& _a, const Rect& _b)
+		void set(uint16_t _x, uint16_t _y, uint16_t _width, uint16_t _height)
+		{
+			m_x = _x;
+			m_y = _y;
+			m_width  = _width;
+			m_height = _height;
+		}
+
+		void setIntersect(const Rect& _a, const Rect& _b)
 		{
 			using namespace bx;
 			const uint16_t sx = uint16_max(_a.m_x, _b.m_x);
@@ -307,6 +327,11 @@ namespace bgfx
 			m_height = (uint16_t)uint32_satsub(ey, sy);
 		}
 
+		void intersect(const Rect& _a)
+		{
+			setIntersect(*this, _a);
+		}
+
 		uint16_t m_x;
 		uint16_t m_y;
 		uint16_t m_width;
diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp
index 35b6b6124..6e15fb915 100644
--- a/src/renderer_d3d11.cpp
+++ b/src/renderer_d3d11.cpp
@@ -5754,7 +5754,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
 					else
 					{
 						Rect scissorRect;
-						scissorRect.intersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
+						scissorRect.setIntersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
 						if (scissorRect.isZeroArea() )
 						{
 							continue;
diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp
index 1873e96c9..43f0d7088 100644
--- a/src/renderer_d3d12.cpp
+++ b/src/renderer_d3d12.cpp
@@ -4909,7 +4909,7 @@ data.NumQualityLevels = 0;
 					if (BGFX_CLEAR_NONE != clr.m_flags)
 					{
 						Rect clearRect = rect;
-						clearRect.intersect(rect, viewScissorRect);
+						clearRect.setIntersect(rect, viewScissorRect);
 						clearQuad(clearRect, clr, _render->m_colorPalette);
 					}
 
@@ -5372,7 +5372,7 @@ data.NumQualityLevels = 0;
 						{
 							restoreScissor = true;
 							Rect scissorRect;
-							scissorRect.intersect(viewScissorRect,_render->m_rectCache.m_cache[scissor]);
+							scissorRect.setIntersect(viewScissorRect,_render->m_rectCache.m_cache[scissor]);
 							if (scissorRect.isZeroArea() )
 							{
 								continue;
diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp
index 58e45db90..86183fac2 100644
--- a/src/renderer_d3d9.cpp
+++ b/src/renderer_d3d9.cpp
@@ -3795,7 +3795,7 @@ namespace bgfx { namespace d3d9
 					else
 					{
 						Rect scissorRect;
-						scissorRect.intersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
+						scissorRect.setIntersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
 						if (scissorRect.isZeroArea() )
 						{
 							continue;
diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index 93a714ea1..a4ee0fc55 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -6601,7 +6601,7 @@ namespace bgfx { namespace gl
 					else
 					{
 						Rect scissorRect;
-						scissorRect.intersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
+						scissorRect.setIntersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
 						if (scissorRect.isZeroArea() )
 						{
 							continue;
diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm
index 1c1749700..4051c4c33 100644
--- a/src/renderer_mtl.mm
+++ b/src/renderer_mtl.mm
@@ -3416,7 +3416,7 @@ namespace bgfx { namespace mtl
 					else
 					{
 						Rect scissorRect;
-						scissorRect.intersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
+						scissorRect.setIntersect(viewScissorRect, _render->m_rectCache.m_cache[scissor]);
 						if (scissorRect.isZeroArea() )
 						{
 							continue;
diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp
index 7609b43d5..f1bd0febc 100644
--- a/src/renderer_vk.cpp
+++ b/src/renderer_vk.cpp
@@ -3805,7 +3805,7 @@ BX_UNUSED(currentSamplerStateIdx);
 					if (BGFX_CLEAR_NONE != clr.m_flags)
 					{
 						Rect clearRect = rect;
-						clearRect.intersect(rect, viewScissorRect);
+						clearRect.setIntersect(rect, viewScissorRect);
 						clearQuad(clearRect, clr, _render->m_colorPalette);
 					}
 
@@ -4261,7 +4261,7 @@ BX_UNUSED(currentSamplerStateIdx);
 						{
 							restoreScissor = true;
 							Rect scissorRect;
-							scissorRect.intersect(viewScissorRect,_render->m_rectCache.m_cache[scissor]);
+							scissorRect.setIntersect(viewScissorRect,_render->m_rectCache.m_cache[scissor]);
 							if (scissorRect.isZeroArea() )
 							{
 								continue;