Skip to content

Commit 5bcee47

Browse files
committed
Release 6.2.2
- Fixed a stride error in VUSegmentedBufferMemory. - Upgraded to zlib 1.3 Change-Id: Iaac61c4883cc62de9f405a7c2b087bcab4d7fc4f
1 parent f2b9a34 commit 5bcee47

File tree

23 files changed

+56
-93
lines changed

23 files changed

+56
-93
lines changed

DemoApps/OpenVG/VGStressTest/source/ConfigSpiral.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace Fsl
5050
, m_quadricSpiralRevolutionCount(18) // 18
5151
, m_quadricSpiralRevolutionChange(40.0f)
5252
, m_quadricSpiralStrokeLineWidth(30.0f)
53-
, m_segmentedSpiralRevolutionCount(36) // 36
53+
, m_segmentedSpiralRevolutionCount(36) // 36
5454
, m_segmentedSpiralRevolutionChange(20.0f)
5555
, m_segmentedSpiralStrokeLineWidth(50.0f) // 50
5656
, m_segmentedSpiralSegmentsPerRevolution(6) // 6

DemoApps/Vulkan/ComputeParticles/source/ComputeParticles.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ namespace Fsl
668668
bufferBarrier.srcQueueFamilyIndex =
669669
m_vulkanDevice.GetQueueFamilyIndices().Graphics; // Required as compute and graphics queue may have different families
670670
bufferBarrier.dstQueueFamilyIndex =
671-
m_vulkanDevice.GetQueueFamilyIndices().Compute; // Required as compute and graphics queue may have different families
671+
m_vulkanDevice.GetQueueFamilyIndices().Compute; // Required as compute and graphics queue may have different families
672672

673673
vkCmdPipelineBarrier(m_compute.CommandBuffer.Get(), VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
674674
Willems::Config::FLAGS_NONE, 0, nullptr, 1, &bufferBarrier, 0, nullptr);
@@ -689,7 +689,7 @@ namespace Fsl
689689
// Compute and graphics queue may have different queue families (see VulkanDevice::createLogicalDevice)
690690
// For the barrier to work across different queues, we need to set their family indices
691691
bufferBarrier.srcQueueFamilyIndex =
692-
m_vulkanDevice.GetQueueFamilyIndices().Compute; // Required as compute and graphics queue may have different families
692+
m_vulkanDevice.GetQueueFamilyIndices().Compute; // Required as compute and graphics queue may have different families
693693
bufferBarrier.dstQueueFamilyIndex =
694694
m_vulkanDevice.GetQueueFamilyIndices().Graphics; // Required as compute and graphics queue may have different families
695695

DemoApps/Vulkan/ComputeParticles/source/ComputeParticles.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace Fsl
7373
// Resources for the compute part of the example
7474
struct Compute
7575
{
76-
struct ComputeUBO // Compute shader uniform block object
76+
struct ComputeUBO // Compute shader uniform block object
7777
{
7878
float DeltaT{0}; // Frame delta time
7979
float DestX{0}; // x position of the attractor

DemoApps/Vulkan/Texturing/source/Texturing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ namespace Fsl
815815
viewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
816816
viewportState.viewportCount = 1; //! FIX: Is this wrong? we are not supplying any pointers
817817
viewportState.pViewports = nullptr;
818-
viewportState.scissorCount = 1; //! FIX: Is this wrong? we are not supplying any pointers
818+
viewportState.scissorCount = 1; //! FIX: Is this wrong? we are not supplying any pointers
819819
viewportState.pScissors = nullptr;
820820

821821
VkPipelineMultisampleStateCreateInfo multisampleState{};

DemoFramework/FslBase/source/FslBase/Arguments/ArgumentParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ namespace Fsl::Arguments
317317
case ArgParseMode::Identify: // If we hit this the argument list contained a 'empty' string
318318
case ArgParseMode::ShortArgument: // The start of a short argument but without any 'argument to lookup'
319319
return ArgParseResult::ArgumentFormatError;
320-
case ArgParseMode::LongArgument: // The start of a long argument but without any 'argument to lookup' so this is the unhandled arguments
321-
// start indicator
320+
case ArgParseMode::LongArgument: // The start of a long argument but without any 'argument to lookup' so this is the unhandled arguments
321+
// start indicator
322322
return ArgParseResult::UnhandledArgumentsStart;
323323
default:
324324
return ArgParseResult::InternalParseError;

DemoFramework/FslBase/source/FslBase/Math/BoundingFrustum.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ namespace Fsl
113113

114114
ContainmentType BoundingFrustum::Contains(const BoundingFrustum& frustum) const
115115
{
116-
if (this == &frustum) // We check to see if the two frustums are equal
116+
if (this == &frustum) // We check to see if the two frustums are equal
117117
{
118118
return ContainmentType::Contains; // If they are, there's no need to go any further.
119119
}

DemoFramework/FslBase/source/FslBase/Math/BoundingSphere.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ namespace Fsl
321321
{
322322
Vector3 ocenterToaCenter = additional.Center - original.Center;
323323
const float distance = ocenterToaCenter.Length();
324-
if (distance <= original.Radius + additional.Radius) // intersect
324+
if (distance <= original.Radius + additional.Radius) // intersect
325325
{
326326
if (distance <= original.Radius - additional.Radius) // original contain additional
327327
{

DemoFramework/FslBase/source/FslBase/Math/MathHelper_CalcOptimalSize.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ namespace Fsl::MathHelper
187187
const auto totalArea = areaOfChar * unitCount;
188188

189189
PxExtent2D result;
190-
if ((restrictionFlags & RectangleSizeRestrictionFlag::Power2) != RectangleSizeRestrictionFlag::Power2) // Not pow 2
190+
if ((restrictionFlags & RectangleSizeRestrictionFlag::Power2) != RectangleSizeRestrictionFlag::Power2) // Not pow 2
191191
{
192192
if ((restrictionFlags & RectangleSizeRestrictionFlag::Square) != RectangleSizeRestrictionFlag::Square) // not square
193193
{

DemoFramework/FslBase/source/FslBase/System/Platform/QNX/PlatformFileSystemQNX.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ namespace Fsl
118118

119119
} // GetFilesInDirectory()
120120

121-
} // namespace
121+
} // namespace
122122

123123

124124
bool PlatformFileSystem::TryGetAttributes(const Path& path, FileAttributes& rAttributes)

DemoFramework/FslDataBinding/Base/source/FslDataBinding/Base/DataBindingService.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ namespace Fsl::DataBinding
852852
const auto pendingBinding = m_pendingBindings.front();
853853
m_pendingBindings.pop();
854854
DoSetBinding(pendingBinding.TargetHandle, Binding(pendingBinding.SourceHandle));
855-
m_pendingObserverCallbacks.push(ObserverRecord(pendingBinding.TargetHandle, pendingBinding.SourceHandle));
855+
m_pendingObserverCallbacks.emplace(pendingBinding.TargetHandle, pendingBinding.SourceHandle);
856856
}
857857
m_callContext = {};
858858
}
@@ -952,7 +952,7 @@ namespace Fsl::DataBinding
952952
switch (target.Instance.GetType())
953953
{
954954
case DataBindingInstanceType::DependencyObserverProperty:
955-
m_pendingObserverCallbacks.push(ObserverRecord(hTarget, hSource));
955+
m_pendingObserverCallbacks.emplace(hTarget, hSource);
956956
break;
957957
// case DataBindingInstanceType::DependencyObject:
958958
// case DataBindingInstanceType::Target:

0 commit comments

Comments
 (0)