From 10860ed5621151b96f710367ef4de852c4ec2fe0 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Fri, 31 Jul 2020 12:36:37 +0200
Subject: [PATCH] Improve code

---
 include/Nazara/Renderer/SpirvWriter.inl |  2 +-
 src/Nazara/Renderer/SpirvWriter.cpp     | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/include/Nazara/Renderer/SpirvWriter.inl b/include/Nazara/Renderer/SpirvWriter.inl
index 86f578d3d..366e8ac46 100644
--- a/include/Nazara/Renderer/SpirvWriter.inl
+++ b/include/Nazara/Renderer/SpirvWriter.inl
@@ -49,7 +49,7 @@ namespace Nz
 
 	inline unsigned int SpirvWriter::CountWord(const std::string_view& str)
 	{
-		return (str.size() + 1 + 4 - 1) / 4; //< + 1 for null character
+		return (static_cast<unsigned int>(str.size() + 1) + sizeof(UInt32) - 1) / sizeof(UInt32); //< + 1 for null character
 	}
 }
 
diff --git a/src/Nazara/Renderer/SpirvWriter.cpp b/src/Nazara/Renderer/SpirvWriter.cpp
index 863666588..ea74e5066 100644
--- a/src/Nazara/Renderer/SpirvWriter.cpp
+++ b/src/Nazara/Renderer/SpirvWriter.cpp
@@ -40,10 +40,6 @@ namespace Nz
 
 		AppendHeader();
 
-		// OpImageSampleImplicitLod %23 %31 %35
-
-		//Append("BONJOUR PRAETONUS");
-
 		std::vector<UInt32> ret = std::move(state.output);
 		return ret;
 	}
@@ -58,17 +54,13 @@ namespace Nz
 		std::size_t size4 = CountWord(str);
 		for (std::size_t i = 0; i < size4; ++i)
 		{
-			auto GetChar = [&](std::size_t pos) -> UInt32
-			{
-				if (pos < str.size())
-					return static_cast<UInt32>(str[pos]);
-				else
-					return 0;
-			};
-
 			UInt32 codepoint = 0;
 			for (std::size_t j = 0; j < 4; ++j)
-				codepoint |= GetChar(i * 4 + j) << (j * 8);
+			{
+				std::size_t pos = i * 4 + j;
+				if (pos < str.size())
+					codepoint |= UInt32(str[pos]) << (j * 8);
+			}
 
 			Append(codepoint);
 		}