Browse Source

Merge branch 'master' of https://github.com/odin-lang/Odin

gingerBill 4 years ago
parent
commit
374f98356c
3 changed files with 2 additions and 6 deletions
  1. 2 2
      src/common.cpp
  2. 0 2
      vendor/vulkan/_gen/create_vulkan_odin_wrapper.py
  3. 0 2
      vendor/vulkan/core.odin

+ 2 - 2
src/common.cpp

@@ -974,8 +974,8 @@ MemoryMappedFileError memory_map_file_32(char const *fullpath, MemoryMappedFile
 #define USE_DAMERAU_LEVENSHTEIN 1
 #define USE_DAMERAU_LEVENSHTEIN 1
 
 
 isize levenstein_distance_case_insensitive(String const &a, String const &b) {
 isize levenstein_distance_case_insensitive(String const &a, String const &b) {
-	isize w = a.len+1;
-	isize h = b.len+1;
+	isize w = b.len+1;
+	isize h = a.len+1;
 	isize *matrix = gb_alloc_array(temporary_allocator(), isize, w*h);
 	isize *matrix = gb_alloc_array(temporary_allocator(), isize, w*h);
 	for (isize i = 0; i <= a.len; i++) {
 	for (isize i = 0; i <= a.len; i++) {
 		matrix[i*w + 0] = i;
 		matrix[i*w + 0] = i;

+ 0 - 2
vendor/vulkan/_gen/create_vulkan_odin_wrapper.py

@@ -521,8 +521,6 @@ BASE = """
 // Vulkan wrapper generated from "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_core.h"
 // Vulkan wrapper generated from "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_core.h"
 //
 //
 package vulkan
 package vulkan
-
-import "core:c"
 """[1::]
 """[1::]
 
 
 
 

+ 0 - 2
vendor/vulkan/core.odin

@@ -2,8 +2,6 @@
 // Vulkan wrapper generated from "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_core.h"
 // Vulkan wrapper generated from "https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_core.h"
 //
 //
 package vulkan
 package vulkan
-
-import "core:c"
 API_VERSION_1_0 :: (1<<22) | (0<<12) | (0)
 API_VERSION_1_0 :: (1<<22) | (0<<12) | (0)
 
 
 MAKE_VERSION :: proc(major, minor, patch: u32) -> u32 {
 MAKE_VERSION :: proc(major, minor, patch: u32) -> u32 {