[Bf-blender-cvs] [a45a8815349] master: Spelling: `familly` -> `family`.

[Jeroen Bakker]

Commit: a45a8815349ab954b533e6f5a60125083291ec0a
Author: Jeroen Bakker
Date:   Fri Feb 3 09:38:20 2023 +0100
Branches: master
https://developer.blender.org/rBa45a8815349ab954b533e6f5a60125083291ec0a

Spelling: `familly` -> `family`.

Fix spelling mistake originated from tmp-vulkan branch.

===================================================================

M	intern/ghost/GHOST_C-api.h
M	intern/ghost/intern/GHOST_C-api.cpp
M	intern/ghost/intern/GHOST_Context.h
M	intern/ghost/intern/GHOST_ContextVK.cpp
M	intern/ghost/intern/GHOST_ContextVK.h
M	source/blender/gpu/vulkan/vk_context.cc
M	source/blender/gpu/vulkan/vk_context.hh

===================================================================

diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 5c113a7e328..cf810caf778 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -1201,7 +1201,7 @@ void GHOST_GetVulkanHandles(GHOST_ContextHandle context,
                             void *r_instance,
                             void *r_physical_device,
                             void *r_device,
-                            uint32_t *r_graphic_queue_familly);
+                            uint32_t *r_graphic_queue_family);
 
 /**
  * Return VULKAN back-buffer resources handles for the given window.
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index bdeb6208b91..a3c1eedc9c0 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -1203,10 +1203,10 @@ void GHOST_GetVulkanHandles(GHOST_ContextHandle contexthandle,
                             void *r_instance,
                             void *r_physical_device,
                             void *r_device,
-                            uint32_t *r_graphic_queue_familly)
+                            uint32_t *r_graphic_queue_family)
 {
   GHOST_IContext *context = (GHOST_IContext *)contexthandle;
-  context->getVulkanHandles(r_instance, r_physical_device, r_device, r_graphic_queue_familly);
+  context->getVulkanHandles(r_instance, r_physical_device, r_device, r_graphic_queue_family);
 }
 
 void GHOST_GetVulkanBackbuffer(GHOST_WindowHandle windowhandle,
diff --git a/intern/ghost/intern/GHOST_Context.h b/intern/ghost/intern/GHOST_Context.h
index 366781f8134..d4cc0d18e55 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.h
@@ -142,7 +142,7 @@ class GHOST_Context : public GHOST_IContext {
   virtual GHOST_TSuccess getVulkanHandles(void * /*r_instance*/,
                                           void * /*r_physical_device*/,
                                           void * /*r_device*/,
-                                          uint32_t * /*r_graphic_queue_familly*/) override
+                                          uint32_t * /*r_graphic_queue_family*/) override
   {
     return GHOST_kFailure;
   };
diff --git a/intern/ghost/intern/GHOST_ContextVK.cpp b/intern/ghost/intern/GHOST_ContextVK.cpp
index 4ec045ccee2..3326c1a6663 100644
--- a/intern/ghost/intern/GHOST_ContextVK.cpp
+++ b/intern/ghost/intern/GHOST_ContextVK.cpp
@@ -311,12 +311,12 @@ GHOST_TSuccess GHOST_ContextVK::getVulkanBackbuffer(void *image,
 GHOST_TSuccess GHOST_ContextVK::getVulkanHandles(void *r_instance,
                                                  void *r_physical_device,
                                                  void *r_device,
-                                                 uint32_t *r_graphic_queue_familly)
+                                                 uint32_t *r_graphic_queue_family)
 {
   *((VkInstance *)r_instance) = m_instance;
   *((VkPhysicalDevice *)r_physical_device) = m_physical_device;
   *((VkDevice *)r_device) = m_device;
-  *r_graphic_queue_familly = m_queue_family_graphic;
+  *r_graphic_queue_family = m_queue_family_graphic;
 
   return GHOST_kSuccess;
 }
@@ -526,7 +526,7 @@ static GHOST_TSuccess getGraphicQueueFamily(VkPhysicalDevice device, uint32_t *r
     (*r_queue_index)++;
   }
 
-  fprintf(stderr, "Couldn't find any Graphic queue familly on selected device\n");
+  fprintf(stderr, "Couldn't find any Graphic queue family on selected device\n");
   return GHOST_kFailure;
 }
 
@@ -551,7 +551,7 @@ static GHOST_TSuccess getPresetQueueFamily(VkPhysicalDevice device,
     (*r_queue_index)++;
   }
 
-  fprintf(stderr, "Couldn't find any Present queue familly on selected device\n");
+  fprintf(stderr, "Couldn't find any Present queue family on selected device\n");
   return GHOST_kFailure;
 }
 
diff --git a/intern/ghost/intern/GHOST_ContextVK.h b/intern/ghost/intern/GHOST_ContextVK.h
index e26808cc317..1a2d38bc701 100644
--- a/intern/ghost/intern/GHOST_ContextVK.h
+++ b/intern/ghost/intern/GHOST_ContextVK.h
@@ -113,7 +113,7 @@ class GHOST_ContextVK : public GHOST_Context {
   GHOST_TSuccess getVulkanHandles(void *r_instance,
                                   void *r_physical_device,
                                   void *r_device,
-                                  uint32_t *r_graphic_queue_familly);
+                                  uint32_t *r_graphic_queue_family);
   /**
    * Gets the Vulkan framebuffer related resource handles associated with the Vulkan context.
    * Needs to be called after each swap events as the framebuffer will change.
diff --git a/source/blender/gpu/vulkan/vk_context.cc b/source/blender/gpu/vulkan/vk_context.cc
index d4e1456900c..853968daa22 100644
--- a/source/blender/gpu/vulkan/vk_context.cc
+++ b/source/blender/gpu/vulkan/vk_context.cc
@@ -24,7 +24,7 @@ VKContext::VKContext(void *ghost_window, void *ghost_context)
                          &instance_,
                          &physical_device_,
                          &device_,
-                         &graphic_queue_familly_);
+                         &graphic_queue_family_);
 
   /* Initialize the memory allocator. */
   VmaAllocatorCreateInfo info = {};
diff --git a/source/blender/gpu/vulkan/vk_context.hh b/source/blender/gpu/vulkan/vk_context.hh
index 6a5b5cb0034..5ad1a5029ba 100644
--- a/source/blender/gpu/vulkan/vk_context.hh
+++ b/source/blender/gpu/vulkan/vk_context.hh
@@ -25,7 +25,7 @@ class VKContext : public Context {
   VkInstance instance_ = VK_NULL_HANDLE;
   VkPhysicalDevice physical_device_ = VK_NULL_HANDLE;
   VkDevice device_ = VK_NULL_HANDLE;
-  uint32_t graphic_queue_familly_ = 0;
+  uint32_t graphic_queue_family_ = 0;
 
   /** Allocator used for texture and buffers and other resources. */
   VmaAllocator mem_allocator_ = VK_NULL_HANDLE;