Fix uniform type enum UB regarding extra fragment-bit.

mcourteaux · Jan 25, 2025 · 0a9e3ee · 0a9e3ee
1 parent 68a6788
commit 0a9e3ee
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/src/bgfx.cpp b/src/bgfx.cpp
@@ -1515,14 +1515,14 @@ namespace bgfx
 		1,
 	};
 
-	void UniformBuffer::writeUniform(UniformType::Enum _type, uint16_t _loc, const void* _value, uint16_t _num)
+	void UniformBuffer::writeUniform(uint16_t _type, uint16_t _loc, const void* _value, uint16_t _num)
 	{
 		const uint32_t opcode = encodeOpcode(_type, _loc, _num, true);
 		write(opcode);
 		write(_value, g_uniformTypeSize[_type]*_num);
 	}
 
-	void UniformBuffer::writeUniformHandle(UniformType::Enum _type, uint16_t _loc, UniformHandle _handle, uint16_t _num)
+	void UniformBuffer::writeUniformHandle(uint16_t _type, uint16_t _loc, UniformHandle _handle, uint16_t _num)
 	{
 		const uint32_t opcode = encodeOpcode(_type, _loc, _num, false);
 		write(opcode);
@@ -2520,7 +2520,7 @@ namespace bgfx
 				break;
 			}
 
-			UniformType::Enum type;
+			uint16_t type;
 			uint16_t loc;
 			uint16_t num;
 			uint16_t copy;

diff --git a/src/bgfx_p.h b/src/bgfx_p.h
@@ -1508,7 +1508,7 @@ namespace bgfx
 			}
 		}
 
-		static uint32_t encodeOpcode(UniformType::Enum _type, uint16_t _loc, uint16_t _num, uint16_t _copy)
+		static uint32_t encodeOpcode(uint16_t _type, uint16_t _loc, uint16_t _num, uint16_t _copy)
 		{
 			const uint32_t type = _type << kConstantOpcodeTypeShift;
 			const uint32_t loc  = _loc  << kConstantOpcodeLocShift;
@@ -1517,14 +1517,14 @@ namespace bgfx
 			return type|loc|num|copy;
 		}
 
-		static void decodeOpcode(uint32_t _opcode, UniformType::Enum& _type, uint16_t& _loc, uint16_t& _num, uint16_t& _copy)
+		static void decodeOpcode(uint32_t _opcode, uint16_t& _type, uint16_t& _loc, uint16_t& _num, uint16_t& _copy)
 		{
 			const uint32_t type = (_opcode&kConstantOpcodeTypeMask) >> kConstantOpcodeTypeShift;
 			const uint32_t loc  = (_opcode&kConstantOpcodeLocMask ) >> kConstantOpcodeLocShift;
 			const uint32_t num  = (_opcode&kConstantOpcodeNumMask ) >> kConstantOpcodeNumShift;
 			const uint32_t copy = (_opcode&kConstantOpcodeCopyMask); // >> kConstantOpcodeCopyShift;
 
-			_type = (UniformType::Enum)(type);
+			_type = (uint16_t)type;
 			_copy = (uint16_t)copy;
 			_num  = (uint16_t)num;
 			_loc  = (uint16_t)loc;
@@ -1582,8 +1582,8 @@ namespace bgfx
 			m_pos = 0;
 		}
 
-		void writeUniform(UniformType::Enum _type, uint16_t _loc, const void* _value, uint16_t _num = 1);
-		void writeUniformHandle(UniformType::Enum _type, uint16_t _loc, UniformHandle _handle, uint16_t _num = 1);
+		void writeUniform(uint16_t _type, uint16_t _loc, const void* _value, uint16_t _num = 1);
+		void writeUniformHandle(uint16_t _type, uint16_t _loc, UniformHandle _handle, uint16_t _num = 1);
 		void writeMarker(const bx::StringView& _name);
 
 	private:

diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp
@@ -3377,7 +3377,7 @@ namespace bgfx { namespace d3d11
 					break;
 				}
 
-				UniformType::Enum type;
+				uint16_t type;
 				uint16_t loc;
 				uint16_t num;
 				uint16_t copy;
@@ -3395,7 +3395,7 @@ namespace bgfx { namespace d3d11
 					data = (const char*)m_uniforms[handle.idx];
 				}
 
-				switch ( (uint32_t)type)
+				switch (type)
 				{
 				case UniformType::Mat3:
 				case UniformType::Mat3|kUniformFragmentBit:

diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp
@@ -3384,7 +3384,7 @@ namespace bgfx { namespace d3d12
 					break;
 				}
 
-				UniformType::Enum type;
+				uint16_t type;
 				uint16_t loc;
 				uint16_t num;
 				uint16_t copy;
@@ -3402,7 +3402,7 @@ namespace bgfx { namespace d3d12
 					data = (const char*)m_uniforms[handle.idx];
 				}
 
-				switch ( (uint32_t)type)
+				switch (type)
 				{
 				case UniformType::Mat3:
 				case UniformType::Mat3|kUniformFragmentBit:
@@ -4834,7 +4834,7 @@ namespace bgfx { namespace d3d12
 						}
 
 						kind = "user";
-						m_constantBuffer->writeUniformHandle( (UniformType::Enum)(type|fragmentBit), regIndex, info->m_handle, regCount);
+						m_constantBuffer->writeUniformHandle((type|fragmentBit), regIndex, info->m_handle, regCount);
 					}
 				}
 				else

diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
@@ -4420,7 +4420,7 @@ namespace bgfx { namespace gl
 					break;
 				}
 
-				UniformType::Enum type;
+				uint16_t type;
 				uint16_t ignore;
 				uint16_t num;
 				uint16_t copy;

diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm
@@ -1747,7 +1747,7 @@ void commit(UniformBuffer& _uniformBuffer)
 					break;
 				}
 
-				UniformType::Enum type;
+				uint16_t type;
 				uint16_t loc;
 				uint16_t num;
 				uint16_t copy;
@@ -1765,7 +1765,7 @@ void commit(UniformBuffer& _uniformBuffer)
 					data = (const char*)m_uniforms[handle.idx];
 				}
 
-				switch ( (uint32_t)type)
+				switch (type)
 				{
 				case UniformType::Mat3:
 				case UniformType::Mat3|kUniformFragmentBit:
@@ -2225,7 +2225,7 @@ void processArguments(
 												}
 
 												UniformType::Enum type = convertMtlType(dataType);
-												constantBuffer->writeUniformHandle( (UniformType::Enum)(type|fragmentBit), uint32_t(uniform.offset), info->m_handle, uint16_t(num) );
+												constantBuffer->writeUniformHandle((type|fragmentBit), uint32_t(uniform.offset), info->m_handle, uint16_t(num) );
 												BX_TRACE("store %s %d offset:%d", name, info->m_handle, uint32_t(uniform.offset) );
 											}
 										}

diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp
@@ -4150,7 +4150,7 @@ VK_IMPORT_DEVICE
 					break;
 				}
 
-				UniformType::Enum type;
+				uint16_t type;
 				uint16_t loc;
 				uint16_t num;
 				uint16_t copy;
@@ -4168,7 +4168,7 @@ VK_IMPORT_DEVICE
 					data = (const char*)m_uniforms[handle.idx];
 				}
 
-				switch ( (uint32_t)type)
+				switch (type)
 				{
 				case UniformType::Mat3:
 				case UniformType::Mat3|kUniformFragmentBit:
@@ -5090,7 +5090,7 @@ VK_DESTROY
 							}
 
 							kind = "user";
-							m_constantBuffer->writeUniformHandle( (UniformType::Enum)(type|fragmentBit), regIndex, info->m_handle, regCount);
+							m_constantBuffer->writeUniformHandle((type|fragmentBit), regIndex, info->m_handle, regCount);
 						}
 					}
 				}