spelling: Fix spelling errors
Fix some spelling errors (caught by VS2017 spelling extension) and
a few floating func defs that are no longer valid.
Change-Id: Ifd9394227dfe3b3255c27429dadaf405433232d2
diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp
index bed7080..113288d 100644
--- a/layers/object_tracker.cpp
+++ b/layers/object_tracker.cpp
@@ -308,7 +308,7 @@
auto allocated_with_custom = (pNode->status & OBJSTATUS_CUSTOM_ALLOCATOR) ? true : false;
if (allocated_with_custom && !custom_allocator && expected_custom_allocator_code != VALIDATION_ERROR_UNDEFINED) {
- // This check only verifies that custom allocation callabacks were provided to both Create and Destroy calls,
+ // This check only verifies that custom allocation callbacks were provided to both Create and Destroy calls,
// it cannot verify that these allocation callbacks are compatible with each other.
log_msg(device_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, object_type, object_handle, __LINE__,
expected_custom_allocator_code, LayerName,
diff --git a/loader/loader.c b/loader/loader.c
index e6e44ef..65aa939 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -478,7 +478,7 @@
// Combine path elements, separating each element with the platform-specific
// directory separator, and save the combined string to a destination buffer,
-// not exceeding the given length. Path elements are given as variadic args,
+// not exceeding the given length. Path elements are given as variable args,
// with a NULL element terminating the list.
//
// \returns the total length of the combined string, not including an ASCII
@@ -616,7 +616,7 @@
return &(layer_list->list[layer_list->count - 1]);
}
-// Remove all layer properties entrys from the list
+// Remove all layer properties entries from the list
void loader_delete_layer_properties(const struct loader_instance *inst, struct loader_layer_list *layer_list) {
uint32_t i, j;
struct loader_device_extension_list *dev_ext_list;
@@ -845,7 +845,7 @@
return VK_SUCCESS;
}
-// Append one extension property defined in props with entrypoints defined in entrys to the given
+// Append one extension property defined in props with entrypoints defined in entries to the given
// ext_list. Do not append if a duplicate.
// Return - Vk_SUCCESS on success
VkResult loader_add_to_dev_ext_list(const struct loader_instance *inst, struct loader_device_extension_list *ext_list,
@@ -1369,7 +1369,7 @@
fp_get_proc_addr = loader_platform_get_proc_address(handle, "vkGetInstanceProcAddr");
if (NULL == fp_get_proc_addr) {
loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
- "loader_scanned_icd_add: Attempt to retreive either "
+ "loader_scanned_icd_add: Attempt to retrieve either "
"\'vkGetInstanceProcAddr\' or "
"\'vk_icdGetInstanceProcAddr\' from ICD %s failed.",
filename);
@@ -1855,7 +1855,7 @@
}
// This structure is used to store the json file version
-// in a more managable way.
+// in a more manageable way.
typedef struct {
uint16_t major;
uint16_t minor;
@@ -2188,7 +2188,7 @@
// The following Fields in layer manifest file that are required:
// - “file_format_version”
// - If more than one "layer" object are used, then the "layers" array is
- // requred
+ // required
cJSON *item, *layers_node, *layer_node;
layer_json_version json_version;
@@ -3369,7 +3369,7 @@
if (loader_add_dev_ext_table(inst, &idx, funcName)) {
// successfully added new table entry
- // init any dev dispatch table entrys as needed
+ // init any dev dispatch table entries as needed
loader_init_dispatch_dev_ext_entry(inst, NULL, idx, funcName);
return loader_get_dev_ext_trampoline(idx);
}
@@ -3463,7 +3463,7 @@
(char *)loader_instance_heap_alloc(inst, strlen(funcName) + 1, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
if (inst->phys_dev_ext_disp_hash[i].func_name == NULL) {
loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
- "loader_add_dev_ext_table() can't rallocate "
+ "loader_add_dev_ext_table() can't reallocate "
"func_name memory");
return false;
}
@@ -3860,7 +3860,7 @@
VkNegotiateLayerInterface interface_struct;
if (loader_get_layer_interface_version(negotiate_interface, &interface_struct)) {
- // Go ahead and set the properites version to the
+ // Go ahead and set the properties version to the
// correct value.
layer_prop->interface_version = interface_struct.loaderLayerInterfaceVersion;
@@ -4055,7 +4055,7 @@
VkNegotiateLayerInterface interface_struct;
if (loader_get_layer_interface_version(negotiate_interface, &interface_struct)) {
- // Go ahead and set the properites version to the correct value.
+ // Go ahead and set the properties version to the correct value.
layer_prop->interface_version = interface_struct.loaderLayerInterfaceVersion;
// If the interface is 2 or newer, we have access to the new GetPhysicalDeviceProcAddr
diff --git a/loader/loader.h b/loader/loader.h
index 417588e..a341f6c 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -414,8 +414,6 @@
const char expand_names[][VK_MAX_EXTENSION_NAME_SIZE], uint32_t *layer_count,
char const *const **ppp_layer_names);
void loader_init_std_validation_props(struct loader_layer_properties *props);
-void loader_delete_shadow_dev_layer_names(const struct loader_instance *inst, const VkDeviceCreateInfo *orig,
- VkDeviceCreateInfo *ours);
void loader_delete_shadow_inst_layer_names(const struct loader_instance *inst, const VkInstanceCreateInfo *orig,
VkInstanceCreateInfo *ours);
VkResult loader_add_to_layer_list(const struct loader_instance *inst, struct loader_layer_list *list, uint32_t prop_list_count,
@@ -443,21 +441,18 @@
struct loader_device *found_dev);
void loader_remove_logical_device(const struct loader_instance *inst, struct loader_icd_term *icd_term,
struct loader_device *found_dev, const VkAllocationCallbacks *pAllocator);
-// NOTE: Outside of loader, this entry-point is only proivided for error
+// NOTE: Outside of loader, this entry-point is only provided for error
// cleanup.
void loader_destroy_logical_device(const struct loader_instance *inst, struct loader_device *dev,
const VkAllocationCallbacks *pAllocator);
VkResult loader_enable_instance_layers(struct loader_instance *inst, const VkInstanceCreateInfo *pCreateInfo,
const struct loader_layer_list *instance_layers);
-void loader_deactivate_instance_layers(struct loader_instance *instance);
VkResult loader_create_instance_chain(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator,
struct loader_instance *inst, VkInstance *created_instance);
void loader_activate_instance_layer_extensions(struct loader_instance *inst, VkInstance created_inst);
-VkResult loader_enable_device_layers(const struct loader_instance *inst, struct loader_layer_list *activated_layer_list,
- const VkDeviceCreateInfo *pCreateInfo, const struct loader_layer_list *device_layers);
VkResult loader_create_device_chain(const struct loader_physical_device_tramp *pd, const VkDeviceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const struct loader_instance *inst,
diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
index d93ca58..436f3b4 100644
--- a/loader/vk_loader_platform.h
+++ b/loader/vk_loader_platform.h
@@ -291,9 +291,6 @@
}
static void loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) { WakeAllConditionVariable(pCond); }
-// Windows Registry:
-char *loader_get_registry_string(const HKEY hive, const LPCTSTR sub_key, const char *value);
-
#define loader_stack_alloc(size) _alloca(size)
#else // defined(_WIN32)