From b5c828fe4ee3f0942b2eda1dc5753e4ad6d38ea9 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 30 Nov 2021 23:01:22 +0100 Subject: [PATCH 001/245] [xml] Initial implementation of `core:encoding/xml`. A from-scratch XML implementation, loosely modeled on the [spec](https://www.w3.org/TR/2006/REC-xml11-20060816). Features: - Supports enough of the XML 1.0/1.1 spec to handle the 99.9% of XML documents in common current usage. - Simple to understand and use. Small. Caveats: - We do NOT support HTML in this package, as that may or may not be valid XML. If it works, great. If it doesn't, that's not considered a bug. - We do NOT support UTF-16. If you have a UTF-16 XML file, please convert it to UTF-8 first. Also, our condolences. - <[!ELEMENT and <[!ATTLIST are not supported, and will be either ignored or return an error depending on the parser options. TODO: - Optional CDATA unboxing. - Optional `>`, ` `, ` ` and other escape substitution in tag bodies. - Test suite MAYBE: - XML writer? - Serialize/deserialize Odin types? --- core/encoding/xml/debug_print.odin | 73 ++ core/encoding/xml/example/xml_example.odin | 55 ++ core/encoding/xml/tokenizer.odin | 339 +++++++++ core/encoding/xml/xml_reader.odin | 651 ++++++++++++++++++ tests/core/Makefile | 17 +- tests/core/assets/xml/nl_NL-qt-ts.ts | 35 + tests/core/assets/xml/nl_NL-xliff-1.0.xliff | 38 + tests/core/assets/xml/nl_NL-xliff-2.0.xliff | 52 ++ tests/core/assets/xml/utf8.xml | 8 + tests/core/build.bat | 15 +- .../encoding/{ => json}/test_core_json.odin | 36 +- tests/core/encoding/xml/test_core_xml.odin | 264 +++++++ 12 files changed, 1553 insertions(+), 30 deletions(-) create mode 100644 core/encoding/xml/debug_print.odin create mode 100644 core/encoding/xml/example/xml_example.odin create mode 100644 core/encoding/xml/tokenizer.odin create mode 100644 core/encoding/xml/xml_reader.odin create mode 100644 tests/core/assets/xml/nl_NL-qt-ts.ts create mode 100644 tests/core/assets/xml/nl_NL-xliff-1.0.xliff create mode 100644 tests/core/assets/xml/nl_NL-xliff-2.0.xliff create mode 100644 tests/core/assets/xml/utf8.xml rename tests/core/encoding/{ => json}/test_core_json.odin (63%) create mode 100644 tests/core/encoding/xml/test_core_xml.odin diff --git a/core/encoding/xml/debug_print.odin b/core/encoding/xml/debug_print.odin new file mode 100644 index 000000000..0b7ffa822 --- /dev/null +++ b/core/encoding/xml/debug_print.odin @@ -0,0 +1,73 @@ +package xml +/* + An XML 1.0 / 1.1 parser + + Copyright 2021 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + A from-scratch XML implementation, loosely modeled on the [spec](https://www.w3.org/TR/2006/REC-xml11-20060816). + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ +import "core:fmt" + +/* + Just for debug purposes. +*/ +print :: proc(doc: ^Document) { + assert(doc != nil) + + using fmt + println("[XML Prolog]") + + for attr in doc.prolog { + printf("\t%v: %v\n", attr.key, attr.val) + } + + printf("[Encoding] %v\n", doc.encoding) + printf("[DOCTYPE] %v\n", doc.doctype.ident) + + if len(doc.doctype.rest) > 0 { + printf("\t%v\n", doc.doctype.rest) + } + + if doc.root != nil { + println(" --- ") + print_element(0, doc.root) + println(" --- ") + } +} + +print_element :: proc(indent: int, element: ^Element) { + if element == nil { return } + using fmt + + tab :: proc(indent: int) { + tabs := "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" + + i := max(0, min(indent, len(tabs))) + printf("%v", tabs[:i]) + } + + tab(indent) + + if element.kind == .Element { + printf("<%v>\n", element.ident) + if len(element.value) > 0 { + tab(indent + 1) + printf("[Value] %v\n", element.value) + } + + for attr in element.attribs { + tab(indent + 1) + printf("[Attr] %v: %v\n", attr.key, attr.val) + } + + for child in element.children { + print_element(indent + 1, child) + } + } else if element.kind == .Comment { + printf("[COMMENT] %v\n", element.value) + } +} \ No newline at end of file diff --git a/core/encoding/xml/example/xml_example.odin b/core/encoding/xml/example/xml_example.odin new file mode 100644 index 000000000..24a277de6 --- /dev/null +++ b/core/encoding/xml/example/xml_example.odin @@ -0,0 +1,55 @@ +package xml_example + +import "core:encoding/xml" +import "core:mem" +import "core:fmt" + +Error_Handler :: proc(pos: xml.Pos, fmt: string, args: ..any) { + +} + +FILENAME :: "../../../../tests/core/assets/xml/nl_NL-xliff-1.0.xliff" +DOC :: #load(FILENAME) + +OPTIONS :: xml.Options{ + flags = { + .Ignore_Unsupported, .Intern_Comments, + }, + expected_doctype = "", +} + +_main :: proc() { + using fmt + + println("--- DOCUMENT TO PARSE ---") + println(string(DOC)) + println("--- /DOCUMENT TO PARSE ---\n") + + doc, err := xml.parse(DOC, OPTIONS, FILENAME, Error_Handler) + defer xml.destroy(doc) + + xml.print(doc) + + if err != .None { + printf("Parse error: %v\n", err) + } else { + println("DONE!") + } +} + +main :: proc() { + using fmt + + track: mem.Tracking_Allocator + mem.tracking_allocator_init(&track, context.allocator) + context.allocator = mem.tracking_allocator(&track) + + _main() + + if len(track.allocation_map) > 0 { + println() + for _, v in track.allocation_map { + printf("%v Leaked %v bytes.\n", v.location, v.size) + } + } +} \ No newline at end of file diff --git a/core/encoding/xml/tokenizer.odin b/core/encoding/xml/tokenizer.odin new file mode 100644 index 000000000..a63dca5bd --- /dev/null +++ b/core/encoding/xml/tokenizer.odin @@ -0,0 +1,339 @@ +package xml + +import "core:fmt" +import "core:unicode" +import "core:unicode/utf8" + +Error_Handler :: #type proc(pos: Pos, fmt: string, args: ..any) + +Token :: struct { + kind: Token_Kind, + text: string, + pos: Pos, +} + +Pos :: struct { + file: string, + offset: int, // starting at 0 + line: int, // starting at 1 + column: int, // starting at 1 +} + +Token_Kind :: enum { + Invalid, + + Ident, + Literal, + Rune, + String, + + Double_Quote, // " + Single_Quote, // ' + Colon, // : + + Eq, // = + Lt, // < + Gt, // > + Exclaim, // ! + Question, // ? + Hash, // # + Slash, // / + Dash, // - + + Open_Bracket, // [ + Close_Bracket, // ] + + EOF, +} + +CDATA_START :: "" + +Tokenizer :: struct { + // Immutable data + path: string, + src: string, + err: Error_Handler, + + // Tokenizing state + ch: rune, + offset: int, + read_offset: int, + line_offset: int, + line_count: int, + + // Mutable data + error_count: int, +} + +init :: proc(t: ^Tokenizer, src: string, path: string, err: Error_Handler = default_error_handler) { + t.src = src + t.err = err + t.ch = ' ' + t.offset = 0 + t.read_offset = 0 + t.line_offset = 0 + t.line_count = len(src) > 0 ? 1 : 0 + t.error_count = 0 + t.path = path + + advance_rune(t) + if t.ch == utf8.RUNE_BOM { + advance_rune(t) + } +} + +@(private) +offset_to_pos :: proc(t: ^Tokenizer, offset: int) -> Pos { + line := t.line_count + column := offset - t.line_offset + 1 + + return Pos { + file = t.path, + offset = offset, + line = line, + column = column, + } +} + +default_error_handler :: proc(pos: Pos, msg: string, args: ..any) { + fmt.eprintf("%s(%d:%d) ", pos.file, pos.line, pos.column) + fmt.eprintf(msg, ..args) + fmt.eprintf("\n") +} + +error :: proc(t: ^Tokenizer, offset: int, msg: string, args: ..any) { + pos := offset_to_pos(t, offset) + if t.err != nil { + t.err(pos, msg, ..args) + } + t.error_count += 1 +} + +advance_rune :: proc(using t: ^Tokenizer) { + if read_offset < len(src) { + offset = read_offset + if ch == '\n' { + line_offset = offset + line_count += 1 + } + r, w := rune(src[read_offset]), 1 + switch { + case r == 0: + error(t, t.offset, "illegal character NUL") + case r >= utf8.RUNE_SELF: + r, w = utf8.decode_rune_in_string(src[read_offset:]) + if r == utf8.RUNE_ERROR && w == 1 { + error(t, t.offset, "illegal UTF-8 encoding") + } else if r == utf8.RUNE_BOM && offset > 0 { + error(t, t.offset, "illegal byte order mark") + } + } + read_offset += w + ch = r + } else { + offset = len(src) + if ch == '\n' { + line_offset = offset + line_count += 1 + } + ch = -1 + } +} + +peek_byte :: proc(t: ^Tokenizer, offset := 0) -> byte { + if t.read_offset+offset < len(t.src) { + return t.src[t.read_offset+offset] + } + return 0 +} + +skip_whitespace :: proc(t: ^Tokenizer) { + for { + switch t.ch { + case ' ', '\t', '\r', '\n': + advance_rune(t) + case: + return + } + } +} + +is_letter :: proc(r: rune) -> bool { + if r < utf8.RUNE_SELF { + switch r { + case '_': + return true + case 'A'..='Z', 'a'..='z': + return true + } + } + return unicode.is_letter(r) +} + +is_valid_identifier_rune :: proc(r: rune) -> bool { + if r < utf8.RUNE_SELF { + switch r { + case '_', '-', ':': return true + case 'A'..='Z', 'a'..='z': return true + case '0'..'9': return true + } + } + + if unicode.is_digit(r) || unicode.is_letter(r) { + return true + } + return false +} + +scan_identifier :: proc(t: ^Tokenizer) -> string { + offset := t.offset + namespaced := false + + for is_valid_identifier_rune(t.ch) { + advance_rune(t) + if t.ch == ':' { + /* + A namespaced attr can have at most two parts, `namespace:ident`. + */ + if namespaced { + break + } + namespaced = true + } + } + return string(t.src[offset : t.offset]) +} + +scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close := false) -> (value: string, err: Error) { + err = .None + in_cdata := false + + loop: for { + ch := t.ch + + switch ch { + case -1: + error(t, t.offset, "[scan_string] Premature end of file.\n") + return "", .Premature_EOF + + case '<': + /* + Might be the start of a CDATA tag. + */ + if t.read_offset + len(CDATA_START) < len(t.src) { + if string(t.src[t.offset:][:len(CDATA_START)]) == CDATA_START { + in_cdata = true + } + } + + case ']': + /* + Might be the end of a CDATA tag. + */ + if t.read_offset + len(CDATA_END) < len(t.src) { + if string(t.src[t.offset:][:len(CDATA_END)]) == CDATA_END { + in_cdata = false + } + } + + case '\n': + if !in_cdata { + error(t, offset, string(t.src[offset : t.offset])) + error(t, offset, "[scan_string] Not terminated\n") + err = .Invalid_Tag_Value + break loop + } + } + + if ch == close && !in_cdata { + /* + If it's not a CDATA tag, it's the end of this body. + */ + break loop + } + + advance_rune(t) + } + + lit := string(t.src[offset : t.offset]) + if consume_close { + advance_rune(t) + } + + /* + TODO: Handle decoding escape characters and unboxing CDATA. + */ + + return lit, err +} + +peek :: proc(t: ^Tokenizer) -> (token: Token) { + old := t^ + token = scan(t) + t^ = old + return token +} + +scan :: proc(t: ^Tokenizer) -> Token { + skip_whitespace(t) + + offset := t.offset + + kind: Token_Kind + err: Error + lit: string + pos := offset_to_pos(t, offset) + + switch ch := t.ch; true { + case is_letter(ch): + lit = scan_identifier(t) + kind = .Ident + + case: + advance_rune(t) + switch ch { + case -1: + kind = .EOF + + case '<': kind = .Lt + case '>': kind = .Gt + case '!': kind = .Exclaim + case '?': kind = .Question + case '=': kind = .Eq + case '#': kind = .Hash + case '/': kind = .Slash + case '-': kind = .Dash + case ':': kind = .Colon + + case '"', '\'': + lit, err = scan_string(t, t.offset, ch, true) + if err == .None { + kind = .String + } else { + kind = .Invalid + } + + case '\n': + lit = "\n" + + case '\\': + token := scan(t) + if token.pos.line == pos.line { + error(t, token.pos.offset, "expected a newline after \\") + } + return token + + case: + if ch != utf8.RUNE_BOM { + // error(t, t.offset, "illegal character '%r': %d", ch, ch) + } + kind = .Invalid + } + } + + if lit == "" { + lit = string(t.src[offset : t.offset]) + } + return Token{kind, lit, pos} +} \ No newline at end of file diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin new file mode 100644 index 000000000..526be5856 --- /dev/null +++ b/core/encoding/xml/xml_reader.odin @@ -0,0 +1,651 @@ +package xml +/* + An XML 1.0 / 1.1 parser + + Copyright 2021 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + A from-scratch XML implementation, loosely modelled on the [spec](https://www.w3.org/TR/2006/REC-xml11-20060816). + + Features: + - Supports enough of the XML 1.0/1.1 spec to handle the 99.9% of XML documents in common current usage. + - Simple to understand and use. Small. + + Caveats: + - We do NOT support HTML in this package, as that may or may not be valid XML. + If it works, great. If it doesn't, that's not considered a bug. + + - We do NOT support UTF-16. If you have a UTF-16 XML file, please convert it to UTF-8 first. Also, our condolences. + - <[!ELEMENT and <[!ATTLIST are not supported, and will be either ignored or return an error depending on the parser options. + + TODO: + - Optional CDATA unboxing. + - Optional `>`, ` `, ` ` and other escape substitution in tag bodies. + + MAYBE: + - XML writer? + - Serialize/deserialize Odin types? + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ + +import "core:strings" +import "core:mem" +import "core:os" + +DEFAULT_Options :: Options{ + flags = { + .Ignore_Unsupported, + }, + expected_doctype = "", +} + +Option_Flag :: enum { + /* + Document MUST start with ` (doc: ^Document, err: Error) { + context.allocator = allocator + + opts := validate_options(options) or_return + + t := &Tokenizer{} + init(t, string(data), path, error_handler) + + doc = new(Document) + doc.allocator = allocator + doc.tokenizer = t + + strings.intern_init(&doc.intern, allocator, allocator) + + err = .Unexpected_Token + element, parent: ^Element + + /* + If a DOCTYPE is present, the root tag has to match. + If an expected DOCTYPE is given in options (i.e. it's non-empty), the DOCTYPE (if present) and root tag have to match. + */ + expected_doctype := options.expected_doctype + + loop: for { + tok := scan(t) + #partial switch tok.kind { + + case .Lt: + open := scan(t) + #partial switch open.kind { + + case .Question: + /* + 0 { + /* + We've already seen a prolog. + */ + return doc, .Too_Many_Prologs + } else { + error(t, t.offset, "Expected \" 0 { + return doc, .Too_Many_DocTypes + } + if doc.root != nil { + return doc, .DocType_Must_Proceed_Elements + } + parse_doctype(doc) or_return + + if len(expected_doctype) > 0 && expected_doctype != doc.doctype.ident { + error(t, t.offset, "Invalid DOCTYPE. Expected: %v, got: %v\n", expected_doctype, doc.doctype.ident) + return doc, .Invalid_DocType + } + expected_doctype = doc.doctype.ident + + case: + if .Error_on_Unsupported in opts.flags { + error(t, t.offset, "Unhandled: . + The grammar does not allow a comment to end in ---> + */ + if doc.root == nil { + return doc, .Comment_Before_Root_Element + } + + expect(t, .Dash) + offset := t.offset + + for { + advance_rune(t) + ch := t.ch + + /* + A comment ends when we see -->, preceded by a character that's not a dash. + "For compatibility, the string "--" (double-hyphen) must not occur within comments." + + See: https://www.w3.org/TR/2006/REC-xml11-20060816/#dt-comment + + Thanks to the length (4) of the comment start, we also have enough lookback, + and the peek at the next byte asserts that there's at least one more character + that's a `>`. + */ + if ch < 0 { + error(t, offset, "[parse] Comment was not terminated\n") + return doc, .Unclosed_Comment + } + + if string(t.src[t.offset - 1:][:2]) == "--" { + if peek_byte(t) == '>' { + break + } else { + error(t, t.offset - 1, "Invalid -- sequence in comment.\n") + return doc, .Invalid_Sequence_In_Comment + } + } + } + + if .Intern_Comments in opts.flags { + el := new(Element) + + el.parent = element + el.kind = .Comment + el.value = strings.intern_get(&doc.intern, string(t.src[offset : t.offset - 1])) + append(&element.children, el) + } + + expect(t, .Dash) + expect(t, .Gt) + + case: + error(t, t.offset, "Invalid Token after 0 && expected_doctype != open.text { + error(t, t.offset, "Root Tag doesn't match DOCTYPE. Expected: %v, got: %v\n", expected_doctype, open.text) + return doc, .Invalid_DocType + } + } + + /* + One of these should follow: + - `>`, which means we've just opened this tag and expect a later element to close it. + - `/>`, which means this is an 'empty' or self-closing tag. + */ + end_token := scan(t) + + #partial switch end_token.kind { + case .Gt: + /* + We're now the new parent. + */ + parent = element + + case .Slash: + /* + Empty tag? + */ + expect(t, .Gt) or_return + + case: + error(t, t.offset, "Expected close tag, got: %#v\n", end_token) + return + } + + case .Slash: + /* + Close tag. + */ + ident := expect(t, .Ident) or_return + _ = expect(t, .Gt) or_return + + if element.ident != ident.text { + error(t, t.offset, "Mismatched Closing Tag: %v\n", ident.text) + return doc, .Mismatched_Closing_Tag + } + parent = element.parent + element = parent + + case: + error(t, t.offset, "Invalid Token after <: %#v\n", open) + return + } + + case .EOF: + break loop + + case: + /* + This should be a tag's body text. + */ + element.value = scan_string(t, tok.pos.offset) or_return + } + } + + if .Must_Have_Prolog in opts.flags && len(doc.prolog) == 0 { + return doc, .No_Prolog + } + + if .Must_Have_DocType in opts.flags && len(doc.doctype.ident) == 0 { + return doc, .No_DocType + } + + return doc, .None +} + +parse_from_file :: proc(filename: string, options := DEFAULT_Options, error_handler := default_error_handler, allocator := context.allocator) -> (doc: ^Document, err: Error) { + context.allocator = allocator + + data, data_ok := os.read_entire_file(filename) + defer delete(data) + + if !data_ok { return {}, .File_Error } + + return parse_from_slice(data, options, filename, error_handler, allocator) +} + +parse :: proc { parse_from_file, parse_from_slice } + +free_element :: proc(element: ^Element) { + if element == nil { return } + + for child in element.children { + /* + NOTE: Recursive. + + Could be rewritten so it adds them to a list of pointers to free. + */ + free_element(child) + } + delete(element.attribs) + delete(element.children) + free(element) +} + +destroy :: proc(doc: ^Document) { + if doc == nil { return } + + free_element(doc.root) + strings.intern_destroy(&doc.intern) + + delete(doc.prolog) + free(doc) +} + +/* + Helpers. +*/ + +validate_options :: proc(options: Options) -> (validated: Options, err: Error) { + validated = options + + if .Error_on_Unsupported in validated.flags && .Ignore_Unsupported in validated.flags { + return options, .Conflicting_Options + } + + if .Unbox_CDATA in validated.flags { + return options, .Unhandled_CDATA_Unboxing + } + + if .Decode_SGML_Entities in validated.flags { + return options, .Unhandled_SGML_Entity_Decoding + } + + return validated, .None +} + +expect :: proc(t: ^Tokenizer, kind: Token_Kind) -> (tok: Token, err: Error) { + tok = scan(t) + if tok.kind == kind { return tok, .None } + + error(t, t.offset, "Expected \"%v\", got \"%v\".", kind, tok.kind) + return tok, .Unexpected_Token +} + +parse_attribute :: proc(doc: ^Document) -> (attr: Attr, offset: int, err: Error) { + assert(doc != nil) + context.allocator = doc.allocator + t := doc.tokenizer + + key := expect(t, .Ident) or_return + offset = t.offset - len(key.text) + + _ = expect(t, .Eq) or_return + value := expect(t, .String) or_return + + attr.key = strings.intern_get(&doc.intern, key.text) + attr.val = strings.intern_get(&doc.intern, value.text) + + err = .None + return +} + +check_duplicate_attributes :: proc(t: ^Tokenizer, attribs: Attributes, attr: Attr, offset: int) -> (err: Error) { + for a in attribs { + if attr.key == a.key { + error(t, offset, "Duplicate attribute: %v\n", attr.key) + return .Duplicate_Attribute + } + } + return .None +} + +parse_attributes :: proc(doc: ^Document, attribs: ^Attributes) -> (err: Error) { + assert(doc != nil) + context.allocator = doc.allocator + t := doc.tokenizer + + for peek(t).kind == .Ident { + attr, offset := parse_attribute(doc) or_return + check_duplicate_attributes(t, attribs^, attr, offset) or_return + append(attribs, attr) + } + skip_whitespace(t) + return .None +} + +parse_prolog :: proc(doc: ^Document) -> (err: Error) { + assert(doc != nil) + context.allocator = doc.allocator + t := doc.tokenizer + + offset := t.offset + parse_attributes(doc, &doc.prolog) or_return + + for attr in doc.prolog { + switch attr.key { + case "version": + switch attr.val { + case "1.0", "1.1": + case: + error(t, offset, "[parse_prolog] Warning: Unhandled XML version: %v\n", attr.val) + } + + case "encoding": + switch strings.to_lower(attr.val, context.temp_allocator) { + case "utf-8", "utf8": + doc.encoding = .UTF_8 + + case "latin-1", "latin1", "iso-8859-1": + doc.encoding = .LATIN_1 + + case: + /* + Unrecognized encoding, assume UTF-8. + */ + error(t, offset, "[parse_prolog] Warning: Unrecognized encoding: %v\n", attr.val) + } + + case: + // Ignored. + } + } + + _ = expect(t, .Question) or_return + _ = expect(t, .Gt) or_return + + return .None +} + +skip_element :: proc(t: ^Tokenizer) -> (err: Error) { + close := 1 + + loop: for { + tok := scan(t) + #partial switch tok.kind { + case .EOF: + error(t, t.offset, "[skip_element] Premature EOF\n") + return .Premature_EOF + + case .Lt: + close += 1 + + case .Gt: + close -= 1 + if close == 0 { + break loop + } + + case: + + } + } + return .None +} + +parse_doctype :: proc(doc: ^Document) -> (err: Error) { + /* + + + + ]> + */ + assert(doc != nil) + context.allocator = doc.allocator + t := doc.tokenizer + + tok := expect(t, .Ident) or_return + doc.doctype.ident = strings.intern_get(&doc.intern, tok.text) + + skip_whitespace(t) + offset := t.offset + skip_element(t) or_return + + /* + -1 because the current offset is that of the closing tag, so the rest of the DOCTYPE tag ends just before it. + */ + doc.doctype.rest = strings.intern_get(&doc.intern, string(t.src[offset : t.offset - 1])) + return .None +} \ No newline at end of file diff --git a/tests/core/Makefile b/tests/core/Makefile index 0f0ffe4d6..e17dede90 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,22 +1,29 @@ ODIN=../../odin PYTHON=$(shell which python3) -all: download_test_assets image_test compress_test strings_test hash_test crypto_test +all: download_test_assets image_test compress_test strings_test hash_test crypto_test encoding_test download_test_assets: $(PYTHON) download_assets.py image_test: - $(ODIN) run image/test_core_image.odin + $(ODIN) run image/test_core_image.odin -out=test_image -o:speed -no-bounds-check compress_test: - $(ODIN) run compress/test_core_compress.odin + $(ODIN) run compress/test_core_compress.odin -out=test_compress -o:speed -no-bounds-check strings_test: - $(ODIN) run strings/test_core_strings.odin + $(ODIN) run strings/test_core_strings.odin -out=test_strings -o:speed -no-bounds-check + +odin_test: + $(ODIN) run odin -out=test_odin -o:speed -no-bounds-check hash_test: $(ODIN) run hash -out=test_hash -o:speed -no-bounds-check crypto_test: - $(ODIN) run crypto -out=crypto_hash -o:speed -no-bounds-check \ No newline at end of file + $(ODIN) run crypto -out=crypto_hash -o:speed -no-bounds-check + +encoding_test: + $(ODIN) run encoding/json -out=test_encoding_json -o:speed -no-bounds-check + $(ODIN) run encoding/xml -out=test_encoding_xml -o:speed -no-bounds-check diff --git a/tests/core/assets/xml/nl_NL-qt-ts.ts b/tests/core/assets/xml/nl_NL-qt-ts.ts new file mode 100644 index 000000000..6ec3f2f47 --- /dev/null +++ b/tests/core/assets/xml/nl_NL-qt-ts.ts @@ -0,0 +1,35 @@ + + + + + Page + + Text for translation + commenting + Tekst om te vertalen + + + Also text to translate + some text + Ook tekst om te vertalen + + + + installscript + + 99 bottles of beer on the wall + some new comments here + 99 flessen bier op de muur + + + + apple_count + + %d apple(s) + + %d appel + %d appels + + + + diff --git a/tests/core/assets/xml/nl_NL-xliff-1.0.xliff b/tests/core/assets/xml/nl_NL-xliff-1.0.xliff new file mode 100644 index 000000000..7a1abcd66 --- /dev/null +++ b/tests/core/assets/xml/nl_NL-xliff-1.0.xliff @@ -0,0 +1,38 @@ + + + + + + text + tekst + Context + + + text 1 + tekst 1 + Context 1 + + + text 2 + + Context of the segment 2 + + + text 3 + translation 3 + Context 3 + + + Plurals + + %d month + %d maand + + + %d months + %d maanden + + + + + diff --git a/tests/core/assets/xml/nl_NL-xliff-2.0.xliff b/tests/core/assets/xml/nl_NL-xliff-2.0.xliff new file mode 100644 index 000000000..611ac80c4 --- /dev/null +++ b/tests/core/assets/xml/nl_NL-xliff-2.0.xliff @@ -0,0 +1,52 @@ + + + + + Note for file + + + + Note for unit + + + text + + + + + + Note for unit 2 + + + text 2 + translation 2 + + + + + Note for unit 3 + + + text 3 + approved translation 3 + + + + + + Plurals + + + %d month + %d maand + + + + + %d months + %d maanden + + + + + \ No newline at end of file diff --git a/tests/core/assets/xml/utf8.xml b/tests/core/assets/xml/utf8.xml new file mode 100644 index 000000000..c9ed3bf69 --- /dev/null +++ b/tests/core/assets/xml/utf8.xml @@ -0,0 +1,8 @@ + + +<恥ずべきフクロウ 올빼미_id="Foozle Hello, world!"]]>Barzle"> +<부끄러운:barzle> + ရှက်စရာ ဇီးကွက် + Owl of Shame + More CDATA Hello, world! Nonsense. + \ No newline at end of file diff --git a/tests/core/build.bat b/tests/core/build.bat index 176b7f175..7a214acc9 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -5,34 +5,35 @@ python3 download_assets.py echo --- echo Running core:image tests echo --- -%PATH_TO_ODIN% run image %COMMON% +%PATH_TO_ODIN% run image %COMMON% -out:test_image.exe echo --- echo Running core:compress tests echo --- -%PATH_TO_ODIN% run compress %COMMON% +%PATH_TO_ODIN% run compress %COMMON% -out:test_compress.exe echo --- echo Running core:strings tests echo --- -%PATH_TO_ODIN% run strings %COMMON% +%PATH_TO_ODIN% run strings %COMMON% -out:test_strings.exe echo --- echo Running core:hash tests echo --- -%PATH_TO_ODIN% run hash %COMMON% -o:size +%PATH_TO_ODIN% run hash %COMMON% -o:size -out:test_hash.exe echo --- echo Running core:odin tests echo --- -%PATH_TO_ODIN% run odin %COMMON% -o:size +%PATH_TO_ODIN% run odin %COMMON% -o:size -out:test_odin.exe echo --- echo Running core:crypto hash tests echo --- -%PATH_TO_ODIN% run crypto %COMMON% +%PATH_TO_ODIN% run crypto %COMMON% -o:speed -out:test_crypto.exe echo --- echo Running core:encoding tests echo --- -%PATH_TO_ODIN% run encoding %COMMON% \ No newline at end of file +%PATH_TO_ODIN% run encoding\json %COMMON% -out:test_json.exe +%PATH_TO_ODIN% run encoding\xml %COMMON% -out:test_xml.exe \ No newline at end of file diff --git a/tests/core/encoding/test_core_json.odin b/tests/core/encoding/json/test_core_json.odin similarity index 63% rename from tests/core/encoding/test_core_json.odin rename to tests/core/encoding/json/test_core_json.odin index f536eb4c6..4f415c008 100644 --- a/tests/core/encoding/test_core_json.odin +++ b/tests/core/encoding/json/test_core_json.odin @@ -8,32 +8,32 @@ TEST_count := 0 TEST_fail := 0 when ODIN_TEST { - expect :: testing.expect - log :: testing.log + expect :: testing.expect + log :: testing.log } else { - expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) - TEST_count += 1 - if !condition { - TEST_fail += 1 - fmt.println(message) - return - } - fmt.println(" PASS") - } - log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) - } + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + fmt.printf("[%v] ", loc) + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.println(message) + return + } + fmt.println(" PASS") + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] ", loc) + fmt.printf("log: %v\n", v) + } } main :: proc() { - t := testing.T{} + t := testing.T{} parse_json(&t) marshal_json(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } @test diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin new file mode 100644 index 000000000..7eefac212 --- /dev/null +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -0,0 +1,264 @@ +package test_core_xml + +import "core:encoding/xml" +import "core:testing" +import "core:mem" +import "core:fmt" + +Silent :: proc(pos: xml.Pos, fmt: string, args: ..any) { + // Custom (silent) error handler. +} + +OPTIONS :: xml.Options{ + flags = { + .Ignore_Unsupported, .Intern_Comments, + }, + expected_doctype = "", +} + +TEST_count := 0 +TEST_fail := 0 + +TEST :: struct { + filename: string, + options: xml.Options, + expected: struct { + error: xml.Error, + xml_version: string, + xml_encoding: string, + doctype: string, + }, +} + +TESTS :: []TEST{ + /* + First we test that certain files parse without error. + */ + { + filename = "assets/xml/utf8.xml", + options = OPTIONS, + expected = { + error = .None, + xml_version = "1.0", + xml_encoding = "utf-8", + doctype = "恥ずべきフクロウ", + }, + }, + { + filename = "assets/xml/nl_NL-qt-ts.ts", + options = OPTIONS, + expected = { + error = .None, + xml_version = "1.0", + xml_encoding = "utf-8", + doctype = "TS", + }, + }, + { + filename = "assets/xml/nl_NL-xliff-1.0.xliff", + options = OPTIONS, + expected = { + error = .None, + xml_version = "1.0", + xml_encoding = "UTF-8", + doctype = "", + }, + }, + { + filename = "assets/xml/nl_NL-xliff-2.0.xliff", + options = OPTIONS, + expected = { + error = .None, + xml_version = "1.0", + xml_encoding = "utf-8", + doctype = "", + }, + }, + + /* + Then we test that certain errors are returned as expected. + */ + { + filename = "assets/xml/utf8.xml", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, + }, + expected_doctype = "Odin", + }, + expected = { + error = .Invalid_DocType, + xml_version = "1.0", + xml_encoding = "utf-8", + doctype = "恥ずべきフクロウ", + }, + }, +} + +when ODIN_TEST { + expect :: testing.expect + log :: testing.log +} else { + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + fmt.printf("[%v] ", loc) + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.println(message) + return + } + fmt.println(" PASS") + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] ", loc) + fmt.printf("log: %v\n", v) + } +} + +main :: proc() { + t := testing.T{} + + track: mem.Tracking_Allocator + mem.tracking_allocator_init(&track, context.allocator) + context.allocator = mem.tracking_allocator(&track) + + run_tests(&t) + + if len(track.allocation_map) > 0 { + for _, v in track.allocation_map { + err_msg := fmt.tprintf("%v Leaked %v bytes.", v.location, v.size) + expect(&t, false, err_msg) + } + } + + fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) +} + +@test +run_tests :: proc(t: ^testing.T) { + using fmt + + count := 0 + + for test in TESTS { + printf("Trying to parse %v\n\n", test.filename) + + doc, err := xml.parse(test.filename, test.options, Silent) + defer xml.destroy(doc) + + err_msg := tprintf("Expected return value %v, got %v", test.expected.error, err) + expect(t, err == test.expected.error, err_msg) + + if len(test.expected.xml_version) > 0 { + xml_version := "" + for attr in doc.prolog { + if attr.key == "version" { + xml_version = attr.val + } + } + + err_msg = tprintf("Expected XML version %v, got %v", test.expected.xml_version, xml_version) + expect(t, xml_version == test.expected.xml_version, err_msg) + } + + if len(test.expected.xml_encoding) > 0 { + xml_encoding := "" + for attr in doc.prolog { + if attr.key == "encoding" { + xml_encoding = attr.val + } + } + + err_msg = tprintf("Expected XML encoding %v, got %v", test.expected.xml_encoding, xml_encoding) + expect(t, xml_encoding == test.expected.xml_encoding, err_msg) + } + + err_msg = tprintf("Expected DOCTYPE %v, got %v", test.expected.doctype, doc.doctype.ident) + expect(t, doc.doctype.ident == test.expected.doctype, err_msg) + + /* + File-specific tests. + */ + switch count { + case 0: + expect(t, len(doc.root.attribs) > 0, "Expected the root tag to have an attribute.") + attr := doc.root.attribs[0] + + attr_key_expected := "올빼미_id" + attr_val_expected := "Foozle Hello, world!\"]]>Barzle" + + attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) + expect(t, attr.key == attr_key_expected, attr_err) + + attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) + expect(t, attr.val == attr_val_expected, attr_err) + + expect(t, len(doc.root.children) > 0, "Expected the root tag to have children.") + child := doc.root.children[0] + + first_child_ident := "부끄러운:barzle" + attr_err = tprintf("Expected first child tag's ident to be %v, got %v", first_child_ident, child.ident) + expect(t, child.ident == first_child_ident, attr_err) + + case 2: + expect(t, len(doc.root.attribs) > 0, "Expected the root tag to have an attribute.") + + { + attr := doc.root.attribs[0] + + attr_key_expected := "version" + attr_val_expected := "1.2" + + attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) + expect(t, attr.key == attr_key_expected, attr_err) + + attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) + expect(t, attr.val == attr_val_expected, attr_err) + } + + { + attr := doc.root.attribs[1] + + attr_key_expected := "xmlns" + attr_val_expected := "urn:oasis:names:tc:xliff:document:1.2" + + attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) + expect(t, attr.key == attr_key_expected, attr_err) + + attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) + expect(t, attr.val == attr_val_expected, attr_err) + } + + case 3: + expect(t, len(doc.root.attribs) > 0, "Expected the root tag to have an attribute.") + + { + attr := doc.root.attribs[0] + + attr_key_expected := "xmlns" + attr_val_expected := "urn:oasis:names:tc:xliff:document:2.0" + + attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) + expect(t, attr.key == attr_key_expected, attr_err) + + attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) + expect(t, attr.val == attr_val_expected, attr_err) + } + + { + attr := doc.root.attribs[1] + + attr_key_expected := "version" + attr_val_expected := "2.0" + + attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) + expect(t, attr.key == attr_key_expected, attr_err) + + attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) + expect(t, attr.val == attr_val_expected, attr_err) + } + } + + count += 1 + } +} \ No newline at end of file From 9b2e67df67b5f801687f3c48c6701daa00c38088 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 30 Nov 2021 23:43:51 +0100 Subject: [PATCH 002/245] [xml] Small cleanup. --- core/encoding/xml/tokenizer.odin | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/core/encoding/xml/tokenizer.odin b/core/encoding/xml/tokenizer.odin index a63dca5bd..3dcffb0d6 100644 --- a/core/encoding/xml/tokenizer.odin +++ b/core/encoding/xml/tokenizer.odin @@ -180,7 +180,7 @@ is_valid_identifier_rune :: proc(r: rune) -> bool { } } - if unicode.is_digit(r) || unicode.is_letter(r) { + if unicode.is_letter(r) || unicode.is_digit(r) { return true } return false @@ -317,17 +317,7 @@ scan :: proc(t: ^Tokenizer) -> Token { case '\n': lit = "\n" - case '\\': - token := scan(t) - if token.pos.line == pos.line { - error(t, token.pos.offset, "expected a newline after \\") - } - return token - case: - if ch != utf8.RUNE_BOM { - // error(t, t.offset, "illegal character '%r': %d", ch, ch) - } kind = .Invalid } } From 46a4927acad674b3265969bd5bde591b480d0c73 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 1 Dec 2021 00:32:35 +0100 Subject: [PATCH 003/245] [xml] Use `io.Writer` for `xml.print(doc)`. --- core/encoding/xml/debug_print.odin | 51 ++++++++++++---------- core/encoding/xml/example/xml_example.odin | 8 +++- core/encoding/xml/xml_reader.odin | 2 +- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/core/encoding/xml/debug_print.odin b/core/encoding/xml/debug_print.odin index 0b7ffa822..be1175cbc 100644 --- a/core/encoding/xml/debug_print.odin +++ b/core/encoding/xml/debug_print.odin @@ -10,64 +10,69 @@ package xml List of contributors: Jeroen van Rijn: Initial implementation. */ +import "core:io" import "core:fmt" /* Just for debug purposes. */ -print :: proc(doc: ^Document) { - assert(doc != nil) - +print :: proc(writer: io.Writer, doc: ^Document) -> (written: int, err: io.Error) { + if doc == nil { return } using fmt - println("[XML Prolog]") + + written += wprintf(writer, "[XML Prolog]\n") for attr in doc.prolog { - printf("\t%v: %v\n", attr.key, attr.val) + written += wprintf(writer, "\t%v: %v\n", attr.key, attr.val) } - printf("[Encoding] %v\n", doc.encoding) - printf("[DOCTYPE] %v\n", doc.doctype.ident) + written += wprintf(writer, "[Encoding] %v\n", doc.encoding) + written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident) if len(doc.doctype.rest) > 0 { - printf("\t%v\n", doc.doctype.rest) + wprintf(writer, "\t%v\n", doc.doctype.rest) } if doc.root != nil { - println(" --- ") - print_element(0, doc.root) - println(" --- ") - } + wprintln(writer, " --- ") + print_element(writer, doc.root) + wprintln(writer, " --- ") + } + + return written, .None } -print_element :: proc(indent: int, element: ^Element) { +print_element :: proc(writer: io.Writer, element: ^Element, indent := 0) -> (written: int, err: io.Error) { if element == nil { return } using fmt - tab :: proc(indent: int) { + tab :: proc(writer: io.Writer, indent: int) { tabs := "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" i := max(0, min(indent, len(tabs))) - printf("%v", tabs[:i]) + wprintf(writer, "%v", tabs[:i]) } - tab(indent) + tab(writer, indent) if element.kind == .Element { - printf("<%v>\n", element.ident) + wprintf(writer, "<%v>\n", element.ident) if len(element.value) > 0 { - tab(indent + 1) - printf("[Value] %v\n", element.value) + tab(writer, indent + 1) + wprintf(writer, "[Value] %v\n", element.value) } for attr in element.attribs { - tab(indent + 1) - printf("[Attr] %v: %v\n", attr.key, attr.val) + tab(writer, indent + 1) + wprintf(writer, "[Attr] %v: %v\n", attr.key, attr.val) } for child in element.children { - print_element(indent + 1, child) + print_element(writer, child, indent + 1) } } else if element.kind == .Comment { - printf("[COMMENT] %v\n", element.value) + wprintf(writer, "[COMMENT] %v\n", element.value) } + + return written, .None } \ No newline at end of file diff --git a/core/encoding/xml/example/xml_example.odin b/core/encoding/xml/example/xml_example.odin index 24a277de6..82938c223 100644 --- a/core/encoding/xml/example/xml_example.odin +++ b/core/encoding/xml/example/xml_example.odin @@ -2,6 +2,7 @@ package xml_example import "core:encoding/xml" import "core:mem" +import "core:strings" import "core:fmt" Error_Handler :: proc(pos: xml.Pos, fmt: string, args: ..any) { @@ -28,7 +29,12 @@ _main :: proc() { doc, err := xml.parse(DOC, OPTIONS, FILENAME, Error_Handler) defer xml.destroy(doc) - xml.print(doc) + buf: strings.Builder + defer strings.destroy_builder(&buf) + w := strings.to_writer(&buf) + + xml.print(w, doc) + println(strings.to_string(buf)) if err != .None { printf("Parse error: %v\n", err) diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 526be5856..34f6e65d0 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -75,6 +75,7 @@ Option_Flag :: enum { */ Decode_SGML_Entities, } +Option_Flags :: bit_set[Option_Flag; u8] Document :: struct { root: ^Element, @@ -122,7 +123,6 @@ Options :: struct { flags: Option_Flags, expected_doctype: string, } -Option_Flags :: bit_set[Option_Flag] Encoding :: enum { Unknown, From 682783a2aabad34e838493bb1e4c2437fd13058a Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 1 Dec 2021 00:43:22 +0100 Subject: [PATCH 004/245] [xml] Tab indentation in debug printer. --- core/encoding/xml/debug_print.odin | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/encoding/xml/debug_print.odin b/core/encoding/xml/debug_print.odin index be1175cbc..c4d6875cc 100644 --- a/core/encoding/xml/debug_print.odin +++ b/core/encoding/xml/debug_print.odin @@ -47,10 +47,9 @@ print_element :: proc(writer: io.Writer, element: ^Element, indent := 0) -> (wri using fmt tab :: proc(writer: io.Writer, indent: int) { - tabs := "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" - - i := max(0, min(indent, len(tabs))) - wprintf(writer, "%v", tabs[:i]) + for _ in 0..=indent { + wprintf(writer, "\t") + } } tab(writer, indent) From 32eab04d662b0c1128e64a4b91fb81f5f2be5a95 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 1 Dec 2021 03:15:44 +0100 Subject: [PATCH 005/245] [xml] Allow multi-line bodies w/o CDATA. Strip trailing whitespace. --- core/encoding/xml/debug_print.odin | 9 ++++++--- core/encoding/xml/tokenizer.odin | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/core/encoding/xml/debug_print.odin b/core/encoding/xml/debug_print.odin index c4d6875cc..65b71e30b 100644 --- a/core/encoding/xml/debug_print.odin +++ b/core/encoding/xml/debug_print.odin @@ -27,10 +27,13 @@ print :: proc(writer: io.Writer, doc: ^Document) -> (written: int, err: io.Error } written += wprintf(writer, "[Encoding] %v\n", doc.encoding) - written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident) - if len(doc.doctype.rest) > 0 { - wprintf(writer, "\t%v\n", doc.doctype.rest) + if len(doc.doctype.ident) > 0 { + written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident) + + if len(doc.doctype.rest) > 0 { + wprintf(writer, "\t%v\n", doc.doctype.rest) + } } if doc.root != nil { diff --git a/core/encoding/xml/tokenizer.odin b/core/encoding/xml/tokenizer.odin index 3dcffb0d6..e453552b8 100644 --- a/core/encoding/xml/tokenizer.odin +++ b/core/encoding/xml/tokenizer.odin @@ -205,7 +205,7 @@ scan_identifier :: proc(t: ^Tokenizer) -> string { return string(t.src[offset : t.offset]) } -scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close := false) -> (value: string, err: Error) { +scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close := false, multiline := true) -> (value: string, err: Error) { err = .None in_cdata := false @@ -238,7 +238,7 @@ scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close } case '\n': - if !in_cdata { + if !(multiline || in_cdata) { error(t, offset, string(t.src[offset : t.offset])) error(t, offset, "[scan_string] Not terminated\n") err = .Invalid_Tag_Value @@ -256,7 +256,22 @@ scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close advance_rune(t) } + /* + Strip trailing whitespace. + */ lit := string(t.src[offset : t.offset]) + + end := len(lit) + eat: for ; end > 0; end -= 1 { + ch := lit[end - 1] + switch ch { + case ' ', '\t', '\r', '\n': + case: + break eat + } + } + lit = lit[:end] + if consume_close { advance_rune(t) } @@ -307,7 +322,7 @@ scan :: proc(t: ^Tokenizer) -> Token { case ':': kind = .Colon case '"', '\'': - lit, err = scan_string(t, t.offset, ch, true) + lit, err = scan_string(t, t.offset, ch, true, false) if err == .None { kind = .String } else { From ec63d0bbd21aa3d3f33cd762bd656ea8eb0af4a6 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 1 Dec 2021 15:30:36 +0100 Subject: [PATCH 006/245] [xml] Robustness improvement. Can now parse https://www.w3.org/2003/entities/2007xml/unicode.xml no problem. --- core/encoding/xml/debug_print.odin | 4 ++ core/encoding/xml/xml_reader.odin | 73 ++++++++++++++++++++---------- 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/core/encoding/xml/debug_print.odin b/core/encoding/xml/debug_print.odin index 65b71e30b..e6a8c9433 100644 --- a/core/encoding/xml/debug_print.odin +++ b/core/encoding/xml/debug_print.odin @@ -36,6 +36,10 @@ print :: proc(writer: io.Writer, doc: ^Document) -> (written: int, err: io.Error } } + for comment in doc.comments { + written += wprintf(writer, "[Pre-root comment] %v\n", comment) + } + if doc.root != nil { wprintln(writer, " --- ") print_element(writer, doc.root) diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 34f6e65d0..b2226e6b9 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -86,10 +86,16 @@ Document :: struct { /* We only scan the . The grammar does not allow a comment to end in ---> */ - if doc.root == nil { - return doc, .Comment_Before_Root_Element - } - expect(t, .Dash) offset := t.offset @@ -329,12 +339,17 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err } if .Intern_Comments in opts.flags { - el := new(Element) + comment := strings.intern_get(&doc.intern, string(t.src[offset : t.offset - 1])) - el.parent = element - el.kind = .Comment - el.value = strings.intern_get(&doc.intern, string(t.src[offset : t.offset - 1])) - append(&element.children, el) + if doc.root == nil { + append(&doc.comments, comment) + } else { + el := new(Element) + el.parent = element + el.kind = .Comment + el.value = comment + append(&element.children, el) + } } expect(t, .Dash) @@ -350,6 +365,7 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err e.g. `, which means this is an 'empty' or self-closing tag. */ end_token := scan(t) - #partial switch end_token.kind { case .Gt: /* @@ -394,9 +409,12 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err case .Slash: /* - Empty tag? + Empty tag. Close it. */ expect(t, .Gt) or_return + parent = element.parent + element = parent + tag_is_open = false case: error(t, t.offset, "Expected close tag, got: %#v\n", end_token) @@ -411,25 +429,33 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err _ = expect(t, .Gt) or_return if element.ident != ident.text { - error(t, t.offset, "Mismatched Closing Tag: %v\n", ident.text) + error(t, t.offset, "Mismatched Closing Tag. Expected %v, got %v\n", element.ident, ident.text) return doc, .Mismatched_Closing_Tag } - parent = element.parent - element = parent + parent = element.parent + element = parent + tag_is_open = false case: error(t, t.offset, "Invalid Token after <: %#v\n", open) return } - case .EOF: + case -1: + /* + End of file. + */ + if tag_is_open { + return doc, .Premature_EOF + } break loop case: /* This should be a tag's body text. */ - element.value = scan_string(t, tok.pos.offset) or_return + body_text := scan_string(t, t.offset) or_return + element.value = strings.intern_get(&doc.intern, body_text) } } @@ -480,6 +506,7 @@ destroy :: proc(doc: ^Document) { strings.intern_destroy(&doc.intern) delete(doc.prolog) + delete(doc.comments) free(doc) } From beff90e1d12391e63cd1119023f8565eda97593e Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 1 Dec 2021 18:02:48 +0100 Subject: [PATCH 007/245] [xml] Slight optimization. About a 5% speed bump. More rigorous optimization later. --- core/encoding/xml/tokenizer.odin | 62 ++++++++++++++++++------------- core/encoding/xml/xml_reader.odin | 4 +- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/core/encoding/xml/tokenizer.odin b/core/encoding/xml/tokenizer.odin index e453552b8..9247d2531 100644 --- a/core/encoding/xml/tokenizer.odin +++ b/core/encoding/xml/tokenizer.odin @@ -110,44 +110,51 @@ error :: proc(t: ^Tokenizer, offset: int, msg: string, args: ..any) { t.error_count += 1 } +@(optimization_mode="speed") advance_rune :: proc(using t: ^Tokenizer) { - if read_offset < len(src) { - offset = read_offset - if ch == '\n' { - line_offset = offset - line_count += 1 - } - r, w := rune(src[read_offset]), 1 - switch { - case r == 0: - error(t, t.offset, "illegal character NUL") - case r >= utf8.RUNE_SELF: - r, w = utf8.decode_rune_in_string(src[read_offset:]) - if r == utf8.RUNE_ERROR && w == 1 { - error(t, t.offset, "illegal UTF-8 encoding") - } else if r == utf8.RUNE_BOM && offset > 0 { - error(t, t.offset, "illegal byte order mark") + #no_bounds_check { + /* + Already bounds-checked here. + */ + if read_offset < len(src) { + offset = read_offset + if ch == '\n' { + line_offset = offset + line_count += 1 } + r, w := rune(src[read_offset]), 1 + switch { + case r == 0: + error(t, t.offset, "illegal character NUL") + case r >= utf8.RUNE_SELF: + r, w = #force_inline utf8.decode_rune_in_string(src[read_offset:]) + if r == utf8.RUNE_ERROR && w == 1 { + error(t, t.offset, "illegal UTF-8 encoding") + } else if r == utf8.RUNE_BOM && offset > 0 { + error(t, t.offset, "illegal byte order mark") + } + } + read_offset += w + ch = r + } else { + offset = len(src) + if ch == '\n' { + line_offset = offset + line_count += 1 + } + ch = -1 } - read_offset += w - ch = r - } else { - offset = len(src) - if ch == '\n' { - line_offset = offset - line_count += 1 - } - ch = -1 } } peek_byte :: proc(t: ^Tokenizer, offset := 0) -> byte { if t.read_offset+offset < len(t.src) { - return t.src[t.read_offset+offset] + #no_bounds_check return t.src[t.read_offset+offset] } return 0 } +@(optimization_mode="speed") skip_whitespace :: proc(t: ^Tokenizer) { for { switch t.ch { @@ -159,6 +166,7 @@ skip_whitespace :: proc(t: ^Tokenizer) { } } +@(optimization_mode="speed") is_letter :: proc(r: rune) -> bool { if r < utf8.RUNE_SELF { switch r { @@ -177,6 +185,7 @@ is_valid_identifier_rune :: proc(r: rune) -> bool { case '_', '-', ':': return true case 'A'..='Z', 'a'..='z': return true case '0'..'9': return true + case -1: return false } } @@ -205,6 +214,7 @@ scan_identifier :: proc(t: ^Tokenizer) -> string { return string(t.src[offset : t.offset]) } +@(optimization_mode="speed") scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close := false, multiline := true) -> (value: string, err: Error) { err = .None in_cdata := false diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index b2226e6b9..35dd83b3f 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -239,7 +239,7 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err /* Consume peeked `<` */ - tok := scan(t) + advance_rune(t) open := scan(t) #partial switch open.kind { @@ -265,7 +265,7 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err skip_element(t) or_return } case: - error(t, t.offset, "Expected \" Date: Wed, 1 Dec 2021 22:01:19 +0100 Subject: [PATCH 008/245] [xml] Improve CDATA + comment handling in tag body. --- core/encoding/xml/tokenizer.odin | 117 ++++++++++++++++++++++++------ core/encoding/xml/xml_reader.odin | 36 +-------- 2 files changed, 96 insertions(+), 57 deletions(-) diff --git a/core/encoding/xml/tokenizer.odin b/core/encoding/xml/tokenizer.odin index 9247d2531..95024518d 100644 --- a/core/encoding/xml/tokenizer.odin +++ b/core/encoding/xml/tokenizer.odin @@ -46,8 +46,11 @@ Token_Kind :: enum { EOF, } -CDATA_START :: "" +CDATA_START :: "" + +COMMENT_START :: "" Tokenizer :: struct { // Immutable data @@ -214,10 +217,83 @@ scan_identifier :: proc(t: ^Tokenizer) -> string { return string(t.src[offset : t.offset]) } +/* + A comment ends when we see -->, preceded by a character that's not a dash. + "For compatibility, the string "--" (double-hyphen) must not occur within comments." + + See: https://www.w3.org/TR/2006/REC-xml11-20060816/#dt-comment + + Thanks to the length (4) of the comment start, we also have enough lookback, + and the peek at the next byte asserts that there's at least one more character + that's a `>`. +*/ +scan_comment :: proc(t: ^Tokenizer) -> (comment: string, err: Error) { + offset := t.offset + + for { + advance_rune(t) + ch := t.ch + + if ch < 0 { + error(t, offset, "[parse] Comment was not terminated\n") + return "", .Unclosed_Comment + } + + if string(t.src[t.offset - 1:][:2]) == "--" { + if peek_byte(t) == '>' { + break + } else { + error(t, t.offset - 1, "Invalid -- sequence in comment.\n") + return "", .Invalid_Sequence_In_Comment + } + } + } + + expect(t, .Dash) + expect(t, .Gt) + + return string(t.src[offset : t.offset - 1]), .None +} + +/* + Skip CDATA +*/ +skip_cdata :: proc(t: ^Tokenizer) -> (err: Error) { + if t.read_offset + len(CDATA_START) >= len(t.src) { + /* + Can't be the start of a CDATA tag. + */ + return .None + } + + if string(t.src[t.offset:][:len(CDATA_START)]) == CDATA_START { + t.read_offset += len(CDATA_START) + offset := t.offset + + cdata_scan: for { + advance_rune(t) + if t.ch < 0 { + error(t, offset, "[scan_string] CDATA was not terminated\n") + return .Premature_EOF + } + + /* + Scan until the end of a CDATA tag. + */ + if t.read_offset + len(CDATA_END) < len(t.src) { + if string(t.src[t.offset:][:len(CDATA_END)]) == CDATA_END { + t.read_offset += len(CDATA_END) + break cdata_scan + } + } + } + } + return +} + @(optimization_mode="speed") scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close := false, multiline := true) -> (value: string, err: Error) { err = .None - in_cdata := false loop: for { ch := t.ch @@ -228,27 +304,23 @@ scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close return "", .Premature_EOF case '<': - /* - Might be the start of a CDATA tag. - */ - if t.read_offset + len(CDATA_START) < len(t.src) { - if string(t.src[t.offset:][:len(CDATA_START)]) == CDATA_START { - in_cdata = true - } - } - - case ']': - /* - Might be the end of a CDATA tag. - */ - if t.read_offset + len(CDATA_END) < len(t.src) { - if string(t.src[t.offset:][:len(CDATA_END)]) == CDATA_END { - in_cdata = false + if peek_byte(t) == '!' { + if peek_byte(t, 1) == '[' { + /* + Might be the start of a CDATA tag. + */ + skip_cdata(t) or_return + } else if peek_byte(t, 1) == '-' && peek_byte(t, 2) == '-' { + /* + Comment start. Eat comment. + */ + t.read_offset += 3 + _ = scan_comment(t) or_return } } case '\n': - if !(multiline || in_cdata) { + if !multiline { error(t, offset, string(t.src[offset : t.offset])) error(t, offset, "[scan_string] Not terminated\n") err = .Invalid_Tag_Value @@ -256,13 +328,12 @@ scan_string :: proc(t: ^Tokenizer, offset: int, close: rune = '<', consume_close } } - if ch == close && !in_cdata { + if t.ch == close { /* - If it's not a CDATA tag, it's the end of this body. + If it's not a CDATA or comment, it's the end of this body. */ break loop } - advance_rune(t) } diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 35dd83b3f..146c278cb 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -307,39 +307,10 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err The grammar does not allow a comment to end in ---> */ expect(t, .Dash) - offset := t.offset - - for { - advance_rune(t) - ch := t.ch - - /* - A comment ends when we see -->, preceded by a character that's not a dash. - "For compatibility, the string "--" (double-hyphen) must not occur within comments." - - See: https://www.w3.org/TR/2006/REC-xml11-20060816/#dt-comment - - Thanks to the length (4) of the comment start, we also have enough lookback, - and the peek at the next byte asserts that there's at least one more character - that's a `>`. - */ - if ch < 0 { - error(t, offset, "[parse] Comment was not terminated\n") - return doc, .Unclosed_Comment - } - - if string(t.src[t.offset - 1:][:2]) == "--" { - if peek_byte(t) == '>' { - break - } else { - error(t, t.offset - 1, "Invalid -- sequence in comment.\n") - return doc, .Invalid_Sequence_In_Comment - } - } - } + comment := scan_comment(t) or_return if .Intern_Comments in opts.flags { - comment := strings.intern_get(&doc.intern, string(t.src[offset : t.offset - 1])) + comment = strings.intern_get(&doc.intern, comment) if doc.root == nil { append(&doc.comments, comment) @@ -352,9 +323,6 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err } } - expect(t, .Dash) - expect(t, .Gt) - case: error(t, t.offset, "Invalid Token after Date: Thu, 2 Dec 2021 18:00:29 +0100 Subject: [PATCH 009/245] [xml] Improvements. --- core/encoding/xml/example/xml_example.odin | 71 +++++++++++-------- core/encoding/xml/helpers.odin | 49 +++++++++++++ core/encoding/xml/tokenizer.odin | 6 +- core/encoding/xml/xml_reader.odin | 2 + tests/core/assets/XML/.gitignore | 2 + tests/core/assets/{xml => XML}/nl_NL-qt-ts.ts | 0 .../assets/{xml => XML}/nl_NL-xliff-1.0.xliff | 0 .../assets/{xml => XML}/nl_NL-xliff-2.0.xliff | 0 tests/core/assets/{xml => XML}/utf8.xml | 0 tests/core/download_assets.py | 43 ++++++++--- tests/core/encoding/xml/test_core_xml.odin | 10 +-- 11 files changed, 137 insertions(+), 46 deletions(-) create mode 100644 core/encoding/xml/helpers.odin create mode 100644 tests/core/assets/XML/.gitignore rename tests/core/assets/{xml => XML}/nl_NL-qt-ts.ts (100%) rename tests/core/assets/{xml => XML}/nl_NL-xliff-1.0.xliff (100%) rename tests/core/assets/{xml => XML}/nl_NL-xliff-2.0.xliff (100%) rename tests/core/assets/{xml => XML}/utf8.xml (100%) diff --git a/core/encoding/xml/example/xml_example.odin b/core/encoding/xml/example/xml_example.odin index 82938c223..085252e92 100644 --- a/core/encoding/xml/example/xml_example.odin +++ b/core/encoding/xml/example/xml_example.odin @@ -1,45 +1,55 @@ package xml_example import "core:encoding/xml" +import "core:os" +import "core:path" import "core:mem" -import "core:strings" import "core:fmt" -Error_Handler :: proc(pos: xml.Pos, fmt: string, args: ..any) { +/* + Silent error handler for the parser. +*/ +Error_Handler :: proc(pos: xml.Pos, fmt: string, args: ..any) {} -} +OPTIONS :: xml.Options{ flags = { .Ignore_Unsupported, }, expected_doctype = "unicode", } -FILENAME :: "../../../../tests/core/assets/xml/nl_NL-xliff-1.0.xliff" -DOC :: #load(FILENAME) - -OPTIONS :: xml.Options{ - flags = { - .Ignore_Unsupported, .Intern_Comments, - }, - expected_doctype = "", -} - -_main :: proc() { +example :: proc() { using fmt - println("--- DOCUMENT TO PARSE ---") - println(string(DOC)) - println("--- /DOCUMENT TO PARSE ---\n") + filename := path.join(ODIN_ROOT, "tests", "core", "assets", "XML", "unicode.xml") + defer delete(filename) - doc, err := xml.parse(DOC, OPTIONS, FILENAME, Error_Handler) + doc, err := xml.parse(filename, OPTIONS, Error_Handler) defer xml.destroy(doc) - buf: strings.Builder - defer strings.destroy_builder(&buf) - w := strings.to_writer(&buf) - - xml.print(w, doc) - println(strings.to_string(buf)) - if err != .None { - printf("Parse error: %v\n", err) - } else { - println("DONE!") + printf("Load/Parse error: %v\n", err) + if err == .File_Error { + printf("\"%v\" not found. Did you run \"tests\\download_assets.py\"?", filename) + } + os.exit(1) + } + + printf("\"%v\" loaded and parsed.\n", filename) + + charlist, charlist_ok := xml.find_child_by_ident(doc.root, "charlist") + if !charlist_ok { + eprintln("Could not locate top-level `` tag.") + os.exit(1) + } + + printf("Found `` with %v children.\n", len(charlist.children)) + + for char in charlist.children { + if char.ident != "character" { + eprintf("Expected ``, got `<%v>`\n", char.ident) + os.exit(1) + } + + if _, ok := xml.find_attribute_val_by_key(char, "dec"); !ok { + eprintln("`` attribute not found.") + os.exit(1) + } } } @@ -50,12 +60,13 @@ main :: proc() { mem.tracking_allocator_init(&track, context.allocator) context.allocator = mem.tracking_allocator(&track) - _main() + example() if len(track.allocation_map) > 0 { println() for _, v in track.allocation_map { printf("%v Leaked %v bytes.\n", v.location, v.size) } - } + } + println("Done and cleaned up!") } \ No newline at end of file diff --git a/core/encoding/xml/helpers.odin b/core/encoding/xml/helpers.odin new file mode 100644 index 000000000..14597ddbd --- /dev/null +++ b/core/encoding/xml/helpers.odin @@ -0,0 +1,49 @@ +package xml +/* + An XML 1.0 / 1.1 parser + + Copyright 2021 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + This file contains helper functions. +*/ + + +/* + Find `tag`'s nth child with a given ident. +*/ +find_child_by_ident :: proc(tag: ^Element, ident: string, nth := 0) -> (res: ^Element, found: bool) { + if tag == nil { return nil, false } + + count := 0 + for child in tag.children { + /* + Skip commments. They have no name. + */ + if child.kind != .Element { continue } + + /* + If the ident matches and it's the nth such child, return it. + */ + if child.ident == ident { + if count == nth { return child, true } + count += 1 + } + } + return nil, false +} + +/* + Find an attribute by key. +*/ +find_attribute_val_by_key :: proc(tag: ^Element, key: string) -> (val: string, found: bool) { + if tag == nil { return "", false } + + for attr in tag.attribs { + /* + If the ident matches, we're done. There can only ever be one attribute with the same name. + */ + if attr.key == key { return attr.val, true } + } + return "", false +} \ No newline at end of file diff --git a/core/encoding/xml/tokenizer.odin b/core/encoding/xml/tokenizer.odin index 95024518d..2da3b7683 100644 --- a/core/encoding/xml/tokenizer.odin +++ b/core/encoding/xml/tokenizer.odin @@ -403,11 +403,11 @@ scan :: proc(t: ^Tokenizer) -> Token { case ':': kind = .Colon case '"', '\'': + kind = .Invalid + lit, err = scan_string(t, t.offset, ch, true, false) if err == .None { kind = .String - } else { - kind = .Invalid } case '\n': @@ -418,7 +418,7 @@ scan :: proc(t: ^Tokenizer) -> Token { } } - if lit == "" { + if kind != .String && lit == "" { lit = string(t.src[offset : t.offset]) } return Token{kind, lit, pos} diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 146c278cb..563294309 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -519,6 +519,8 @@ parse_attribute :: proc(doc: ^Document) -> (attr: Attr, offset: int, err: Error) _ = expect(t, .Eq) or_return value := expect(t, .String) or_return + error(t, t.offset, "String: %v\n", value) + attr.key = strings.intern_get(&doc.intern, key.text) attr.val = strings.intern_get(&doc.intern, value.text) diff --git a/tests/core/assets/XML/.gitignore b/tests/core/assets/XML/.gitignore new file mode 100644 index 000000000..32dc58b57 --- /dev/null +++ b/tests/core/assets/XML/.gitignore @@ -0,0 +1,2 @@ +# This file will be downloaded by download_assets.py +unicode.xml \ No newline at end of file diff --git a/tests/core/assets/xml/nl_NL-qt-ts.ts b/tests/core/assets/XML/nl_NL-qt-ts.ts similarity index 100% rename from tests/core/assets/xml/nl_NL-qt-ts.ts rename to tests/core/assets/XML/nl_NL-qt-ts.ts diff --git a/tests/core/assets/xml/nl_NL-xliff-1.0.xliff b/tests/core/assets/XML/nl_NL-xliff-1.0.xliff similarity index 100% rename from tests/core/assets/xml/nl_NL-xliff-1.0.xliff rename to tests/core/assets/XML/nl_NL-xliff-1.0.xliff diff --git a/tests/core/assets/xml/nl_NL-xliff-2.0.xliff b/tests/core/assets/XML/nl_NL-xliff-2.0.xliff similarity index 100% rename from tests/core/assets/xml/nl_NL-xliff-2.0.xliff rename to tests/core/assets/XML/nl_NL-xliff-2.0.xliff diff --git a/tests/core/assets/xml/utf8.xml b/tests/core/assets/XML/utf8.xml similarity index 100% rename from tests/core/assets/xml/utf8.xml rename to tests/core/assets/XML/utf8.xml diff --git a/tests/core/download_assets.py b/tests/core/download_assets.py index d86f7f1e7..831b5b13a 100644 --- a/tests/core/download_assets.py +++ b/tests/core/download_assets.py @@ -50,10 +50,7 @@ def try_download_file(url, out_file): print("Could not download", url) return 1 -def try_download_and_unpack_zip(suite): - url = ASSETS_BASE_URL.format(suite, "{}.zip".format(suite)) - out_file = DOWNLOAD_BASE_PATH.format(suite) + "/{}.zip".format(suite) - +def try_download_and_unpack_zip(url, out_file, extract_path): print("\tDownloading {} to {}.".format(url, out_file)) if try_download_file(url, out_file) is not None: @@ -65,7 +62,6 @@ def try_download_and_unpack_zip(suite): with zipfile.ZipFile(out_file) as z: for file in z.filelist: filename = file.filename - extract_path = DOWNLOAD_BASE_PATH.format(suite) print("\t\tExtracting: {}".format(filename)) z.extract(file, extract_path) @@ -73,25 +69,56 @@ def try_download_and_unpack_zip(suite): print("Could not extract ZIP file") return 2 +def download_png_assets(): + suite = "PNG" + url = ASSETS_BASE_URL.format(suite, "{}.zip".format(suite)) + out_file = DOWNLOAD_BASE_PATH.format(suite) + "/{}.zip".format(suite) + extract_path = DOWNLOAD_BASE_PATH.format(suite) -def main(): print("Downloading PNG assets") # Make PNG assets path try: - path = DOWNLOAD_BASE_PATH.format("PNG") + path = DOWNLOAD_BASE_PATH.format(suite) os.makedirs(path) except FileExistsError: pass # Try downloading and unpacking the PNG assets - r = try_download_and_unpack_zip("PNG") + r = try_download_and_unpack_zip(url, out_file, extract_path) if r is not None: return r # We could fall back on downloading the PNG files individually, but it's slow print("Done downloading PNG assets") + +def download_unicode_assets(): + suite = "XML" + url = "https://www.w3.org/2003/entities/2007xml/unicode.xml.zip" + out_file = DOWNLOAD_BASE_PATH.format(suite) + "/{}.zip".format(suite) + extract_path = DOWNLOAD_BASE_PATH.format(suite) + + print("Downloading {}.".format(url)) + + # Make XML assets path + try: + path = DOWNLOAD_BASE_PATH.format(suite) + os.makedirs(path) + except FileExistsError: + pass + + # Try downloading and unpacking the assets + r = try_download_and_unpack_zip(url, out_file, extract_path) + if r is not None: + return r + + print("Done downloading Unicode/XML assets") + +def main(): + download_png_assets() + download_unicode_assets() + return 0 if __name__ == '__main__': diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index 7eefac212..c2e0aa172 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -35,7 +35,7 @@ TESTS :: []TEST{ First we test that certain files parse without error. */ { - filename = "assets/xml/utf8.xml", + filename = "assets/XML/utf8.xml", options = OPTIONS, expected = { error = .None, @@ -45,7 +45,7 @@ TESTS :: []TEST{ }, }, { - filename = "assets/xml/nl_NL-qt-ts.ts", + filename = "assets/XML/nl_NL-qt-ts.ts", options = OPTIONS, expected = { error = .None, @@ -55,7 +55,7 @@ TESTS :: []TEST{ }, }, { - filename = "assets/xml/nl_NL-xliff-1.0.xliff", + filename = "assets/XML/nl_NL-xliff-1.0.xliff", options = OPTIONS, expected = { error = .None, @@ -65,7 +65,7 @@ TESTS :: []TEST{ }, }, { - filename = "assets/xml/nl_NL-xliff-2.0.xliff", + filename = "assets/XML/nl_NL-xliff-2.0.xliff", options = OPTIONS, expected = { error = .None, @@ -79,7 +79,7 @@ TESTS :: []TEST{ Then we test that certain errors are returned as expected. */ { - filename = "assets/xml/utf8.xml", + filename = "assets/XML/utf8.xml", options = { flags = { .Ignore_Unsupported, .Intern_Comments, From 2dd67dba89732b89adb0199bc0a99de4cbc34e8f Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 2 Dec 2021 20:12:12 +0100 Subject: [PATCH 010/245] [core:encoding/entity] Add new package to decode &; entities. Includes generator to generate a lookup for named entitiess. --- core/encoding/entity/LICENSE_table.md | 21 + core/encoding/entity/entity.odin | 358 + .../entity/example/entity_example.odin | 122 + core/encoding/entity/example/test.html | 26 + core/encoding/entity/generated.odin | 7493 +++++++++++++++++ core/encoding/xml/xml_reader.odin | 2 - core/unicode/tools/generate_entity_table.odin | 287 + 7 files changed, 8307 insertions(+), 2 deletions(-) create mode 100644 core/encoding/entity/LICENSE_table.md create mode 100644 core/encoding/entity/entity.odin create mode 100644 core/encoding/entity/example/entity_example.odin create mode 100644 core/encoding/entity/example/test.html create mode 100644 core/encoding/entity/generated.odin create mode 100644 core/unicode/tools/generate_entity_table.odin diff --git a/core/encoding/entity/LICENSE_table.md b/core/encoding/entity/LICENSE_table.md new file mode 100644 index 000000000..51e3f34b5 --- /dev/null +++ b/core/encoding/entity/LICENSE_table.md @@ -0,0 +1,21 @@ +# License + +By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions. + +Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications: + +The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. +Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code. + +Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.) + +# Disclaimers + +THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + +COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. + +The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders. + +# Notes +This version: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 \ No newline at end of file diff --git a/core/encoding/entity/entity.odin b/core/encoding/entity/entity.odin new file mode 100644 index 000000000..e40896819 --- /dev/null +++ b/core/encoding/entity/entity.odin @@ -0,0 +1,358 @@ +package unicode_entity +/* + A unicode entity encoder/decoder + + Copyright 2021 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + This code has several procedures to map unicode runes to/from different textual encodings. + - SGML/XML/HTML entity + -- &#; + -- &#x; + -- &; (If the lookup tables are compiled in). + Reference: https://www.w3.org/2003/entities/2007xml/unicode.xml + + - URL encode / decode %hex entity + Reference: https://datatracker.ietf.org/doc/html/rfc3986/#section-2.1 + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ + +import "core:unicode/utf8" +import "core:unicode" +import "core:strings" + +MAX_RUNE_CODEPOINT :: int(unicode.MAX_RUNE) + +write_rune :: strings.write_rune_builder +write_string :: strings.write_string_builder + +Error :: enum u8 { + None = 0, + Tokenizer_Is_Nil, + + Illegal_NUL_Character, + Illegal_UTF_Encoding, + Illegal_BOM, + + CDATA_Not_Terminated, + Comment_Not_Terminated, + Invalid_Entity_Encoding, +} + +Tokenizer :: struct { + r: rune, + w: int, + + src: string, + offset: int, + read_offset: int, +} + +CDATA_START :: "" + +COMMENT_START :: "" + +/* + Default: CDATA and comments are passed through unchanged. +*/ +XML_Decode_Option :: enum u8 { + /* + CDATA is unboxed. + */ + CDATA_Unbox, + + /* + Unboxed CDATA is decoded as well. + Ignored if `.CDATA_Unbox` is not given. + */ + CDATA_Decode, + + /* + Comments are stripped. + */ + Comment_Strip, +} +XML_Decode_Options :: bit_set[XML_Decode_Option; u8] + +/* + Decode a string that may include SGML/XML/HTML entities. + The caller has to free the result. +*/ +decode_xml :: proc(input: string, options := XML_Decode_Options{}, allocator := context.allocator) -> (decoded: string, err: Error) { + context.allocator = allocator + + l := len(input) + if l == 0 { return "", .None } + + builder := strings.make_builder() + defer strings.destroy_builder(&builder) + + t := Tokenizer{src=input} + in_data := false + + loop: for { + advance(&t) or_return + if t.r < 0 { break loop } + + /* + Below here we're never inside a CDATA tag. + At most we'll see the start of one, but that doesn't affect the logic. + */ + switch t.r { + case '<': + /* + Might be the start of a CDATA tag or comment. + + We don't need to check if we need to write a `<`, because if it isn't CDATA or a comment, + it couldn't have been part of an XML tag body to be decoded here. + */ + in_data = _handle_xml_special(&t, &builder, options) or_return + + case ']': + /* + If we're unboxing _and_ decoding CDATA, we'll have to check for the end tag. + */ + if in_data { + if t.read_offset + len(CDATA_END) < len(t.src) { + if string(t.src[t.offset:][:len(CDATA_END)]) == CDATA_END { + in_data = false + t.read_offset += len(CDATA_END) - 1 + } + } + continue + } else { + write_rune(&builder, ']') + } + + case: + if in_data && .CDATA_Decode not_in options { + /* + Unboxed, but undecoded. + */ + write_rune(&builder, t.r) + continue + } + + if t.r == '&' { + if entity, entity_err := _extract_xml_entity(&t); entity_err != .None { + /* + We read to the end of the string without closing the entity. + Pass through as-is. + */ + write_string(&builder, entity) + } else { + if decoded, ok := xml_decode_entity(entity); ok { + write_rune(&builder, decoded) + } else { + /* + Decode failed. Pass through original. + */ + write_string(&builder, "&") + write_string(&builder, entity) + write_string(&builder, ";") + } + + } + } else { + write_rune(&builder, t.r) + } + } + } + + return strings.clone(strings.to_string(builder), allocator), err +} + +advance :: proc(t: ^Tokenizer) -> (err: Error) { + if t == nil { return .Tokenizer_Is_Nil } + using t + + #no_bounds_check { + if read_offset < len(src) { + offset = read_offset + r, w = rune(src[read_offset]), 1 + switch { + case r == 0: + return .Illegal_NUL_Character + case r >= utf8.RUNE_SELF: + r, w = utf8.decode_rune_in_string(src[read_offset:]) + if r == utf8.RUNE_ERROR && w == 1 { + return .Illegal_UTF_Encoding + } else if r == utf8.RUNE_BOM && offset > 0 { + return .Illegal_BOM + } + } + read_offset += w + return .None + } else { + offset = len(src) + r = -1 + return + } + } +} + +xml_decode_entity :: proc(entity: string) -> (decoded: rune, ok: bool) { + entity := entity + if len(entity) == 0 { return -1, false } + + switch entity[0] { + case '#': + base := 10 + val := 0 + entity = entity[1:] + + if len(entity) == 0 { return -1, false } + + if entity[0] == 'x' || entity[0] == 'X' { + base = 16 + entity = entity[1:] + } + + for len(entity) > 0 { + r := entity[0] + switch r { + case '0'..'9': + val *= base + val += int(r - '0') + + case 'a'..'f': + if base == 10 { return -1, false } + val *= base + val += int(r - 'a' + 10) + + case 'A'..'F': + if base == 10 { return -1, false } + val *= base + val += int(r - 'A' + 10) + + case: + return -1, false + } + + if val > MAX_RUNE_CODEPOINT { return -1, false } + entity = entity[1:] + } + return rune(val), true + + case: + /* + Named entity. + */ + return named_xml_entity_to_rune(entity) + } +} + +/* + Private XML helper to extract `&;` entity. +*/ +@(private="file") +_extract_xml_entity :: proc(t: ^Tokenizer) -> (entity: string, err: Error) { + assert(t != nil && t.r == '&') + + /* + All of these would be in the ASCII range. + Even if one is not, it doesn't matter. All characters we need to compare to extract are. + */ + using t + + length := len(t.src) + found := false + + #no_bounds_check { + for read_offset < length { + if src[read_offset] == ';' { + found = true + read_offset += 1 + break + } + read_offset += 1 + } + } + + if found { + return string(src[offset + 1 : read_offset - 1]), .None + } + return string(src[offset : read_offset]), .Invalid_Entity_Encoding +} + +/* + Private XML helper for CDATA and comments. +*/ +@(private="file") +_handle_xml_special :: proc(t: ^Tokenizer, builder: ^strings.Builder, options: XML_Decode_Options) -> (in_data: bool, err: Error) { + assert(t != nil && t.r == '<') + if t.read_offset + len(CDATA_START) >= len(t.src) { return false, .None } + + if string(t.src[t.offset:][:len(CDATA_START)]) == CDATA_START { + t.read_offset += len(CDATA_START) - 1 + + if .CDATA_Unbox in options && .CDATA_Decode in options { + /* + We're unboxing _and_ decoding CDATA + */ + return true, .None + } + + /* + CDATA is passed through. + */ + offset := t.offset + + /* + Scan until end of CDATA. + */ + for { + advance(t) or_return + if t.r < 0 { return true, .CDATA_Not_Terminated } + + if t.read_offset + len(CDATA_END) < len(t.src) { + if string(t.src[t.offset:][:len(CDATA_END)]) == CDATA_END { + t.read_offset += len(CDATA_END) - 1 + + cdata := string(t.src[offset : t.read_offset]) + + if .CDATA_Unbox in options { + cdata = cdata[len(CDATA_START):] + cdata = cdata[:len(cdata) - len(CDATA_END)] + } + + write_string(builder, cdata) + return false, .None + } + } + } + + } else if string(t.src[t.offset:][:len(COMMENT_START)]) == COMMENT_START { + t.read_offset += len(COMMENT_START) + /* + Comment is passed through by default. + */ + offset := t.offset + + /* + Scan until end of Comment. + */ + for { + advance(t) or_return + if t.r < 0 { return true, .Comment_Not_Terminated } + + if t.read_offset + len(COMMENT_END) < len(t.src) { + if string(t.src[t.offset:][:len(COMMENT_END)]) == COMMENT_END { + t.read_offset += len(COMMENT_END) - 1 + + if .Comment_Strip not_in options { + comment := string(t.src[offset : t.read_offset]) + write_string(builder, comment) + } + return false, .None + } + } + } + + } + return false, .None +} \ No newline at end of file diff --git a/core/encoding/entity/example/entity_example.odin b/core/encoding/entity/example/entity_example.odin new file mode 100644 index 000000000..8758d9ad9 --- /dev/null +++ b/core/encoding/entity/example/entity_example.odin @@ -0,0 +1,122 @@ +package unicode_entity_example + +import "core:encoding/xml" +import "core:encoding/entity" +import "core:strings" +import "core:mem" +import "core:fmt" +import "core:time" + +OPTIONS :: xml.Options{ + flags = { + .Ignore_Unsupported, .Intern_Comments, + }, + expected_doctype = "", +} + +doc_print :: proc(doc: ^xml.Document) { + buf: strings.Builder + defer strings.destroy_builder(&buf) + w := strings.to_writer(&buf) + + xml.print(w, doc) + fmt.println(strings.to_string(buf)) +} + +_entities :: proc() { + doc: ^xml.Document + err: xml.Error + + DOC :: #load("../../../../tests/core/assets/XML/unicode.xml") + + parse_duration: time.Duration + + { + time.SCOPED_TICK_DURATION(&parse_duration) + doc, err = xml.parse(DOC, OPTIONS) + } + defer xml.destroy(doc) + + doc_print(doc) + + ms := time.duration_milliseconds(parse_duration) + + speed := (f64(1000.0) / ms) * f64(len(DOC)) / 1_024.0 / 1_024.0 + + fmt.printf("Parse time: %.2f ms (%.2f MiB/s).\n", ms, speed) + fmt.printf("Error: %v\n", err) +} + +_main :: proc() { + using fmt + + doc, err := xml.parse(#load("test.html")) + defer xml.destroy(doc) + doc_print(doc) + + if false { + val := doc.root.children[1].children[2].value + + println() + replaced, ok := entity.decode_xml(val) + defer delete(replaced) + + printf("Before: '%v', Err: %v\n", val, err) + printf("Passthrough: '%v'\nOK: %v\n", replaced, ok) + println() + } + + if false { + val := doc.root.children[1].children[2].value + + println() + replaced, ok := entity.decode_xml(val, { .CDATA_Unbox }) + defer delete(replaced) + + printf("Before: '%v', Err: %v\n", val, err) + printf("CDATA_Unbox: '%v'\nOK: %v\n", replaced, ok) + println() + } + + if true { + val := doc.root.children[1].children[2].value + + println() + replaced, ok := entity.decode_xml(val, { .CDATA_Unbox, .CDATA_Decode }) + defer delete(replaced) + + printf("Before: '%v', Err: %v\n", val, err) + printf("CDATA_Decode: '%v'\nOK: %v\n", replaced, ok) + println() + } + + if true { + val := doc.root.children[1].children[1].value + + println() + replaced, ok := entity.decode_xml(val, { .Comment_Strip }) + defer delete(replaced) + + printf("Before: '%v', Err: %v\n", val, err) + printf("Comment_Strip: '%v'\nOK: %v\n", replaced, ok) + println() + } +} + +main :: proc() { + using fmt + + track: mem.Tracking_Allocator + mem.tracking_allocator_init(&track, context.allocator) + context.allocator = mem.tracking_allocator(&track) + + _main() + //_entities() + + if len(track.allocation_map) > 0 { + println() + for _, v in track.allocation_map { + printf("%v Leaked %v bytes.\n", v.location, v.size) + } + } +} \ No newline at end of file diff --git a/core/encoding/entity/example/test.html b/core/encoding/entity/example/test.html new file mode 100644 index 000000000..60e32bf03 --- /dev/null +++ b/core/encoding/entity/example/test.html @@ -0,0 +1,26 @@ + + + Entity Reference Test + + + +

Entity Reference Test

+
+ Foozle]! © 42&;1234& +
+
+ Foozle]! © 42&;1234& +
+
+ | | | fj ` \ ® ϱ ∳ +
+ + \ No newline at end of file diff --git a/core/encoding/entity/generated.odin b/core/encoding/entity/generated.odin new file mode 100644 index 000000000..9afdcae6d --- /dev/null +++ b/core/encoding/entity/generated.odin @@ -0,0 +1,7493 @@ +package unicode_entity + +/* + ------ GENERATED ------ DO NOT EDIT ------ GENERATED ------ DO NOT EDIT ------ GENERATED ------ +*/ + +/* + This file is generated from "https://www.w3.org/2003/entities/2007xml/unicode.xml". + + UPDATE: + - Ensure the XML file was downloaded using "tests\core\download_assets.py". + - Run "core/unicode/tools/generate_entity_table.odin" + + Odin unicode generated tables: https://github.com/odin-lang/Odin/tree/master/core/encoding/entity + + Copyright © 2021 World Wide Web Consortium, (Massachusetts Institute of Technology, + European Research Consortium for Informatics and Mathematics, Keio University, Beihang). + + All Rights Reserved. + + This work is distributed under the W3C® Software License [1] in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + [1] http://www.w3.org/Consortium/Legal/copyright-software + + See also: LICENSE_table.md +*/ + +// `<` +XML_NAME_TO_RUNE_MIN_LENGTH :: 2 +// `∳` +XML_NAME_TO_RUNE_MAX_LENGTH :: 31 + + +/* + Input: + entity_name - a string, like "copy" that describes a user-encoded Unicode entity as used in XML. + + Output: + "decoded" - The decoded rune if found by name, or -1 otherwise. + "ok" - true if found, false if not. + + IMPORTANT: XML processors (including browsers) treat these names as case-sensitive. So do we. +*/ +named_xml_entity_to_rune :: proc(name: string) -> (decoded: rune, ok: bool) { + /* + Early out if the name is too short or too long. + min as a precaution in case the generated table has a bogus value. + */ + if len(name) < min(1, XML_NAME_TO_RUNE_MIN_LENGTH) || len(name) > XML_NAME_TO_RUNE_MAX_LENGTH { + return -1, false + } + + switch rune(name[0]) { + + case 'A': + switch name { + case "AElig": + // LATIN CAPITAL LETTER AE + return rune(0xc6), true + case "AMP": + // AMPERSAND + return rune(0x26), true + case "Aacgr": + // GREEK CAPITAL LETTER ALPHA WITH TONOS + return rune(0x0386), true + case "Aacute": + // LATIN CAPITAL LETTER A WITH ACUTE + return rune(0xc1), true + case "Abreve": + // LATIN CAPITAL LETTER A WITH BREVE + return rune(0x0102), true + case "Acirc": + // LATIN CAPITAL LETTER A WITH CIRCUMFLEX + return rune(0xc2), true + case "Acy": + // CYRILLIC CAPITAL LETTER A + return rune(0x0410), true + case "Afr": + // MATHEMATICAL FRAKTUR CAPITAL A + return rune(0x01d504), true + case "Agrave": + // LATIN CAPITAL LETTER A WITH GRAVE + return rune(0xc0), true + case "Agr": + // GREEK CAPITAL LETTER ALPHA + return rune(0x0391), true + case "Alpha": + // GREEK CAPITAL LETTER ALPHA + return rune(0x0391), true + case "Amacr": + // LATIN CAPITAL LETTER A WITH MACRON + return rune(0x0100), true + case "And": + // DOUBLE LOGICAL AND + return rune(0x2a53), true + case "Aogon": + // LATIN CAPITAL LETTER A WITH OGONEK + return rune(0x0104), true + case "Aopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL A + return rune(0x01d538), true + case "ApplyFunction": + // FUNCTION APPLICATION + return rune(0x2061), true + case "Aring": + // LATIN CAPITAL LETTER A WITH RING ABOVE + return rune(0xc5), true + case "Ascr": + // MATHEMATICAL SCRIPT CAPITAL A + return rune(0x01d49c), true + case "Assign": + // COLON EQUALS + return rune(0x2254), true + case "Ast": + // TWO ASTERISKS ALIGNED VERTICALLY + return rune(0x2051), true + case "Atilde": + // LATIN CAPITAL LETTER A WITH TILDE + return rune(0xc3), true + case "Auml": + // LATIN CAPITAL LETTER A WITH DIAERESIS + return rune(0xc4), true + } + + case 'B': + switch name { + case "Backslash": + // SET MINUS + return rune(0x2216), true + case "Barint": + // INTEGRAL WITH DOUBLE STROKE + return rune(0x2a0e), true + case "Barv": + // SHORT DOWN TACK WITH OVERBAR + return rune(0x2ae7), true + case "Barwedl": + // LOGICAL AND WITH DOUBLE OVERBAR + return rune(0x2a5e), true + case "Barwed": + // PERSPECTIVE + return rune(0x2306), true + case "Bcy": + // CYRILLIC CAPITAL LETTER BE + return rune(0x0411), true + case "Because": + // BECAUSE + return rune(0x2235), true + case "Bernoullis": + // SCRIPT CAPITAL B + return rune(0x212c), true + case "Beta": + // GREEK CAPITAL LETTER BETA + return rune(0x0392), true + case "Bfr": + // MATHEMATICAL FRAKTUR CAPITAL B + return rune(0x01d505), true + case "Bgr": + // GREEK CAPITAL LETTER BETA + return rune(0x0392), true + case "Bopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL B + return rune(0x01d539), true + case "Breve": + // BREVE + return rune(0x02d8), true + case "Bscr": + // SCRIPT CAPITAL B + return rune(0x212c), true + case "Bumpeq": + // GEOMETRICALLY EQUIVALENT TO + return rune(0x224e), true + case "Bvert": + // BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL + return rune(0x2506), true + } + + case 'C': + switch name { + case "CHcy": + // CYRILLIC CAPITAL LETTER CHE + return rune(0x0427), true + case "COPY": + // COPYRIGHT SIGN + return rune(0xa9), true + case "Cacute": + // LATIN CAPITAL LETTER C WITH ACUTE + return rune(0x0106), true + case "CapitalDifferentialD": + // DOUBLE-STRUCK ITALIC CAPITAL D + return rune(0x2145), true + case "Cap": + // DOUBLE INTERSECTION + return rune(0x22d2), true + case "Cayleys": + // BLACK-LETTER CAPITAL C + return rune(0x212d), true + case "Ccaron": + // LATIN CAPITAL LETTER C WITH CARON + return rune(0x010c), true + case "Ccedil": + // LATIN CAPITAL LETTER C WITH CEDILLA + return rune(0xc7), true + case "Ccirc": + // LATIN CAPITAL LETTER C WITH CIRCUMFLEX + return rune(0x0108), true + case "Cconint": + // VOLUME INTEGRAL + return rune(0x2230), true + case "Cdot": + // LATIN CAPITAL LETTER C WITH DOT ABOVE + return rune(0x010a), true + case "Cedilla": + // CEDILLA + return rune(0xb8), true + case "CenterDot": + // MIDDLE DOT + return rune(0xb7), true + case "Cfr": + // BLACK-LETTER CAPITAL C + return rune(0x212d), true + case "Chi": + // GREEK CAPITAL LETTER CHI + return rune(0x03a7), true + case "CircleDot": + // CIRCLED DOT OPERATOR + return rune(0x2299), true + case "CircleMinus": + // CIRCLED MINUS + return rune(0x2296), true + case "CirclePlus": + // CIRCLED PLUS + return rune(0x2295), true + case "CircleTimes": + // CIRCLED TIMES + return rune(0x2297), true + case "ClockwiseContourIntegral": + // CLOCKWISE CONTOUR INTEGRAL + return rune(0x2232), true + case "CloseCurlyDoubleQuote": + // RIGHT DOUBLE QUOTATION MARK + return rune(0x201d), true + case "CloseCurlyQuote": + // RIGHT SINGLE QUOTATION MARK + return rune(0x2019), true + case "Colon": + // PROPORTION + return rune(0x2237), true + case "Colone": + // DOUBLE COLON EQUAL + return rune(0x2a74), true + case "Congruent": + // IDENTICAL TO + return rune(0x2261), true + case "Conint": + // SURFACE INTEGRAL + return rune(0x222f), true + case "ContourIntegral": + // CONTOUR INTEGRAL + return rune(0x222e), true + case "Copf": + // DOUBLE-STRUCK CAPITAL C + return rune(0x2102), true + case "Coproduct": + // N-ARY COPRODUCT + return rune(0x2210), true + case "CounterClockwiseContourIntegral": + // ANTICLOCKWISE CONTOUR INTEGRAL + return rune(0x2233), true + case "Cross": + // VECTOR OR CROSS PRODUCT + return rune(0x2a2f), true + case "Cscr": + // MATHEMATICAL SCRIPT CAPITAL C + return rune(0x01d49e), true + case "CupCap": + // EQUIVALENT TO + return rune(0x224d), true + case "Cup": + // DOUBLE UNION + return rune(0x22d3), true + } + + case 'D': + switch name { + case "DD": + // DOUBLE-STRUCK ITALIC CAPITAL D + return rune(0x2145), true + case "DDotrahd": + // RIGHTWARDS ARROW WITH DOTTED STEM + return rune(0x2911), true + case "DJcy": + // CYRILLIC CAPITAL LETTER DJE + return rune(0x0402), true + case "DScy": + // CYRILLIC CAPITAL LETTER DZE + return rune(0x0405), true + case "DZcy": + // CYRILLIC CAPITAL LETTER DZHE + return rune(0x040f), true + case "Dagger": + // DOUBLE DAGGER + return rune(0x2021), true + case "Darr": + // DOWNWARDS TWO HEADED ARROW + return rune(0x21a1), true + case "Dashv": + // VERTICAL BAR DOUBLE LEFT TURNSTILE + return rune(0x2ae4), true + case "Dcaron": + // LATIN CAPITAL LETTER D WITH CARON + return rune(0x010e), true + case "Dcy": + // CYRILLIC CAPITAL LETTER DE + return rune(0x0414), true + case "Del": + // NABLA + return rune(0x2207), true + case "Delta": + // GREEK CAPITAL LETTER DELTA + return rune(0x0394), true + case "Dfr": + // MATHEMATICAL FRAKTUR CAPITAL D + return rune(0x01d507), true + case "Dgr": + // GREEK CAPITAL LETTER DELTA + return rune(0x0394), true + case "DiacriticalAcute": + // ACUTE ACCENT + return rune(0xb4), true + case "DiacriticalDot": + // DOT ABOVE + return rune(0x02d9), true + case "DiacriticalDoubleAcute": + // DOUBLE ACUTE ACCENT + return rune(0x02dd), true + case "DiacriticalGrave": + // GRAVE ACCENT + return rune(0x60), true + case "DiacriticalTilde": + // SMALL TILDE + return rune(0x02dc), true + case "Diamond": + // DIAMOND OPERATOR + return rune(0x22c4), true + case "DifferentialD": + // DOUBLE-STRUCK ITALIC SMALL D + return rune(0x2146), true + case "Dopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL D + return rune(0x01d53b), true + case "Dot": + // DIAERESIS + return rune(0xa8), true + case "DotDot": + // COMBINING FOUR DOTS ABOVE + return rune(0x20dc), true + case "DotEqual": + // APPROACHES THE LIMIT + return rune(0x2250), true + case "DoubleContourIntegral": + // SURFACE INTEGRAL + return rune(0x222f), true + case "DoubleDot": + // DIAERESIS + return rune(0xa8), true + case "DoubleDownArrow": + // DOWNWARDS DOUBLE ARROW + return rune(0x21d3), true + case "DoubleLeftArrow": + // LEFTWARDS DOUBLE ARROW + return rune(0x21d0), true + case "DoubleLeftRightArrow": + // LEFT RIGHT DOUBLE ARROW + return rune(0x21d4), true + case "DoubleLeftTee": + // VERTICAL BAR DOUBLE LEFT TURNSTILE + return rune(0x2ae4), true + case "DoubleLongLeftArrow": + // LONG LEFTWARDS DOUBLE ARROW + return rune(0x27f8), true + case "DoubleLongLeftRightArrow": + // LONG LEFT RIGHT DOUBLE ARROW + return rune(0x27fa), true + case "DoubleLongRightArrow": + // LONG RIGHTWARDS DOUBLE ARROW + return rune(0x27f9), true + case "DoubleRightArrow": + // RIGHTWARDS DOUBLE ARROW + return rune(0x21d2), true + case "DoubleRightTee": + // TRUE + return rune(0x22a8), true + case "DoubleUpArrow": + // UPWARDS DOUBLE ARROW + return rune(0x21d1), true + case "DoubleUpDownArrow": + // UP DOWN DOUBLE ARROW + return rune(0x21d5), true + case "DoubleVerticalBar": + // PARALLEL TO + return rune(0x2225), true + case "DownArrowUpArrow": + // DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW + return rune(0x21f5), true + case "DownArrow": + // DOWNWARDS ARROW + return rune(0x2193), true + case "DownArrowBar": + // DOWNWARDS ARROW TO BAR + return rune(0x2913), true + case "DownBreve": + // COMBINING INVERTED BREVE + return rune(0x0311), true + case "DownLeftRightVector": + // LEFT BARB DOWN RIGHT BARB DOWN HARPOON + return rune(0x2950), true + case "DownLeftTeeVector": + // LEFTWARDS HARPOON WITH BARB DOWN FROM BAR + return rune(0x295e), true + case "DownLeftVector": + // LEFTWARDS HARPOON WITH BARB DOWNWARDS + return rune(0x21bd), true + case "DownLeftVectorBar": + // LEFTWARDS HARPOON WITH BARB DOWN TO BAR + return rune(0x2956), true + case "DownRightTeeVector": + // RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR + return rune(0x295f), true + case "DownRightVector": + // RIGHTWARDS HARPOON WITH BARB DOWNWARDS + return rune(0x21c1), true + case "DownRightVectorBar": + // RIGHTWARDS HARPOON WITH BARB DOWN TO BAR + return rune(0x2957), true + case "DownTeeArrow": + // DOWNWARDS ARROW FROM BAR + return rune(0x21a7), true + case "DownTee": + // DOWN TACK + return rune(0x22a4), true + case "Downarrow": + // DOWNWARDS DOUBLE ARROW + return rune(0x21d3), true + case "Dscr": + // MATHEMATICAL SCRIPT CAPITAL D + return rune(0x01d49f), true + case "Dstrok": + // LATIN CAPITAL LETTER D WITH STROKE + return rune(0x0110), true + } + + case 'E': + switch name { + case "EEacgr": + // GREEK CAPITAL LETTER ETA WITH TONOS + return rune(0x0389), true + case "EEgr": + // GREEK CAPITAL LETTER ETA + return rune(0x0397), true + case "ENG": + // LATIN CAPITAL LETTER ENG + return rune(0x014a), true + case "ETH": + // LATIN CAPITAL LETTER ETH + return rune(0xd0), true + case "Eacgr": + // GREEK CAPITAL LETTER EPSILON WITH TONOS + return rune(0x0388), true + case "Eacute": + // LATIN CAPITAL LETTER E WITH ACUTE + return rune(0xc9), true + case "Ecaron": + // LATIN CAPITAL LETTER E WITH CARON + return rune(0x011a), true + case "Ecirc": + // LATIN CAPITAL LETTER E WITH CIRCUMFLEX + return rune(0xca), true + case "Ecy": + // CYRILLIC CAPITAL LETTER E + return rune(0x042d), true + case "Edot": + // LATIN CAPITAL LETTER E WITH DOT ABOVE + return rune(0x0116), true + case "Efr": + // MATHEMATICAL FRAKTUR CAPITAL E + return rune(0x01d508), true + case "Egrave": + // LATIN CAPITAL LETTER E WITH GRAVE + return rune(0xc8), true + case "Egr": + // GREEK CAPITAL LETTER EPSILON + return rune(0x0395), true + case "Element": + // ELEMENT OF + return rune(0x2208), true + case "Emacr": + // LATIN CAPITAL LETTER E WITH MACRON + return rune(0x0112), true + case "EmptySmallSquare": + // WHITE MEDIUM SQUARE + return rune(0x25fb), true + case "EmptyVerySmallSquare": + // WHITE SMALL SQUARE + return rune(0x25ab), true + case "Eogon": + // LATIN CAPITAL LETTER E WITH OGONEK + return rune(0x0118), true + case "Eopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL E + return rune(0x01d53c), true + case "Epsilon": + // GREEK CAPITAL LETTER EPSILON + return rune(0x0395), true + case "EqualTilde": + // MINUS TILDE + return rune(0x2242), true + case "Equal": + // TWO CONSECUTIVE EQUALS SIGNS + return rune(0x2a75), true + case "Equilibrium": + // RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON + return rune(0x21cc), true + case "Escr": + // SCRIPT CAPITAL E + return rune(0x2130), true + case "Esim": + // EQUALS SIGN ABOVE TILDE OPERATOR + return rune(0x2a73), true + case "Eta": + // GREEK CAPITAL LETTER ETA + return rune(0x0397), true + case "Euml": + // LATIN CAPITAL LETTER E WITH DIAERESIS + return rune(0xcb), true + case "Exists": + // THERE EXISTS + return rune(0x2203), true + case "ExponentialE": + // DOUBLE-STRUCK ITALIC SMALL E + return rune(0x2147), true + } + + case 'F': + switch name { + case "Fcy": + // CYRILLIC CAPITAL LETTER EF + return rune(0x0424), true + case "Ffr": + // MATHEMATICAL FRAKTUR CAPITAL F + return rune(0x01d509), true + case "FilledSmallSquare": + // BLACK MEDIUM SQUARE + return rune(0x25fc), true + case "FilledVerySmallSquare": + // BLACK SMALL SQUARE + return rune(0x25aa), true + case "Fopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL F + return rune(0x01d53d), true + case "ForAll": + // FOR ALL + return rune(0x2200), true + case "Fouriertrf": + // SCRIPT CAPITAL F + return rune(0x2131), true + case "Fscr": + // SCRIPT CAPITAL F + return rune(0x2131), true + } + + case 'G': + switch name { + case "GJcy": + // CYRILLIC CAPITAL LETTER GJE + return rune(0x0403), true + case "GT": + // GREATER-THAN SIGN + return rune(0x3e), true + case "Game": + // TURNED SANS-SERIF CAPITAL G + return rune(0x2141), true + case "Gamma": + // GREEK CAPITAL LETTER GAMMA + return rune(0x0393), true + case "Gammad": + // GREEK LETTER DIGAMMA + return rune(0x03dc), true + case "Gbreve": + // LATIN CAPITAL LETTER G WITH BREVE + return rune(0x011e), true + case "Gcedil": + // LATIN CAPITAL LETTER G WITH CEDILLA + return rune(0x0122), true + case "Gcirc": + // LATIN CAPITAL LETTER G WITH CIRCUMFLEX + return rune(0x011c), true + case "Gcy": + // CYRILLIC CAPITAL LETTER GHE + return rune(0x0413), true + case "Gdot": + // LATIN CAPITAL LETTER G WITH DOT ABOVE + return rune(0x0120), true + case "Gfr": + // MATHEMATICAL FRAKTUR CAPITAL G + return rune(0x01d50a), true + case "Ggr": + // GREEK CAPITAL LETTER GAMMA + return rune(0x0393), true + case "Gg": + // VERY MUCH GREATER-THAN + return rune(0x22d9), true + case "Gopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL G + return rune(0x01d53e), true + case "GreaterEqual": + // GREATER-THAN OR EQUAL TO + return rune(0x2265), true + case "GreaterEqualLess": + // GREATER-THAN EQUAL TO OR LESS-THAN + return rune(0x22db), true + case "GreaterFullEqual": + // GREATER-THAN OVER EQUAL TO + return rune(0x2267), true + case "GreaterGreater": + // DOUBLE NESTED GREATER-THAN + return rune(0x2aa2), true + case "GreaterLess": + // GREATER-THAN OR LESS-THAN + return rune(0x2277), true + case "GreaterSlantEqual": + // GREATER-THAN OR SLANTED EQUAL TO + return rune(0x2a7e), true + case "GreaterTilde": + // GREATER-THAN OR EQUIVALENT TO + return rune(0x2273), true + case "Gscr": + // MATHEMATICAL SCRIPT CAPITAL G + return rune(0x01d4a2), true + case "Gt": + // MUCH GREATER-THAN + return rune(0x226b), true + } + + case 'H': + switch name { + case "HARDcy": + // CYRILLIC CAPITAL LETTER HARD SIGN + return rune(0x042a), true + case "Hacek": + // CARON + return rune(0x02c7), true + case "Hat": + // CIRCUMFLEX ACCENT + return rune(0x5e), true + case "Hcirc": + // LATIN CAPITAL LETTER H WITH CIRCUMFLEX + return rune(0x0124), true + case "Hfr": + // BLACK-LETTER CAPITAL H + return rune(0x210c), true + case "HilbertSpace": + // SCRIPT CAPITAL H + return rune(0x210b), true + case "Hopf": + // DOUBLE-STRUCK CAPITAL H + return rune(0x210d), true + case "HorizontalLine": + // BOX DRAWINGS LIGHT HORIZONTAL + return rune(0x2500), true + case "Hscr": + // SCRIPT CAPITAL H + return rune(0x210b), true + case "Hstrok": + // LATIN CAPITAL LETTER H WITH STROKE + return rune(0x0126), true + case "HumpDownHump": + // GEOMETRICALLY EQUIVALENT TO + return rune(0x224e), true + case "HumpEqual": + // DIFFERENCE BETWEEN + return rune(0x224f), true + } + + case 'I': + switch name { + case "IEcy": + // CYRILLIC CAPITAL LETTER IE + return rune(0x0415), true + case "IJlig": + // LATIN CAPITAL LIGATURE IJ + return rune(0x0132), true + case "IOcy": + // CYRILLIC CAPITAL LETTER IO + return rune(0x0401), true + case "Iacgr": + // GREEK CAPITAL LETTER IOTA WITH TONOS + return rune(0x038a), true + case "Iacute": + // LATIN CAPITAL LETTER I WITH ACUTE + return rune(0xcd), true + case "Icirc": + // LATIN CAPITAL LETTER I WITH CIRCUMFLEX + return rune(0xce), true + case "Icy": + // CYRILLIC CAPITAL LETTER I + return rune(0x0418), true + case "Idigr": + // GREEK CAPITAL LETTER IOTA WITH DIALYTIKA + return rune(0x03aa), true + case "Idot": + // LATIN CAPITAL LETTER I WITH DOT ABOVE + return rune(0x0130), true + case "Ifr": + // BLACK-LETTER CAPITAL I + return rune(0x2111), true + case "Igrave": + // LATIN CAPITAL LETTER I WITH GRAVE + return rune(0xcc), true + case "Igr": + // GREEK CAPITAL LETTER IOTA + return rune(0x0399), true + case "Imacr": + // LATIN CAPITAL LETTER I WITH MACRON + return rune(0x012a), true + case "ImaginaryI": + // DOUBLE-STRUCK ITALIC SMALL I + return rune(0x2148), true + case "Implies": + // RIGHTWARDS DOUBLE ARROW + return rune(0x21d2), true + case "Im": + // BLACK-LETTER CAPITAL I + return rune(0x2111), true + case "Integral": + // INTEGRAL + return rune(0x222b), true + case "Int": + // DOUBLE INTEGRAL + return rune(0x222c), true + case "Intersection": + // N-ARY INTERSECTION + return rune(0x22c2), true + case "InvisibleComma": + // INVISIBLE SEPARATOR + return rune(0x2063), true + case "InvisibleTimes": + // INVISIBLE TIMES + return rune(0x2062), true + case "Iogon": + // LATIN CAPITAL LETTER I WITH OGONEK + return rune(0x012e), true + case "Iopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL I + return rune(0x01d540), true + case "Iota": + // GREEK CAPITAL LETTER IOTA + return rune(0x0399), true + case "Iscr": + // SCRIPT CAPITAL I + return rune(0x2110), true + case "Itilde": + // LATIN CAPITAL LETTER I WITH TILDE + return rune(0x0128), true + case "Iukcy": + // CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I + return rune(0x0406), true + case "Iuml": + // LATIN CAPITAL LETTER I WITH DIAERESIS + return rune(0xcf), true + } + + case 'J': + switch name { + case "Jcirc": + // LATIN CAPITAL LETTER J WITH CIRCUMFLEX + return rune(0x0134), true + case "Jcy": + // CYRILLIC CAPITAL LETTER SHORT I + return rune(0x0419), true + case "Jfr": + // MATHEMATICAL FRAKTUR CAPITAL J + return rune(0x01d50d), true + case "Jopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL J + return rune(0x01d541), true + case "Jscr": + // MATHEMATICAL SCRIPT CAPITAL J + return rune(0x01d4a5), true + case "Jsercy": + // CYRILLIC CAPITAL LETTER JE + return rune(0x0408), true + case "Jukcy": + // CYRILLIC CAPITAL LETTER UKRAINIAN IE + return rune(0x0404), true + } + + case 'K': + switch name { + case "KHcy": + // CYRILLIC CAPITAL LETTER HA + return rune(0x0425), true + case "KHgr": + // GREEK CAPITAL LETTER CHI + return rune(0x03a7), true + case "KJcy": + // CYRILLIC CAPITAL LETTER KJE + return rune(0x040c), true + case "Kappa": + // GREEK CAPITAL LETTER KAPPA + return rune(0x039a), true + case "Kcedil": + // LATIN CAPITAL LETTER K WITH CEDILLA + return rune(0x0136), true + case "Kcy": + // CYRILLIC CAPITAL LETTER KA + return rune(0x041a), true + case "Kfr": + // MATHEMATICAL FRAKTUR CAPITAL K + return rune(0x01d50e), true + case "Kgr": + // GREEK CAPITAL LETTER KAPPA + return rune(0x039a), true + case "Kopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL K + return rune(0x01d542), true + case "Kscr": + // MATHEMATICAL SCRIPT CAPITAL K + return rune(0x01d4a6), true + } + + case 'L': + switch name { + case "LJcy": + // CYRILLIC CAPITAL LETTER LJE + return rune(0x0409), true + case "LT": + // LESS-THAN SIGN + return rune(0x3c), true + case "Lacute": + // LATIN CAPITAL LETTER L WITH ACUTE + return rune(0x0139), true + case "Lambda": + // GREEK CAPITAL LETTER LAMDA + return rune(0x039b), true + case "Lang": + // MATHEMATICAL LEFT DOUBLE ANGLE BRACKET + return rune(0x27ea), true + case "Laplacetrf": + // SCRIPT CAPITAL L + return rune(0x2112), true + case "Larr": + // LEFTWARDS TWO HEADED ARROW + return rune(0x219e), true + case "Lcaron": + // LATIN CAPITAL LETTER L WITH CARON + return rune(0x013d), true + case "Lcedil": + // LATIN CAPITAL LETTER L WITH CEDILLA + return rune(0x013b), true + case "Lcy": + // CYRILLIC CAPITAL LETTER EL + return rune(0x041b), true + case "LeftAngleBracket": + // MATHEMATICAL LEFT ANGLE BRACKET + return rune(0x27e8), true + case "LeftArrowBar": + // LEFTWARDS ARROW TO BAR + return rune(0x21e4), true + case "LeftArrowRightArrow": + // LEFTWARDS ARROW OVER RIGHTWARDS ARROW + return rune(0x21c6), true + case "LeftArrow": + // LEFTWARDS ARROW + return rune(0x2190), true + case "LeftCeiling": + // LEFT CEILING + return rune(0x2308), true + case "LeftDoubleBracket": + // MATHEMATICAL LEFT WHITE SQUARE BRACKET + return rune(0x27e6), true + case "LeftDownTeeVector": + // DOWNWARDS HARPOON WITH BARB LEFT FROM BAR + return rune(0x2961), true + case "LeftDownVector": + // DOWNWARDS HARPOON WITH BARB LEFTWARDS + return rune(0x21c3), true + case "LeftDownVectorBar": + // DOWNWARDS HARPOON WITH BARB LEFT TO BAR + return rune(0x2959), true + case "LeftFloor": + // LEFT FLOOR + return rune(0x230a), true + case "LeftRightArrow": + // LEFT RIGHT ARROW + return rune(0x2194), true + case "LeftRightVector": + // LEFT BARB UP RIGHT BARB UP HARPOON + return rune(0x294e), true + case "LeftTeeArrow": + // LEFTWARDS ARROW FROM BAR + return rune(0x21a4), true + case "LeftTeeVector": + // LEFTWARDS HARPOON WITH BARB UP FROM BAR + return rune(0x295a), true + case "LeftTee": + // LEFT TACK + return rune(0x22a3), true + case "LeftTriangleBar": + // LEFT TRIANGLE BESIDE VERTICAL BAR + return rune(0x29cf), true + case "LeftTriangle": + // NORMAL SUBGROUP OF + return rune(0x22b2), true + case "LeftTriangleEqual": + // NORMAL SUBGROUP OF OR EQUAL TO + return rune(0x22b4), true + case "LeftUpDownVector": + // UP BARB LEFT DOWN BARB LEFT HARPOON + return rune(0x2951), true + case "LeftUpTeeVector": + // UPWARDS HARPOON WITH BARB LEFT FROM BAR + return rune(0x2960), true + case "LeftUpVector": + // UPWARDS HARPOON WITH BARB LEFTWARDS + return rune(0x21bf), true + case "LeftUpVectorBar": + // UPWARDS HARPOON WITH BARB LEFT TO BAR + return rune(0x2958), true + case "LeftVector": + // LEFTWARDS HARPOON WITH BARB UPWARDS + return rune(0x21bc), true + case "LeftVectorBar": + // LEFTWARDS HARPOON WITH BARB UP TO BAR + return rune(0x2952), true + case "Leftarrow": + // LEFTWARDS DOUBLE ARROW + return rune(0x21d0), true + case "Leftrightarrow": + // LEFT RIGHT DOUBLE ARROW + return rune(0x21d4), true + case "LessEqualGreater": + // LESS-THAN EQUAL TO OR GREATER-THAN + return rune(0x22da), true + case "LessFullEqual": + // LESS-THAN OVER EQUAL TO + return rune(0x2266), true + case "LessGreater": + // LESS-THAN OR GREATER-THAN + return rune(0x2276), true + case "LessLess": + // DOUBLE NESTED LESS-THAN + return rune(0x2aa1), true + case "LessSlantEqual": + // LESS-THAN OR SLANTED EQUAL TO + return rune(0x2a7d), true + case "LessTilde": + // LESS-THAN OR EQUIVALENT TO + return rune(0x2272), true + case "Lfr": + // MATHEMATICAL FRAKTUR CAPITAL L + return rune(0x01d50f), true + case "Lgr": + // GREEK CAPITAL LETTER LAMDA + return rune(0x039b), true + case "Lleftarrow": + // LEFTWARDS TRIPLE ARROW + return rune(0x21da), true + case "Ll": + // VERY MUCH LESS-THAN + return rune(0x22d8), true + case "Lmidot": + // LATIN CAPITAL LETTER L WITH MIDDLE DOT + return rune(0x013f), true + case "LongLeftArrow": + // LONG LEFTWARDS ARROW + return rune(0x27f5), true + case "LongLeftRightArrow": + // LONG LEFT RIGHT ARROW + return rune(0x27f7), true + case "LongRightArrow": + // LONG RIGHTWARDS ARROW + return rune(0x27f6), true + case "Longleftarrow": + // LONG LEFTWARDS DOUBLE ARROW + return rune(0x27f8), true + case "Longleftrightarrow": + // LONG LEFT RIGHT DOUBLE ARROW + return rune(0x27fa), true + case "Longrightarrow": + // LONG RIGHTWARDS DOUBLE ARROW + return rune(0x27f9), true + case "Lopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL L + return rune(0x01d543), true + case "LowerLeftArrow": + // SOUTH WEST ARROW + return rune(0x2199), true + case "LowerRightArrow": + // SOUTH EAST ARROW + return rune(0x2198), true + case "Lscr": + // SCRIPT CAPITAL L + return rune(0x2112), true + case "Lsh": + // UPWARDS ARROW WITH TIP LEFTWARDS + return rune(0x21b0), true + case "Lstrok": + // LATIN CAPITAL LETTER L WITH STROKE + return rune(0x0141), true + case "Ltbar": + // DOUBLE NESTED LESS-THAN WITH UNDERBAR + return rune(0x2aa3), true + case "Lt": + // MUCH LESS-THAN + return rune(0x226a), true + } + + case 'M': + switch name { + case "Mapfrom": + // LEFTWARDS DOUBLE ARROW FROM BAR + return rune(0x2906), true + case "Mapto": + // RIGHTWARDS DOUBLE ARROW FROM BAR + return rune(0x2907), true + case "Map": + // RIGHTWARDS TWO-HEADED ARROW FROM BAR + return rune(0x2905), true + case "Mcy": + // CYRILLIC CAPITAL LETTER EM + return rune(0x041c), true + case "MediumSpace": + // MEDIUM MATHEMATICAL SPACE + return rune(0x205f), true + case "Mellintrf": + // SCRIPT CAPITAL M + return rune(0x2133), true + case "Mfr": + // MATHEMATICAL FRAKTUR CAPITAL M + return rune(0x01d510), true + case "Mgr": + // GREEK CAPITAL LETTER MU + return rune(0x039c), true + case "MinusPlus": + // MINUS-OR-PLUS SIGN + return rune(0x2213), true + case "Mopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL M + return rune(0x01d544), true + case "Mscr": + // SCRIPT CAPITAL M + return rune(0x2133), true + case "Mu": + // GREEK CAPITAL LETTER MU + return rune(0x039c), true + } + + case 'N': + switch name { + case "NJcy": + // CYRILLIC CAPITAL LETTER NJE + return rune(0x040a), true + case "Nacute": + // LATIN CAPITAL LETTER N WITH ACUTE + return rune(0x0143), true + case "Ncaron": + // LATIN CAPITAL LETTER N WITH CARON + return rune(0x0147), true + case "Ncedil": + // LATIN CAPITAL LETTER N WITH CEDILLA + return rune(0x0145), true + case "Ncy": + // CYRILLIC CAPITAL LETTER EN + return rune(0x041d), true + case "NegativeMediumSpace": + // ZERO WIDTH SPACE + return rune(0x200b), true + case "NegativeThickSpace": + // ZERO WIDTH SPACE + return rune(0x200b), true + case "NegativeThinSpace": + // ZERO WIDTH SPACE + return rune(0x200b), true + case "NegativeVeryThinSpace": + // ZERO WIDTH SPACE + return rune(0x200b), true + case "NestedGreaterGreater": + // MUCH GREATER-THAN + return rune(0x226b), true + case "NestedLessLess": + // MUCH LESS-THAN + return rune(0x226a), true + case "NewLine": + // LINE FEED (LF) + return rune(0x0a), true + case "Nfr": + // MATHEMATICAL FRAKTUR CAPITAL N + return rune(0x01d511), true + case "Ngr": + // GREEK CAPITAL LETTER NU + return rune(0x039d), true + case "NoBreak": + // WORD JOINER + return rune(0x2060), true + case "NonBreakingSpace": + // NO-BREAK SPACE + return rune(0xa0), true + case "Nopf": + // DOUBLE-STRUCK CAPITAL N + return rune(0x2115), true + case "NotDoubleVerticalBar": + // NOT PARALLEL TO + return rune(0x2226), true + case "NotElement": + // NOT AN ELEMENT OF + return rune(0x2209), true + case "NotEqualTilde": + // MINUS TILDE with slash + return rune(0x2242), true + case "NotEqual": + // NOT EQUAL TO + return rune(0x2260), true + case "NotExists": + // THERE DOES NOT EXIST + return rune(0x2204), true + case "NotHumpDownHump": + // GEOMETRICALLY EQUIVALENT TO with slash + return rune(0x224e), true + case "NotHumpEqual": + // DIFFERENCE BETWEEN with slash + return rune(0x224f), true + case "NotLessGreater": + // NEITHER LESS-THAN NOR GREATER-THAN + return rune(0x2278), true + case "NotReverseElement": + // DOES NOT CONTAIN AS MEMBER + return rune(0x220c), true + case "NotTilde": + // NOT TILDE + return rune(0x2241), true + case "NotTildeEqual": + // NOT ASYMPTOTICALLY EQUAL TO + return rune(0x2244), true + case "NotTildeFullEqual": + // NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO + return rune(0x2247), true + case "NotTildeTilde": + // NOT ALMOST EQUAL TO + return rune(0x2249), true + case "NotVerticalBar": + // DOES NOT DIVIDE + return rune(0x2224), true + case "Not": + // DOUBLE STROKE NOT SIGN + return rune(0x2aec), true + case "NotCongruent": + // NOT IDENTICAL TO + return rune(0x2262), true + case "NotCupCap": + // NOT EQUIVALENT TO + return rune(0x226d), true + case "NotGreaterFullEqual": + // GREATER-THAN OVER EQUAL TO with slash + return rune(0x2267), true + case "NotGreaterGreater": + // MUCH GREATER THAN with slash + return rune(0x226b), true + case "NotGreaterSlantEqual": + // GREATER-THAN OR SLANTED EQUAL TO with slash + return rune(0x2a7e), true + case "NotGreater": + // NOT GREATER-THAN + return rune(0x226f), true + case "NotGreaterEqual": + // NEITHER GREATER-THAN NOR EQUAL TO + return rune(0x2271), true + case "NotGreaterLess": + // NEITHER GREATER-THAN NOR LESS-THAN + return rune(0x2279), true + case "NotGreaterTilde": + // NEITHER GREATER-THAN NOR EQUIVALENT TO + return rune(0x2275), true + case "NotLeftTriangleBar": + // LEFT TRIANGLE BESIDE VERTICAL BAR with slash + return rune(0x29cf), true + case "NotLeftTriangle": + // NOT NORMAL SUBGROUP OF + return rune(0x22ea), true + case "NotLeftTriangleEqual": + // NOT NORMAL SUBGROUP OF OR EQUAL TO + return rune(0x22ec), true + case "NotLessLess": + // MUCH LESS THAN with slash + return rune(0x226a), true + case "NotLessSlantEqual": + // LESS-THAN OR SLANTED EQUAL TO with slash + return rune(0x2a7d), true + case "NotLess": + // NOT LESS-THAN + return rune(0x226e), true + case "NotLessEqual": + // NEITHER LESS-THAN NOR EQUAL TO + return rune(0x2270), true + case "NotLessTilde": + // NEITHER LESS-THAN NOR EQUIVALENT TO + return rune(0x2274), true + case "NotNestedGreaterGreater": + // DOUBLE NESTED GREATER-THAN with slash + return rune(0x2aa2), true + case "NotNestedLessLess": + // DOUBLE NESTED LESS-THAN with slash + return rune(0x2aa1), true + case "NotPrecedesEqual": + // PRECEDES ABOVE SINGLE-LINE EQUALS SIGN with slash + return rune(0x2aaf), true + case "NotPrecedes": + // DOES NOT PRECEDE + return rune(0x2280), true + case "NotPrecedesSlantEqual": + // DOES NOT PRECEDE OR EQUAL + return rune(0x22e0), true + case "NotRightTriangleBar": + // VERTICAL BAR BESIDE RIGHT TRIANGLE with slash + return rune(0x29d0), true + case "NotRightTriangle": + // DOES NOT CONTAIN AS NORMAL SUBGROUP + return rune(0x22eb), true + case "NotRightTriangleEqual": + // DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL + return rune(0x22ed), true + case "NotSquareSubset": + // SQUARE IMAGE OF with slash + return rune(0x228f), true + case "NotSquareSubsetEqual": + // NOT SQUARE IMAGE OF OR EQUAL TO + return rune(0x22e2), true + case "NotSquareSuperset": + // SQUARE ORIGINAL OF with slash + return rune(0x2290), true + case "NotSquareSupersetEqual": + // NOT SQUARE ORIGINAL OF OR EQUAL TO + return rune(0x22e3), true + case "NotSubset": + // SUBSET OF with vertical line + return rune(0x2282), true + case "NotSubsetEqual": + // NEITHER A SUBSET OF NOR EQUAL TO + return rune(0x2288), true + case "NotSucceedsEqual": + // SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN with slash + return rune(0x2ab0), true + case "NotSucceedsTilde": + // SUCCEEDS OR EQUIVALENT TO with slash + return rune(0x227f), true + case "NotSucceeds": + // DOES NOT SUCCEED + return rune(0x2281), true + case "NotSucceedsSlantEqual": + // DOES NOT SUCCEED OR EQUAL + return rune(0x22e1), true + case "NotSuperset": + // SUPERSET OF with vertical line + return rune(0x2283), true + case "NotSupersetEqual": + // NEITHER A SUPERSET OF NOR EQUAL TO + return rune(0x2289), true + case "Nscr": + // MATHEMATICAL SCRIPT CAPITAL N + return rune(0x01d4a9), true + case "Ntilde": + // LATIN CAPITAL LETTER N WITH TILDE + return rune(0xd1), true + case "Nu": + // GREEK CAPITAL LETTER NU + return rune(0x039d), true + } + + case 'O': + switch name { + case "OElig": + // LATIN CAPITAL LIGATURE OE + return rune(0x0152), true + case "OHacgr": + // GREEK CAPITAL LETTER OMEGA WITH TONOS + return rune(0x038f), true + case "OHgr": + // GREEK CAPITAL LETTER OMEGA + return rune(0x03a9), true + case "Oacgr": + // GREEK CAPITAL LETTER OMICRON WITH TONOS + return rune(0x038c), true + case "Oacute": + // LATIN CAPITAL LETTER O WITH ACUTE + return rune(0xd3), true + case "Ocirc": + // LATIN CAPITAL LETTER O WITH CIRCUMFLEX + return rune(0xd4), true + case "Ocy": + // CYRILLIC CAPITAL LETTER O + return rune(0x041e), true + case "Odblac": + // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE + return rune(0x0150), true + case "Ofr": + // MATHEMATICAL FRAKTUR CAPITAL O + return rune(0x01d512), true + case "Ograve": + // LATIN CAPITAL LETTER O WITH GRAVE + return rune(0xd2), true + case "Ogr": + // GREEK CAPITAL LETTER OMICRON + return rune(0x039f), true + case "Omacr": + // LATIN CAPITAL LETTER O WITH MACRON + return rune(0x014c), true + case "Omega": + // GREEK CAPITAL LETTER OMEGA + return rune(0x03a9), true + case "Omicron": + // GREEK CAPITAL LETTER OMICRON + return rune(0x039f), true + case "Oopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL O + return rune(0x01d546), true + case "OpenCurlyDoubleQuote": + // LEFT DOUBLE QUOTATION MARK + return rune(0x201c), true + case "OpenCurlyQuote": + // LEFT SINGLE QUOTATION MARK + return rune(0x2018), true + case "Or": + // DOUBLE LOGICAL OR + return rune(0x2a54), true + case "Oscr": + // MATHEMATICAL SCRIPT CAPITAL O + return rune(0x01d4aa), true + case "Oslash": + // LATIN CAPITAL LETTER O WITH STROKE + return rune(0xd8), true + case "Otilde": + // LATIN CAPITAL LETTER O WITH TILDE + return rune(0xd5), true + case "Otimes": + // MULTIPLICATION SIGN IN DOUBLE CIRCLE + return rune(0x2a37), true + case "Ouml": + // LATIN CAPITAL LETTER O WITH DIAERESIS + return rune(0xd6), true + case "OverBar": + // OVERLINE + return rune(0x203e), true + case "OverBrace": + // TOP CURLY BRACKET + return rune(0x23de), true + case "OverBracket": + // TOP SQUARE BRACKET + return rune(0x23b4), true + case "OverParenthesis": + // TOP PARENTHESIS + return rune(0x23dc), true + } + + case 'P': + switch name { + case "PHgr": + // GREEK CAPITAL LETTER PHI + return rune(0x03a6), true + case "PSgr": + // GREEK CAPITAL LETTER PSI + return rune(0x03a8), true + case "PartialD": + // PARTIAL DIFFERENTIAL + return rune(0x2202), true + case "Pcy": + // CYRILLIC CAPITAL LETTER PE + return rune(0x041f), true + case "Pfr": + // MATHEMATICAL FRAKTUR CAPITAL P + return rune(0x01d513), true + case "Pgr": + // GREEK CAPITAL LETTER PI + return rune(0x03a0), true + case "Phi": + // GREEK CAPITAL LETTER PHI + return rune(0x03a6), true + case "Pi": + // GREEK CAPITAL LETTER PI + return rune(0x03a0), true + case "PlusMinus": + // PLUS-MINUS SIGN + return rune(0xb1), true + case "Poincareplane": + // BLACK-LETTER CAPITAL H + return rune(0x210c), true + case "Popf": + // DOUBLE-STRUCK CAPITAL P + return rune(0x2119), true + case "Product": + // N-ARY PRODUCT + return rune(0x220f), true + case "Proportional": + // PROPORTIONAL TO + return rune(0x221d), true + case "Proportion": + // PROPORTION + return rune(0x2237), true + case "Pr": + // DOUBLE PRECEDES + return rune(0x2abb), true + case "PrecedesEqual": + // PRECEDES ABOVE SINGLE-LINE EQUALS SIGN + return rune(0x2aaf), true + case "Precedes": + // PRECEDES + return rune(0x227a), true + case "PrecedesSlantEqual": + // PRECEDES OR EQUAL TO + return rune(0x227c), true + case "PrecedesTilde": + // PRECEDES OR EQUIVALENT TO + return rune(0x227e), true + case "Prime": + // DOUBLE PRIME + return rune(0x2033), true + case "Pscr": + // MATHEMATICAL SCRIPT CAPITAL P + return rune(0x01d4ab), true + case "Psi": + // GREEK CAPITAL LETTER PSI + return rune(0x03a8), true + } + + case 'Q': + switch name { + case "QUOT": + // QUOTATION MARK + return rune(0x22), true + case "Qfr": + // MATHEMATICAL FRAKTUR CAPITAL Q + return rune(0x01d514), true + case "Qopf": + // DOUBLE-STRUCK CAPITAL Q + return rune(0x211a), true + case "Qscr": + // MATHEMATICAL SCRIPT CAPITAL Q + return rune(0x01d4ac), true + } + + case 'R': + switch name { + case "RBarr": + // RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW + return rune(0x2910), true + case "REG": + // REGISTERED SIGN + return rune(0xae), true + case "Racute": + // LATIN CAPITAL LETTER R WITH ACUTE + return rune(0x0154), true + case "Rang": + // MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET + return rune(0x27eb), true + case "Rarr": + // RIGHTWARDS TWO HEADED ARROW + return rune(0x21a0), true + case "Rarrtl": + // RIGHTWARDS TWO-HEADED ARROW WITH TAIL + return rune(0x2916), true + case "Rcaron": + // LATIN CAPITAL LETTER R WITH CARON + return rune(0x0158), true + case "Rcedil": + // LATIN CAPITAL LETTER R WITH CEDILLA + return rune(0x0156), true + case "Rcy": + // CYRILLIC CAPITAL LETTER ER + return rune(0x0420), true + case "ReverseElement": + // CONTAINS AS MEMBER + return rune(0x220b), true + case "ReverseEquilibrium": + // LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON + return rune(0x21cb), true + case "Re": + // BLACK-LETTER CAPITAL R + return rune(0x211c), true + case "ReverseUpEquilibrium": + // DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT + return rune(0x296f), true + case "Rfr": + // BLACK-LETTER CAPITAL R + return rune(0x211c), true + case "Rgr": + // GREEK CAPITAL LETTER RHO + return rune(0x03a1), true + case "Rho": + // GREEK CAPITAL LETTER RHO + return rune(0x03a1), true + case "RightAngleBracket": + // MATHEMATICAL RIGHT ANGLE BRACKET + return rune(0x27e9), true + case "RightArrowBar": + // RIGHTWARDS ARROW TO BAR + return rune(0x21e5), true + case "RightArrow": + // RIGHTWARDS ARROW + return rune(0x2192), true + case "RightArrowLeftArrow": + // RIGHTWARDS ARROW OVER LEFTWARDS ARROW + return rune(0x21c4), true + case "RightCeiling": + // RIGHT CEILING + return rune(0x2309), true + case "RightDoubleBracket": + // MATHEMATICAL RIGHT WHITE SQUARE BRACKET + return rune(0x27e7), true + case "RightDownTeeVector": + // DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR + return rune(0x295d), true + case "RightDownVector": + // DOWNWARDS HARPOON WITH BARB RIGHTWARDS + return rune(0x21c2), true + case "RightDownVectorBar": + // DOWNWARDS HARPOON WITH BARB RIGHT TO BAR + return rune(0x2955), true + case "RightFloor": + // RIGHT FLOOR + return rune(0x230b), true + case "RightTeeArrow": + // RIGHTWARDS ARROW FROM BAR + return rune(0x21a6), true + case "RightTeeVector": + // RIGHTWARDS HARPOON WITH BARB UP FROM BAR + return rune(0x295b), true + case "RightTee": + // RIGHT TACK + return rune(0x22a2), true + case "RightTriangleBar": + // VERTICAL BAR BESIDE RIGHT TRIANGLE + return rune(0x29d0), true + case "RightTriangle": + // CONTAINS AS NORMAL SUBGROUP + return rune(0x22b3), true + case "RightTriangleEqual": + // CONTAINS AS NORMAL SUBGROUP OR EQUAL TO + return rune(0x22b5), true + case "RightUpDownVector": + // UP BARB RIGHT DOWN BARB RIGHT HARPOON + return rune(0x294f), true + case "RightUpTeeVector": + // UPWARDS HARPOON WITH BARB RIGHT FROM BAR + return rune(0x295c), true + case "RightUpVector": + // UPWARDS HARPOON WITH BARB RIGHTWARDS + return rune(0x21be), true + case "RightUpVectorBar": + // UPWARDS HARPOON WITH BARB RIGHT TO BAR + return rune(0x2954), true + case "RightVector": + // RIGHTWARDS HARPOON WITH BARB UPWARDS + return rune(0x21c0), true + case "RightVectorBar": + // RIGHTWARDS HARPOON WITH BARB UP TO BAR + return rune(0x2953), true + case "Rightarrow": + // RIGHTWARDS DOUBLE ARROW + return rune(0x21d2), true + case "Ropf": + // DOUBLE-STRUCK CAPITAL R + return rune(0x211d), true + case "RoundImplies": + // RIGHT DOUBLE ARROW WITH ROUNDED HEAD + return rune(0x2970), true + case "Rrightarrow": + // RIGHTWARDS TRIPLE ARROW + return rune(0x21db), true + case "Rscr": + // SCRIPT CAPITAL R + return rune(0x211b), true + case "Rsh": + // UPWARDS ARROW WITH TIP RIGHTWARDS + return rune(0x21b1), true + case "RuleDelayed": + // RULE-DELAYED + return rune(0x29f4), true + } + + case 'S': + switch name { + case "SHCHcy": + // CYRILLIC CAPITAL LETTER SHCHA + return rune(0x0429), true + case "SHcy": + // CYRILLIC CAPITAL LETTER SHA + return rune(0x0428), true + case "SOFTcy": + // CYRILLIC CAPITAL LETTER SOFT SIGN + return rune(0x042c), true + case "Sacute": + // LATIN CAPITAL LETTER S WITH ACUTE + return rune(0x015a), true + case "Sc": + // DOUBLE SUCCEEDS + return rune(0x2abc), true + case "Scaron": + // LATIN CAPITAL LETTER S WITH CARON + return rune(0x0160), true + case "Scedil": + // LATIN CAPITAL LETTER S WITH CEDILLA + return rune(0x015e), true + case "Scirc": + // LATIN CAPITAL LETTER S WITH CIRCUMFLEX + return rune(0x015c), true + case "Scy": + // CYRILLIC CAPITAL LETTER ES + return rune(0x0421), true + case "Sfr": + // MATHEMATICAL FRAKTUR CAPITAL S + return rune(0x01d516), true + case "Sgr": + // GREEK CAPITAL LETTER SIGMA + return rune(0x03a3), true + case "ShortDownArrow": + // DOWNWARDS ARROW + return rune(0x2193), true + case "ShortLeftArrow": + // LEFTWARDS ARROW + return rune(0x2190), true + case "ShortRightArrow": + // RIGHTWARDS ARROW + return rune(0x2192), true + case "ShortUpArrow": + // UPWARDS ARROW + return rune(0x2191), true + case "Sigma": + // GREEK CAPITAL LETTER SIGMA + return rune(0x03a3), true + case "SmallCircle": + // RING OPERATOR + return rune(0x2218), true + case "Sopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL S + return rune(0x01d54a), true + case "Sqrt": + // SQUARE ROOT + return rune(0x221a), true + case "SquareIntersection": + // SQUARE CAP + return rune(0x2293), true + case "SquareSubset": + // SQUARE IMAGE OF + return rune(0x228f), true + case "SquareSubsetEqual": + // SQUARE IMAGE OF OR EQUAL TO + return rune(0x2291), true + case "Square": + // WHITE SQUARE + return rune(0x25a1), true + case "SquareSuperset": + // SQUARE ORIGINAL OF + return rune(0x2290), true + case "SquareSupersetEqual": + // SQUARE ORIGINAL OF OR EQUAL TO + return rune(0x2292), true + case "SquareUnion": + // SQUARE CUP + return rune(0x2294), true + case "Sscr": + // MATHEMATICAL SCRIPT CAPITAL S + return rune(0x01d4ae), true + case "Star": + // STAR OPERATOR + return rune(0x22c6), true + case "Sub": + // DOUBLE SUBSET + return rune(0x22d0), true + case "Subset": + // DOUBLE SUBSET + return rune(0x22d0), true + case "SubsetEqual": + // SUBSET OF OR EQUAL TO + return rune(0x2286), true + case "Succeeds": + // SUCCEEDS + return rune(0x227b), true + case "SucceedsEqual": + // SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN + return rune(0x2ab0), true + case "SucceedsSlantEqual": + // SUCCEEDS OR EQUAL TO + return rune(0x227d), true + case "SucceedsTilde": + // SUCCEEDS OR EQUIVALENT TO + return rune(0x227f), true + case "SuchThat": + // CONTAINS AS MEMBER + return rune(0x220b), true + case "Sum": + // N-ARY SUMMATION + return rune(0x2211), true + case "SupersetEqual": + // SUPERSET OF OR EQUAL TO + return rune(0x2287), true + case "Sup": + // DOUBLE SUPERSET + return rune(0x22d1), true + case "Superset": + // SUPERSET OF + return rune(0x2283), true + case "Supset": + // DOUBLE SUPERSET + return rune(0x22d1), true + } + + case 'T': + switch name { + case "THORN": + // LATIN CAPITAL LETTER THORN + return rune(0xde), true + case "THgr": + // GREEK CAPITAL LETTER THETA + return rune(0x0398), true + case "TRADE": + // TRADE MARK SIGN + return rune(0x2122), true + case "TSHcy": + // CYRILLIC CAPITAL LETTER TSHE + return rune(0x040b), true + case "TScy": + // CYRILLIC CAPITAL LETTER TSE + return rune(0x0426), true + case "Tab": + // CHARACTER TABULATION + return rune(0x09), true + case "Tau": + // GREEK CAPITAL LETTER TAU + return rune(0x03a4), true + case "Tcaron": + // LATIN CAPITAL LETTER T WITH CARON + return rune(0x0164), true + case "Tcedil": + // LATIN CAPITAL LETTER T WITH CEDILLA + return rune(0x0162), true + case "Tcy": + // CYRILLIC CAPITAL LETTER TE + return rune(0x0422), true + case "Tfr": + // MATHEMATICAL FRAKTUR CAPITAL T + return rune(0x01d517), true + case "Tgr": + // GREEK CAPITAL LETTER TAU + return rune(0x03a4), true + case "Therefore": + // THEREFORE + return rune(0x2234), true + case "Theta": + // GREEK CAPITAL LETTER THETA + return rune(0x0398), true + case "Thetav": + // GREEK CAPITAL THETA SYMBOL + return rune(0x03f4), true + case "ThickSpace": + // space of width 5/18 em + return rune(0x205f), true + case "ThinSpace": + // THIN SPACE + return rune(0x2009), true + case "Tilde": + // TILDE OPERATOR + return rune(0x223c), true + case "TildeEqual": + // ASYMPTOTICALLY EQUAL TO + return rune(0x2243), true + case "TildeFullEqual": + // APPROXIMATELY EQUAL TO + return rune(0x2245), true + case "TildeTilde": + // ALMOST EQUAL TO + return rune(0x2248), true + case "Topf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL T + return rune(0x01d54b), true + case "TripleDot": + // COMBINING THREE DOTS ABOVE + return rune(0x20db), true + case "Tscr": + // MATHEMATICAL SCRIPT CAPITAL T + return rune(0x01d4af), true + case "Tstrok": + // LATIN CAPITAL LETTER T WITH STROKE + return rune(0x0166), true + } + + case 'U': + switch name { + case "Uacgr": + // GREEK CAPITAL LETTER UPSILON WITH TONOS + return rune(0x038e), true + case "Uacute": + // LATIN CAPITAL LETTER U WITH ACUTE + return rune(0xda), true + case "Uarrocir": + // UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE + return rune(0x2949), true + case "Uarr": + // UPWARDS TWO HEADED ARROW + return rune(0x219f), true + case "Ubrcy": + // CYRILLIC CAPITAL LETTER SHORT U + return rune(0x040e), true + case "Ubreve": + // LATIN CAPITAL LETTER U WITH BREVE + return rune(0x016c), true + case "Ucirc": + // LATIN CAPITAL LETTER U WITH CIRCUMFLEX + return rune(0xdb), true + case "Ucy": + // CYRILLIC CAPITAL LETTER U + return rune(0x0423), true + case "Udblac": + // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE + return rune(0x0170), true + case "Udigr": + // GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA + return rune(0x03ab), true + case "Ufr": + // MATHEMATICAL FRAKTUR CAPITAL U + return rune(0x01d518), true + case "Ugrave": + // LATIN CAPITAL LETTER U WITH GRAVE + return rune(0xd9), true + case "Ugr": + // GREEK CAPITAL LETTER UPSILON + return rune(0x03a5), true + case "Umacr": + // LATIN CAPITAL LETTER U WITH MACRON + return rune(0x016a), true + case "UnderBar": + // LOW LINE + return rune(0x5f), true + case "UnderBrace": + // BOTTOM CURLY BRACKET + return rune(0x23df), true + case "UnderBracket": + // BOTTOM SQUARE BRACKET + return rune(0x23b5), true + case "UnderParenthesis": + // BOTTOM PARENTHESIS + return rune(0x23dd), true + case "Union": + // N-ARY UNION + return rune(0x22c3), true + case "UnionPlus": + // MULTISET UNION + return rune(0x228e), true + case "Uogon": + // LATIN CAPITAL LETTER U WITH OGONEK + return rune(0x0172), true + case "Uopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL U + return rune(0x01d54c), true + case "UpArrow": + // UPWARDS ARROW + return rune(0x2191), true + case "UpArrowBar": + // UPWARDS ARROW TO BAR + return rune(0x2912), true + case "UpArrowDownArrow": + // UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW + return rune(0x21c5), true + case "UpDownArrow": + // UP DOWN ARROW + return rune(0x2195), true + case "UpEquilibrium": + // UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT + return rune(0x296e), true + case "UpTee": + // UP TACK + return rune(0x22a5), true + case "UpTeeArrow": + // UPWARDS ARROW FROM BAR + return rune(0x21a5), true + case "Uparrow": + // UPWARDS DOUBLE ARROW + return rune(0x21d1), true + case "Updownarrow": + // UP DOWN DOUBLE ARROW + return rune(0x21d5), true + case "UpperLeftArrow": + // NORTH WEST ARROW + return rune(0x2196), true + case "UpperRightArrow": + // NORTH EAST ARROW + return rune(0x2197), true + case "Upsilon": + // GREEK CAPITAL LETTER UPSILON + return rune(0x03a5), true + case "Upsi": + // GREEK UPSILON WITH HOOK SYMBOL + return rune(0x03d2), true + case "Uring": + // LATIN CAPITAL LETTER U WITH RING ABOVE + return rune(0x016e), true + case "Uscr": + // MATHEMATICAL SCRIPT CAPITAL U + return rune(0x01d4b0), true + case "Utilde": + // LATIN CAPITAL LETTER U WITH TILDE + return rune(0x0168), true + case "Uuml": + // LATIN CAPITAL LETTER U WITH DIAERESIS + return rune(0xdc), true + } + + case 'V': + switch name { + case "VDash": + // DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE + return rune(0x22ab), true + case "Vbar": + // DOUBLE UP TACK + return rune(0x2aeb), true + case "Vcy": + // CYRILLIC CAPITAL LETTER VE + return rune(0x0412), true + case "Vdashl": + // LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL + return rune(0x2ae6), true + case "Vdash": + // FORCES + return rune(0x22a9), true + case "Vee": + // N-ARY LOGICAL OR + return rune(0x22c1), true + case "Verbar": + // DOUBLE VERTICAL LINE + return rune(0x2016), true + case "Vert": + // DOUBLE VERTICAL LINE + return rune(0x2016), true + case "VerticalBar": + // DIVIDES + return rune(0x2223), true + case "VerticalLine": + // VERTICAL LINE + return rune(0x7c), true + case "VerticalSeparator": + // LIGHT VERTICAL BAR + return rune(0x2758), true + case "VerticalTilde": + // WREATH PRODUCT + return rune(0x2240), true + case "VeryThinSpace": + // HAIR SPACE + return rune(0x200a), true + case "Vfr": + // MATHEMATICAL FRAKTUR CAPITAL V + return rune(0x01d519), true + case "Vopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL V + return rune(0x01d54d), true + case "Vscr": + // MATHEMATICAL SCRIPT CAPITAL V + return rune(0x01d4b1), true + case "Vvdash": + // TRIPLE VERTICAL BAR RIGHT TURNSTILE + return rune(0x22aa), true + } + + case 'W': + switch name { + case "Wcirc": + // LATIN CAPITAL LETTER W WITH CIRCUMFLEX + return rune(0x0174), true + case "Wedge": + // N-ARY LOGICAL AND + return rune(0x22c0), true + case "Wfr": + // MATHEMATICAL FRAKTUR CAPITAL W + return rune(0x01d51a), true + case "Wopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL W + return rune(0x01d54e), true + case "Wscr": + // MATHEMATICAL SCRIPT CAPITAL W + return rune(0x01d4b2), true + } + + case 'X': + switch name { + case "Xfr": + // MATHEMATICAL FRAKTUR CAPITAL X + return rune(0x01d51b), true + case "Xgr": + // GREEK CAPITAL LETTER XI + return rune(0x039e), true + case "Xi": + // GREEK CAPITAL LETTER XI + return rune(0x039e), true + case "Xopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL X + return rune(0x01d54f), true + case "Xscr": + // MATHEMATICAL SCRIPT CAPITAL X + return rune(0x01d4b3), true + } + + case 'Y': + switch name { + case "YAcy": + // CYRILLIC CAPITAL LETTER YA + return rune(0x042f), true + case "YIcy": + // CYRILLIC CAPITAL LETTER YI + return rune(0x0407), true + case "YUcy": + // CYRILLIC CAPITAL LETTER YU + return rune(0x042e), true + case "Yacute": + // LATIN CAPITAL LETTER Y WITH ACUTE + return rune(0xdd), true + case "Ycirc": + // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX + return rune(0x0176), true + case "Ycy": + // CYRILLIC CAPITAL LETTER YERU + return rune(0x042b), true + case "Yfr": + // MATHEMATICAL FRAKTUR CAPITAL Y + return rune(0x01d51c), true + case "Yopf": + // MATHEMATICAL DOUBLE-STRUCK CAPITAL Y + return rune(0x01d550), true + case "Yscr": + // MATHEMATICAL SCRIPT CAPITAL Y + return rune(0x01d4b4), true + case "Yuml": + // LATIN CAPITAL LETTER Y WITH DIAERESIS + return rune(0x0178), true + } + + case 'Z': + switch name { + case "ZHcy": + // CYRILLIC CAPITAL LETTER ZHE + return rune(0x0416), true + case "Zacute": + // LATIN CAPITAL LETTER Z WITH ACUTE + return rune(0x0179), true + case "Zcaron": + // LATIN CAPITAL LETTER Z WITH CARON + return rune(0x017d), true + case "Zcy": + // CYRILLIC CAPITAL LETTER ZE + return rune(0x0417), true + case "Zdot": + // LATIN CAPITAL LETTER Z WITH DOT ABOVE + return rune(0x017b), true + case "ZeroWidthSpace": + // ZERO WIDTH SPACE + return rune(0x200b), true + case "Zeta": + // GREEK CAPITAL LETTER ZETA + return rune(0x0396), true + case "Zfr": + // BLACK-LETTER CAPITAL Z + return rune(0x2128), true + case "Zgr": + // GREEK CAPITAL LETTER ZETA + return rune(0x0396), true + case "Zopf": + // DOUBLE-STRUCK CAPITAL Z + return rune(0x2124), true + case "Zscr": + // MATHEMATICAL SCRIPT CAPITAL Z + return rune(0x01d4b5), true + } + + case 'a': + switch name { + case "aacgr": + // GREEK SMALL LETTER ALPHA WITH TONOS + return rune(0x03ac), true + case "aacute": + // LATIN SMALL LETTER A WITH ACUTE + return rune(0xe1), true + case "abreve": + // LATIN SMALL LETTER A WITH BREVE + return rune(0x0103), true + case "acE": + // INVERTED LAZY S with double underline + return rune(0x223e), true + case "acd": + // SINE WAVE + return rune(0x223f), true + case "acute": + // ACUTE ACCENT + return rune(0xb4), true + case "ac": + // INVERTED LAZY S + return rune(0x223e), true + case "acirc": + // LATIN SMALL LETTER A WITH CIRCUMFLEX + return rune(0xe2), true + case "actuary": + // COMBINING ANNUITY SYMBOL + return rune(0x20e7), true + case "acy": + // CYRILLIC SMALL LETTER A + return rune(0x0430), true + case "aelig": + // LATIN SMALL LETTER AE + return rune(0xe6), true + case "af": + // FUNCTION APPLICATION + return rune(0x2061), true + case "afr": + // MATHEMATICAL FRAKTUR SMALL A + return rune(0x01d51e), true + case "agr": + // GREEK SMALL LETTER ALPHA + return rune(0x03b1), true + case "agrave": + // LATIN SMALL LETTER A WITH GRAVE + return rune(0xe0), true + case "alefsym": + // ALEF SYMBOL + return rune(0x2135), true + case "aleph": + // ALEF SYMBOL + return rune(0x2135), true + case "alpha": + // GREEK SMALL LETTER ALPHA + return rune(0x03b1), true + case "amacr": + // LATIN SMALL LETTER A WITH MACRON + return rune(0x0101), true + case "amalg": + // AMALGAMATION OR COPRODUCT + return rune(0x2a3f), true + case "amp": + // AMPERSAND + return rune(0x26), true + case "andand": + // TWO INTERSECTING LOGICAL AND + return rune(0x2a55), true + case "andd": + // LOGICAL AND WITH HORIZONTAL DASH + return rune(0x2a5c), true + case "andslope": + // SLOPING LARGE AND + return rune(0x2a58), true + case "andv": + // LOGICAL AND WITH MIDDLE STEM + return rune(0x2a5a), true + case "and": + // LOGICAL AND + return rune(0x2227), true + case "angdnl": + // TURNED ANGLE + return rune(0x29a2), true + case "angdnr": + // ACUTE ANGLE + return rune(0x299f), true + case "ange": + // ANGLE WITH UNDERBAR + return rune(0x29a4), true + case "angles": + // ANGLE WITH S INSIDE + return rune(0x299e), true + case "angle": + // ANGLE + return rune(0x2220), true + case "angmsdaa": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT + return rune(0x29a8), true + case "angmsdab": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT + return rune(0x29a9), true + case "angmsdac": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT + return rune(0x29aa), true + case "angmsdad": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT + return rune(0x29ab), true + case "angmsdae": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP + return rune(0x29ac), true + case "angmsdaf": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP + return rune(0x29ad), true + case "angmsdag": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN + return rune(0x29ae), true + case "angmsdah": + // MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN + return rune(0x29af), true + case "angmsd": + // MEASURED ANGLE + return rune(0x2221), true + case "angrtvbd": + // MEASURED RIGHT ANGLE WITH DOT + return rune(0x299d), true + case "angrtvb": + // RIGHT ANGLE WITH ARC + return rune(0x22be), true + case "angsph": + // SPHERICAL ANGLE + return rune(0x2222), true + case "angst": + // LATIN CAPITAL LETTER A WITH RING ABOVE + return rune(0xc5), true + case "angupl": + // REVERSED ANGLE + return rune(0x29a3), true + case "angzarr": + // RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW + return rune(0x237c), true + case "ang": + // ANGLE + return rune(0x2220), true + case "ang90": + // RIGHT ANGLE + return rune(0x221f), true + case "angrt": + // RIGHT ANGLE + return rune(0x221f), true + case "aogon": + // LATIN SMALL LETTER A WITH OGONEK + return rune(0x0105), true + case "aopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL A + return rune(0x01d552), true + case "apE": + // APPROXIMATELY EQUAL OR EQUAL TO + return rune(0x2a70), true + case "apacir": + // ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT + return rune(0x2a6f), true + case "ape": + // ALMOST EQUAL OR EQUAL TO + return rune(0x224a), true + case "apid": + // TRIPLE TILDE + return rune(0x224b), true + case "approxeq": + // ALMOST EQUAL OR EQUAL TO + return rune(0x224a), true + case "approx": + // ALMOST EQUAL TO + return rune(0x2248), true + case "ap": + // ALMOST EQUAL TO + return rune(0x2248), true + case "apos": + // APOSTROPHE + return rune(0x27), true + case "aring": + // LATIN SMALL LETTER A WITH RING ABOVE + return rune(0xe5), true + case "arrllsr": + // LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW + return rune(0x2943), true + case "arrlrsl": + // RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW + return rune(0x2942), true + case "arrsrll": + // SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW + return rune(0x2944), true + case "ascr": + // MATHEMATICAL SCRIPT SMALL A + return rune(0x01d4b6), true + case "astb": + // SQUARED ASTERISK + return rune(0x29c6), true + case "ast": + // ASTERISK + return rune(0x2a), true + case "asympeq": + // EQUIVALENT TO + return rune(0x224d), true + case "asymp": + // ALMOST EQUAL TO + return rune(0x2248), true + case "atilde": + // LATIN SMALL LETTER A WITH TILDE + return rune(0xe3), true + case "auml": + // LATIN SMALL LETTER A WITH DIAERESIS + return rune(0xe4), true + case "awconint": + // ANTICLOCKWISE CONTOUR INTEGRAL + return rune(0x2233), true + case "awint": + // ANTICLOCKWISE INTEGRATION + return rune(0x2a11), true + } + + case 'b': + switch name { + case "b.Delta": + // MATHEMATICAL BOLD CAPITAL DELTA + return rune(0x01d6ab), true + case "b.Gamma": + // MATHEMATICAL BOLD CAPITAL GAMMA + return rune(0x01d6aa), true + case "b.Gammad": + // MATHEMATICAL BOLD CAPITAL DIGAMMA + return rune(0x01d7ca), true + case "b.Lambda": + // MATHEMATICAL BOLD CAPITAL LAMDA + return rune(0x01d6b2), true + case "b.Omega": + // MATHEMATICAL BOLD CAPITAL OMEGA + return rune(0x01d6c0), true + case "b.Phi": + // MATHEMATICAL BOLD CAPITAL PHI + return rune(0x01d6bd), true + case "b.Pi": + // MATHEMATICAL BOLD CAPITAL PI + return rune(0x01d6b7), true + case "b.Psi": + // MATHEMATICAL BOLD CAPITAL PSI + return rune(0x01d6bf), true + case "b.Sigma": + // MATHEMATICAL BOLD CAPITAL SIGMA + return rune(0x01d6ba), true + case "b.Theta": + // MATHEMATICAL BOLD CAPITAL THETA + return rune(0x01d6af), true + case "b.Upsi": + // MATHEMATICAL BOLD CAPITAL UPSILON + return rune(0x01d6bc), true + case "b.Xi": + // MATHEMATICAL BOLD CAPITAL XI + return rune(0x01d6b5), true + case "b.alpha": + // MATHEMATICAL BOLD SMALL ALPHA + return rune(0x01d6c2), true + case "b.beta": + // MATHEMATICAL BOLD SMALL BETA + return rune(0x01d6c3), true + case "b.chi": + // MATHEMATICAL BOLD SMALL CHI + return rune(0x01d6d8), true + case "b.delta": + // MATHEMATICAL BOLD SMALL DELTA + return rune(0x01d6c5), true + case "b.epsi": + // MATHEMATICAL BOLD SMALL EPSILON + return rune(0x01d6c6), true + case "b.epsiv": + // MATHEMATICAL BOLD EPSILON SYMBOL + return rune(0x01d6dc), true + case "b.eta": + // MATHEMATICAL BOLD SMALL ETA + return rune(0x01d6c8), true + case "b.gammad": + // MATHEMATICAL BOLD SMALL DIGAMMA + return rune(0x01d7cb), true + case "b.gamma": + // MATHEMATICAL BOLD SMALL GAMMA + return rune(0x01d6c4), true + case "b.iota": + // MATHEMATICAL BOLD SMALL IOTA + return rune(0x01d6ca), true + case "b.kappa": + // MATHEMATICAL BOLD SMALL KAPPA + return rune(0x01d6cb), true + case "b.kappav": + // MATHEMATICAL BOLD KAPPA SYMBOL + return rune(0x01d6de), true + case "b.lambda": + // MATHEMATICAL BOLD SMALL LAMDA + return rune(0x01d6cc), true + case "b.mu": + // MATHEMATICAL BOLD SMALL MU + return rune(0x01d6cd), true + case "b.nu": + // MATHEMATICAL BOLD SMALL NU + return rune(0x01d6ce), true + case "b.omega": + // MATHEMATICAL BOLD SMALL OMEGA + return rune(0x01d6da), true + case "b.phi": + // MATHEMATICAL BOLD SMALL PHI + return rune(0x01d6d7), true + case "b.phiv": + // MATHEMATICAL BOLD PHI SYMBOL + return rune(0x01d6df), true + case "b.pi": + // MATHEMATICAL BOLD SMALL PI + return rune(0x01d6d1), true + case "b.piv": + // MATHEMATICAL BOLD PI SYMBOL + return rune(0x01d6e1), true + case "b.psi": + // MATHEMATICAL BOLD SMALL PSI + return rune(0x01d6d9), true + case "b.rho": + // MATHEMATICAL BOLD SMALL RHO + return rune(0x01d6d2), true + case "b.rhov": + // MATHEMATICAL BOLD RHO SYMBOL + return rune(0x01d6e0), true + case "b.sigmav": + // MATHEMATICAL BOLD SMALL FINAL SIGMA + return rune(0x01d6d3), true + case "b.sigma": + // MATHEMATICAL BOLD SMALL SIGMA + return rune(0x01d6d4), true + case "b.tau": + // MATHEMATICAL BOLD SMALL TAU + return rune(0x01d6d5), true + case "b.thetas": + // MATHEMATICAL BOLD SMALL THETA + return rune(0x01d6c9), true + case "b.thetav": + // MATHEMATICAL BOLD THETA SYMBOL + return rune(0x01d6dd), true + case "b.upsi": + // MATHEMATICAL BOLD SMALL UPSILON + return rune(0x01d6d6), true + case "b.xi": + // MATHEMATICAL BOLD SMALL XI + return rune(0x01d6cf), true + case "b.zeta": + // MATHEMATICAL BOLD SMALL ZETA + return rune(0x01d6c7), true + case "bNot": + // REVERSED DOUBLE STROKE NOT SIGN + return rune(0x2aed), true + case "backcong": + // ALL EQUAL TO + return rune(0x224c), true + case "backepsilon": + // GREEK REVERSED LUNATE EPSILON SYMBOL + return rune(0x03f6), true + case "backprime": + // REVERSED PRIME + return rune(0x2035), true + case "backsimeq": + // REVERSED TILDE EQUALS + return rune(0x22cd), true + case "backsim": + // REVERSED TILDE + return rune(0x223d), true + case "barV": + // DOUBLE DOWN TACK + return rune(0x2aea), true + case "barvee": + // NOR + return rune(0x22bd), true + case "barwed": + // PROJECTIVE + return rune(0x2305), true + case "barwedge": + // PROJECTIVE + return rune(0x2305), true + case "bbrk": + // BOTTOM SQUARE BRACKET + return rune(0x23b5), true + case "bbrktbrk": + // BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET + return rune(0x23b6), true + case "bcong": + // ALL EQUAL TO + return rune(0x224c), true + case "bcy": + // CYRILLIC SMALL LETTER BE + return rune(0x0431), true + case "bdlhar": + // DOWNWARDS HARPOON WITH BARB LEFT FROM BAR + return rune(0x2961), true + case "bdquo": + // DOUBLE LOW-9 QUOTATION MARK + return rune(0x201e), true + case "bdrhar": + // DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR + return rune(0x295d), true + case "because": + // BECAUSE + return rune(0x2235), true + case "becaus": + // BECAUSE + return rune(0x2235), true + case "bemptyv": + // REVERSED EMPTY SET + return rune(0x29b0), true + case "bepsi": + // GREEK REVERSED LUNATE EPSILON SYMBOL + return rune(0x03f6), true + case "bernou": + // SCRIPT CAPITAL B + return rune(0x212c), true + case "beta": + // GREEK SMALL LETTER BETA + return rune(0x03b2), true + case "beth": + // BET SYMBOL + return rune(0x2136), true + case "between": + // BETWEEN + return rune(0x226c), true + case "bfr": + // MATHEMATICAL FRAKTUR SMALL B + return rune(0x01d51f), true + case "bgr": + // GREEK SMALL LETTER BETA + return rune(0x03b2), true + case "bigcap": + // N-ARY INTERSECTION + return rune(0x22c2), true + case "bigcirc": + // LARGE CIRCLE + return rune(0x25ef), true + case "bigcup": + // N-ARY UNION + return rune(0x22c3), true + case "bigodot": + // N-ARY CIRCLED DOT OPERATOR + return rune(0x2a00), true + case "bigoplus": + // N-ARY CIRCLED PLUS OPERATOR + return rune(0x2a01), true + case "bigotimes": + // N-ARY CIRCLED TIMES OPERATOR + return rune(0x2a02), true + case "bigsqcup": + // N-ARY SQUARE UNION OPERATOR + return rune(0x2a06), true + case "bigstar": + // BLACK STAR + return rune(0x2605), true + case "bigtriangledown": + // WHITE DOWN-POINTING TRIANGLE + return rune(0x25bd), true + case "bigtriangleup": + // WHITE UP-POINTING TRIANGLE + return rune(0x25b3), true + case "biguplus": + // N-ARY UNION OPERATOR WITH PLUS + return rune(0x2a04), true + case "bigvee": + // N-ARY LOGICAL OR + return rune(0x22c1), true + case "bigwedge": + // N-ARY LOGICAL AND + return rune(0x22c0), true + case "bkarow": + // RIGHTWARDS DOUBLE DASH ARROW + return rune(0x290d), true + case "blacklozenge": + // BLACK LOZENGE + return rune(0x29eb), true + case "blacksquare": + // BLACK SMALL SQUARE + return rune(0x25aa), true + case "blacktriangledown": + // BLACK DOWN-POINTING SMALL TRIANGLE + return rune(0x25be), true + case "blacktriangleleft": + // BLACK LEFT-POINTING SMALL TRIANGLE + return rune(0x25c2), true + case "blacktriangleright": + // BLACK RIGHT-POINTING SMALL TRIANGLE + return rune(0x25b8), true + case "blacktriangle": + // BLACK UP-POINTING SMALL TRIANGLE + return rune(0x25b4), true + case "blank": + // BLANK SYMBOL + return rune(0x2422), true + case "bldhar": + // LEFTWARDS HARPOON WITH BARB DOWN FROM BAR + return rune(0x295e), true + case "blk12": + // MEDIUM SHADE + return rune(0x2592), true + case "blk14": + // LIGHT SHADE + return rune(0x2591), true + case "blk34": + // DARK SHADE + return rune(0x2593), true + case "block": + // FULL BLOCK + return rune(0x2588), true + case "bluhar": + // LEFTWARDS HARPOON WITH BARB UP FROM BAR + return rune(0x295a), true + case "bnequiv": + // IDENTICAL TO with reverse slash + return rune(0x2261), true + case "bne": + // EQUALS SIGN with reverse slash + return rune(0x3d), true + case "bnot": + // REVERSED NOT SIGN + return rune(0x2310), true + case "bopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL B + return rune(0x01d553), true + case "bot": + // UP TACK + return rune(0x22a5), true + case "bottom": + // UP TACK + return rune(0x22a5), true + case "bowtie": + // BOWTIE + return rune(0x22c8), true + case "boxDL": + // BOX DRAWINGS DOUBLE DOWN AND LEFT + return rune(0x2557), true + case "boxDR": + // BOX DRAWINGS DOUBLE DOWN AND RIGHT + return rune(0x2554), true + case "boxDl": + // BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE + return rune(0x2556), true + case "boxDr": + // BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE + return rune(0x2553), true + case "boxHD": + // BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL + return rune(0x2566), true + case "boxHU": + // BOX DRAWINGS DOUBLE UP AND HORIZONTAL + return rune(0x2569), true + case "boxHd": + // BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE + return rune(0x2564), true + case "boxHu": + // BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE + return rune(0x2567), true + case "boxH": + // BOX DRAWINGS DOUBLE HORIZONTAL + return rune(0x2550), true + case "boxUL": + // BOX DRAWINGS DOUBLE UP AND LEFT + return rune(0x255d), true + case "boxUR": + // BOX DRAWINGS DOUBLE UP AND RIGHT + return rune(0x255a), true + case "boxUl": + // BOX DRAWINGS UP DOUBLE AND LEFT SINGLE + return rune(0x255c), true + case "boxUr": + // BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE + return rune(0x2559), true + case "boxVH": + // BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL + return rune(0x256c), true + case "boxVL": + // BOX DRAWINGS DOUBLE VERTICAL AND LEFT + return rune(0x2563), true + case "boxVR": + // BOX DRAWINGS DOUBLE VERTICAL AND RIGHT + return rune(0x2560), true + case "boxVh": + // BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE + return rune(0x256b), true + case "boxVl": + // BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE + return rune(0x2562), true + case "boxVr": + // BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE + return rune(0x255f), true + case "boxV": + // BOX DRAWINGS DOUBLE VERTICAL + return rune(0x2551), true + case "boxbox": + // TWO JOINED SQUARES + return rune(0x29c9), true + case "boxdL": + // BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE + return rune(0x2555), true + case "boxdR": + // BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE + return rune(0x2552), true + case "boxdl": + // BOX DRAWINGS LIGHT DOWN AND LEFT + return rune(0x2510), true + case "boxdr": + // BOX DRAWINGS LIGHT DOWN AND RIGHT + return rune(0x250c), true + case "boxhU": + // BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE + return rune(0x2568), true + case "boxh": + // BOX DRAWINGS LIGHT HORIZONTAL + return rune(0x2500), true + case "boxhD": + // BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE + return rune(0x2565), true + case "boxhd": + // BOX DRAWINGS LIGHT DOWN AND HORIZONTAL + return rune(0x252c), true + case "boxhu": + // BOX DRAWINGS LIGHT UP AND HORIZONTAL + return rune(0x2534), true + case "boxminus": + // SQUARED MINUS + return rune(0x229f), true + case "boxplus": + // SQUARED PLUS + return rune(0x229e), true + case "boxtimes": + // SQUARED TIMES + return rune(0x22a0), true + case "boxuL": + // BOX DRAWINGS UP SINGLE AND LEFT DOUBLE + return rune(0x255b), true + case "boxuR": + // BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE + return rune(0x2558), true + case "boxul": + // BOX DRAWINGS LIGHT UP AND LEFT + return rune(0x2518), true + case "boxur": + // BOX DRAWINGS LIGHT UP AND RIGHT + return rune(0x2514), true + case "boxvL": + // BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE + return rune(0x2561), true + case "boxvR": + // BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE + return rune(0x255e), true + case "boxvl": + // BOX DRAWINGS LIGHT VERTICAL AND LEFT + return rune(0x2524), true + case "boxvr": + // BOX DRAWINGS LIGHT VERTICAL AND RIGHT + return rune(0x251c), true + case "boxv": + // BOX DRAWINGS LIGHT VERTICAL + return rune(0x2502), true + case "boxvH": + // BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE + return rune(0x256a), true + case "boxvh": + // BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL + return rune(0x253c), true + case "bprime": + // REVERSED PRIME + return rune(0x2035), true + case "brdhar": + // RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR + return rune(0x295f), true + case "breve": + // BREVE + return rune(0x02d8), true + case "bruhar": + // RIGHTWARDS HARPOON WITH BARB UP FROM BAR + return rune(0x295b), true + case "brvbar": + // BROKEN BAR + return rune(0xa6), true + case "bscr": + // MATHEMATICAL SCRIPT SMALL B + return rune(0x01d4b7), true + case "bsemi": + // REVERSED SEMICOLON + return rune(0x204f), true + case "bsim": + // REVERSED TILDE + return rune(0x223d), true + case "bsime": + // REVERSED TILDE EQUALS + return rune(0x22cd), true + case "bsolb": + // SQUARED FALLING DIAGONAL SLASH + return rune(0x29c5), true + case "bsolhsub": + // REVERSE SOLIDUS PRECEDING SUBSET + return rune(0x27c8), true + case "bsol": + // REVERSE SOLIDUS + return rune(0x5c), true + case "btimes": + // SEMIDIRECT PRODUCT WITH BOTTOM CLOSED + return rune(0x2a32), true + case "bulhar": + // UPWARDS HARPOON WITH BARB LEFT FROM BAR + return rune(0x2960), true + case "bullet": + // BULLET + return rune(0x2022), true + case "bull": + // BULLET + return rune(0x2022), true + case "bump": + // GEOMETRICALLY EQUIVALENT TO + return rune(0x224e), true + case "bumpE": + // EQUALS SIGN WITH BUMPY ABOVE + return rune(0x2aae), true + case "bumpe": + // DIFFERENCE BETWEEN + return rune(0x224f), true + case "bumpeq": + // DIFFERENCE BETWEEN + return rune(0x224f), true + case "burhar": + // UPWARDS HARPOON WITH BARB RIGHT FROM BAR + return rune(0x295c), true + } + + case 'c': + switch name { + case "cacute": + // LATIN SMALL LETTER C WITH ACUTE + return rune(0x0107), true + case "cap": + // INTERSECTION + return rune(0x2229), true + case "capand": + // INTERSECTION WITH LOGICAL AND + return rune(0x2a44), true + case "capbrcup": + // INTERSECTION ABOVE BAR ABOVE UNION + return rune(0x2a49), true + case "capcap": + // INTERSECTION BESIDE AND JOINED WITH INTERSECTION + return rune(0x2a4b), true + case "capcup": + // INTERSECTION ABOVE UNION + return rune(0x2a47), true + case "capdot": + // INTERSECTION WITH DOT + return rune(0x2a40), true + case "capint": + // INTEGRAL WITH INTERSECTION + return rune(0x2a19), true + case "caps": + // INTERSECTION with serifs + return rune(0x2229), true + case "caret": + // CARET INSERTION POINT + return rune(0x2041), true + case "caron": + // CARON + return rune(0x02c7), true + case "ccaps": + // CLOSED INTERSECTION WITH SERIFS + return rune(0x2a4d), true + case "ccaron": + // LATIN SMALL LETTER C WITH CARON + return rune(0x010d), true + case "ccedil": + // LATIN SMALL LETTER C WITH CEDILLA + return rune(0xe7), true + case "ccirc": + // LATIN SMALL LETTER C WITH CIRCUMFLEX + return rune(0x0109), true + case "ccups": + // CLOSED UNION WITH SERIFS + return rune(0x2a4c), true + case "ccupssm": + // CLOSED UNION WITH SERIFS AND SMASH PRODUCT + return rune(0x2a50), true + case "cdot": + // LATIN SMALL LETTER C WITH DOT ABOVE + return rune(0x010b), true + case "cedil": + // CEDILLA + return rune(0xb8), true + case "cemptyv": + // EMPTY SET WITH SMALL CIRCLE ABOVE + return rune(0x29b2), true + case "centerdot": + // MIDDLE DOT + return rune(0xb7), true + case "cent": + // CENT SIGN + return rune(0xa2), true + case "cfr": + // MATHEMATICAL FRAKTUR SMALL C + return rune(0x01d520), true + case "chcy": + // CYRILLIC SMALL LETTER CHE + return rune(0x0447), true + case "check": + // CHECK MARK + return rune(0x2713), true + case "checkmark": + // CHECK MARK + return rune(0x2713), true + case "chi": + // GREEK SMALL LETTER CHI + return rune(0x03c7), true + case "circeq": + // RING EQUAL TO + return rune(0x2257), true + case "circlearrowleft": + // ANTICLOCKWISE OPEN CIRCLE ARROW + return rune(0x21ba), true + case "circlearrowright": + // CLOCKWISE OPEN CIRCLE ARROW + return rune(0x21bb), true + case "circledS": + // CIRCLED LATIN CAPITAL LETTER S + return rune(0x24c8), true + case "circledast": + // CIRCLED ASTERISK OPERATOR + return rune(0x229b), true + case "circledcirc": + // CIRCLED RING OPERATOR + return rune(0x229a), true + case "circleddash": + // CIRCLED DASH + return rune(0x229d), true + case "cire": + // RING EQUAL TO + return rune(0x2257), true + case "cir": + // WHITE CIRCLE + return rune(0x25cb), true + case "cirE": + // CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT + return rune(0x29c3), true + case "cirb": + // SQUARED SMALL CIRCLE + return rune(0x29c7), true + case "circ": + // MODIFIER LETTER CIRCUMFLEX ACCENT + return rune(0x02c6), true + case "circledR": + // REGISTERED SIGN + return rune(0xae), true + case "cirdarr": + // WHITE CIRCLE WITH DOWN ARROW + return rune(0x29ec), true + case "cirerr": + // ERROR-BARRED WHITE CIRCLE + return rune(0x29f2), true + case "cirfdarr": + // BLACK CIRCLE WITH DOWN ARROW + return rune(0x29ed), true + case "cirferr": + // ERROR-BARRED BLACK CIRCLE + return rune(0x29f3), true + case "cirfnint": + // CIRCULATION FUNCTION + return rune(0x2a10), true + case "cirmid": + // VERTICAL LINE WITH CIRCLE ABOVE + return rune(0x2aef), true + case "cirscir": + // CIRCLE WITH SMALL CIRCLE TO THE RIGHT + return rune(0x29c2), true + case "closur": + // CLOSE UP + return rune(0x2050), true + case "clubs": + // BLACK CLUB SUIT + return rune(0x2663), true + case "clubsuit": + // BLACK CLUB SUIT + return rune(0x2663), true + case "colone": + // COLON EQUALS + return rune(0x2254), true + case "coloneq": + // COLON EQUALS + return rune(0x2254), true + case "colon": + // COLON + return rune(0x3a), true + case "commat": + // COMMERCIAL AT + return rune(0x40), true + case "comma": + // COMMA + return rune(0x2c), true + case "comp": + // COMPLEMENT + return rune(0x2201), true + case "compfn": + // RING OPERATOR + return rune(0x2218), true + case "complement": + // COMPLEMENT + return rune(0x2201), true + case "complexes": + // DOUBLE-STRUCK CAPITAL C + return rune(0x2102), true + case "cong": + // APPROXIMATELY EQUAL TO + return rune(0x2245), true + case "congdot": + // CONGRUENT WITH DOT ABOVE + return rune(0x2a6d), true + case "conint": + // CONTOUR INTEGRAL + return rune(0x222e), true + case "copf": + // MATHEMATICAL DOUBLE-STRUCK SMALL C + return rune(0x01d554), true + case "coprod": + // N-ARY COPRODUCT + return rune(0x2210), true + case "copysr": + // SOUND RECORDING COPYRIGHT + return rune(0x2117), true + case "copy": + // COPYRIGHT SIGN + return rune(0xa9), true + case "crarr": + // DOWNWARDS ARROW WITH CORNER LEFTWARDS + return rune(0x21b5), true + case "cross": + // BALLOT X + return rune(0x2717), true + case "cscr": + // MATHEMATICAL SCRIPT SMALL C + return rune(0x01d4b8), true + case "csub": + // CLOSED SUBSET + return rune(0x2acf), true + case "csube": + // CLOSED SUBSET OR EQUAL TO + return rune(0x2ad1), true + case "csup": + // CLOSED SUPERSET + return rune(0x2ad0), true + case "csupe": + // CLOSED SUPERSET OR EQUAL TO + return rune(0x2ad2), true + case "ctdot": + // MIDLINE HORIZONTAL ELLIPSIS + return rune(0x22ef), true + case "cudarrl": + // RIGHT-SIDE ARC CLOCKWISE ARROW + return rune(0x2938), true + case "cudarrr": + // ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS + return rune(0x2935), true + case "cuepr": + // EQUAL TO OR PRECEDES + return rune(0x22de), true + case "cuesc": + // EQUAL TO OR SUCCEEDS + return rune(0x22df), true + case "cularr": + // ANTICLOCKWISE TOP SEMICIRCLE ARROW + return rune(0x21b6), true + case "cularrp": + // TOP ARC ANTICLOCKWISE ARROW WITH PLUS + return rune(0x293d), true + case "cup": + // UNION + return rune(0x222a), true + case "cupbrcap": + // UNION ABOVE BAR ABOVE INTERSECTION + return rune(0x2a48), true + case "cupcap": + // UNION ABOVE INTERSECTION + return rune(0x2a46), true + case "cupcup": + // UNION BESIDE AND JOINED WITH UNION + return rune(0x2a4a), true + case "cupdot": + // MULTISET MULTIPLICATION + return rune(0x228d), true + case "cupint": + // INTEGRAL WITH UNION + return rune(0x2a1a), true + case "cupor": + // UNION WITH LOGICAL OR + return rune(0x2a45), true + case "cupre": + // PRECEDES OR EQUAL TO + return rune(0x227c), true + case "cups": + // UNION with serifs + return rune(0x222a), true + case "curarr": + // CLOCKWISE TOP SEMICIRCLE ARROW + return rune(0x21b7), true + case "curarrm": + // TOP ARC CLOCKWISE ARROW WITH MINUS + return rune(0x293c), true + case "curlyeqprec": + // EQUAL TO OR PRECEDES + return rune(0x22de), true + case "curlyeqsucc": + // EQUAL TO OR SUCCEEDS + return rune(0x22df), true + case "curlyvee": + // CURLY LOGICAL OR + return rune(0x22ce), true + case "curlywedge": + // CURLY LOGICAL AND + return rune(0x22cf), true + case "curren": + // CURRENCY SIGN + return rune(0xa4), true + case "curvearrowleft": + // ANTICLOCKWISE TOP SEMICIRCLE ARROW + return rune(0x21b6), true + case "curvearrowright": + // CLOCKWISE TOP SEMICIRCLE ARROW + return rune(0x21b7), true + case "cuvee": + // CURLY LOGICAL OR + return rune(0x22ce), true + case "cuwed": + // CURLY LOGICAL AND + return rune(0x22cf), true + case "cwconint": + // CLOCKWISE CONTOUR INTEGRAL + return rune(0x2232), true + case "cwint": + // CLOCKWISE INTEGRAL + return rune(0x2231), true + case "cylcty": + // CYLINDRICITY + return rune(0x232d), true + } + + case 'd': + switch name { + case "dAarr": + // DOWNWARDS TRIPLE ARROW + return rune(0x290b), true + case "dArr": + // DOWNWARDS DOUBLE ARROW + return rune(0x21d3), true + case "dHar": + // DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT + return rune(0x2965), true + case "dagger": + // DAGGER + return rune(0x2020), true + case "dalembrt": + // SQUARE WITH CONTOURED OUTLINE + return rune(0x29e0), true + case "daleth": + // DALET SYMBOL + return rune(0x2138), true + case "darr2": + // DOWNWARDS PAIRED ARROWS + return rune(0x21ca), true + case "darr": + // DOWNWARDS ARROW + return rune(0x2193), true + case "darrb": + // DOWNWARDS ARROW TO BAR + return rune(0x2913), true + case "darrln": + // DOWNWARDS ARROW WITH HORIZONTAL STROKE + return rune(0x2908), true + case "dashv": + // LEFT TACK + return rune(0x22a3), true + case "dash": + // HYPHEN + return rune(0x2010), true + case "dashV": + // DOUBLE VERTICAL BAR LEFT TURNSTILE + return rune(0x2ae3), true + case "dbkarow": + // RIGHTWARDS TRIPLE DASH ARROW + return rune(0x290f), true + case "dblac": + // DOUBLE ACUTE ACCENT + return rune(0x02dd), true + case "dcaron": + // LATIN SMALL LETTER D WITH CARON + return rune(0x010f), true + case "dcy": + // CYRILLIC SMALL LETTER DE + return rune(0x0434), true + case "ddarr": + // DOWNWARDS PAIRED ARROWS + return rune(0x21ca), true + case "dd": + // DOUBLE-STRUCK ITALIC SMALL D + return rune(0x2146), true + case "ddagger": + // DOUBLE DAGGER + return rune(0x2021), true + case "ddotseq": + // EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW + return rune(0x2a77), true + case "deg": + // DEGREE SIGN + return rune(0xb0), true + case "delta": + // GREEK SMALL LETTER DELTA + return rune(0x03b4), true + case "demptyv": + // EMPTY SET WITH OVERBAR + return rune(0x29b1), true + case "dfisht": + // DOWN FISH TAIL + return rune(0x297f), true + case "dfr": + // MATHEMATICAL FRAKTUR SMALL D + return rune(0x01d521), true + case "dgr": + // GREEK SMALL LETTER DELTA + return rune(0x03b4), true + case "dharl": + // DOWNWARDS HARPOON WITH BARB LEFTWARDS + return rune(0x21c3), true + case "dharr": + // DOWNWARDS HARPOON WITH BARB RIGHTWARDS + return rune(0x21c2), true + case "diam": + // DIAMOND OPERATOR + return rune(0x22c4), true + case "diamdarr": + // BLACK DIAMOND WITH DOWN ARROW + return rune(0x29ea), true + case "diamerr": + // ERROR-BARRED WHITE DIAMOND + return rune(0x29f0), true + case "diamerrf": + // ERROR-BARRED BLACK DIAMOND + return rune(0x29f1), true + case "diamond": + // DIAMOND OPERATOR + return rune(0x22c4), true + case "diamondsuit": + // BLACK DIAMOND SUIT + return rune(0x2666), true + case "diams": + // BLACK DIAMOND SUIT + return rune(0x2666), true + case "die": + // DIAERESIS + return rune(0xa8), true + case "digamma": + // GREEK SMALL LETTER DIGAMMA + return rune(0x03dd), true + case "disin": + // ELEMENT OF WITH LONG HORIZONTAL STROKE + return rune(0x22f2), true + case "divideontimes": + // DIVISION TIMES + return rune(0x22c7), true + case "divonx": + // DIVISION TIMES + return rune(0x22c7), true + case "div": + // DIVISION SIGN + return rune(0xf7), true + case "divide": + // DIVISION SIGN + return rune(0xf7), true + case "djcy": + // CYRILLIC SMALL LETTER DJE + return rune(0x0452), true + case "dlarr": + // SOUTH WEST ARROW + return rune(0x2199), true + case "dlcorn": + // BOTTOM LEFT CORNER + return rune(0x231e), true + case "dlcrop": + // BOTTOM LEFT CROP + return rune(0x230d), true + case "dlharb": + // DOWNWARDS HARPOON WITH BARB LEFT TO BAR + return rune(0x2959), true + case "dollar": + // DOLLAR SIGN + return rune(0x24), true + case "dopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL D + return rune(0x01d555), true + case "doteq": + // APPROACHES THE LIMIT + return rune(0x2250), true + case "doteqdot": + // GEOMETRICALLY EQUAL TO + return rune(0x2251), true + case "dotminus": + // DOT MINUS + return rune(0x2238), true + case "dotplus": + // DOT PLUS + return rune(0x2214), true + case "dotsquare": + // SQUARED DOT OPERATOR + return rune(0x22a1), true + case "dot": + // DOT ABOVE + return rune(0x02d9), true + case "doublebarwedge": + // PERSPECTIVE + return rune(0x2306), true + case "downarrow": + // DOWNWARDS ARROW + return rune(0x2193), true + case "downdownarrows": + // DOWNWARDS PAIRED ARROWS + return rune(0x21ca), true + case "downharpoonleft": + // DOWNWARDS HARPOON WITH BARB LEFTWARDS + return rune(0x21c3), true + case "downharpoonright": + // DOWNWARDS HARPOON WITH BARB RIGHTWARDS + return rune(0x21c2), true + case "drarr": + // SOUTH EAST ARROW + return rune(0x2198), true + case "drbkarow": + // RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW + return rune(0x2910), true + case "drcorn": + // BOTTOM RIGHT CORNER + return rune(0x231f), true + case "drcrop": + // BOTTOM RIGHT CROP + return rune(0x230c), true + case "drharb": + // DOWNWARDS HARPOON WITH BARB RIGHT TO BAR + return rune(0x2955), true + case "dscr": + // MATHEMATICAL SCRIPT SMALL D + return rune(0x01d4b9), true + case "dscy": + // CYRILLIC SMALL LETTER DZE + return rune(0x0455), true + case "dsol": + // SOLIDUS WITH OVERBAR + return rune(0x29f6), true + case "dstrok": + // LATIN SMALL LETTER D WITH STROKE + return rune(0x0111), true + case "dtdot": + // DOWN RIGHT DIAGONAL ELLIPSIS + return rune(0x22f1), true + case "dtrif": + // BLACK DOWN-POINTING SMALL TRIANGLE + return rune(0x25be), true + case "dtri": + // WHITE DOWN-POINTING SMALL TRIANGLE + return rune(0x25bf), true + case "dtrilf": + // DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK + return rune(0x29e8), true + case "dtrirf": + // DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK + return rune(0x29e9), true + case "duarr": + // DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW + return rune(0x21f5), true + case "duhar": + // DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT + return rune(0x296f), true + case "dumap": + // DOUBLE-ENDED MULTIMAP + return rune(0x29df), true + case "dwangle": + // OBLIQUE ANGLE OPENING UP + return rune(0x29a6), true + case "dzcy": + // CYRILLIC SMALL LETTER DZHE + return rune(0x045f), true + case "dzigrarr": + // LONG RIGHTWARDS SQUIGGLE ARROW + return rune(0x27ff), true + } + + case 'e': + switch name { + case "eDDot": + // EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW + return rune(0x2a77), true + case "eDot": + // GEOMETRICALLY EQUAL TO + return rune(0x2251), true + case "eacgr": + // GREEK SMALL LETTER EPSILON WITH TONOS + return rune(0x03ad), true + case "eacute": + // LATIN SMALL LETTER E WITH ACUTE + return rune(0xe9), true + case "easter": + // EQUALS WITH ASTERISK + return rune(0x2a6e), true + case "ecaron": + // LATIN SMALL LETTER E WITH CARON + return rune(0x011b), true + case "ecir": + // RING IN EQUAL TO + return rune(0x2256), true + case "ecirc": + // LATIN SMALL LETTER E WITH CIRCUMFLEX + return rune(0xea), true + case "ecolon": + // EQUALS COLON + return rune(0x2255), true + case "ecy": + // CYRILLIC SMALL LETTER E + return rune(0x044d), true + case "edot": + // LATIN SMALL LETTER E WITH DOT ABOVE + return rune(0x0117), true + case "ee": + // DOUBLE-STRUCK ITALIC SMALL E + return rune(0x2147), true + case "eeacgr": + // GREEK SMALL LETTER ETA WITH TONOS + return rune(0x03ae), true + case "eegr": + // GREEK SMALL LETTER ETA + return rune(0x03b7), true + case "efDot": + // APPROXIMATELY EQUAL TO OR THE IMAGE OF + return rune(0x2252), true + case "efr": + // MATHEMATICAL FRAKTUR SMALL E + return rune(0x01d522), true + case "egr": + // GREEK SMALL LETTER EPSILON + return rune(0x03b5), true + case "egs": + // SLANTED EQUAL TO OR GREATER-THAN + return rune(0x2a96), true + case "egsdot": + // SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE + return rune(0x2a98), true + case "eg": + // DOUBLE-LINE EQUAL TO OR GREATER-THAN + return rune(0x2a9a), true + case "egrave": + // LATIN SMALL LETTER E WITH GRAVE + return rune(0xe8), true + case "elinters": + // ELECTRICAL INTERSECTION + return rune(0x23e7), true + case "ell": + // SCRIPT SMALL L + return rune(0x2113), true + case "els": + // SLANTED EQUAL TO OR LESS-THAN + return rune(0x2a95), true + case "elsdot": + // SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE + return rune(0x2a97), true + case "el": + // DOUBLE-LINE EQUAL TO OR LESS-THAN + return rune(0x2a99), true + case "emacr": + // LATIN SMALL LETTER E WITH MACRON + return rune(0x0113), true + case "empty": + // EMPTY SET + return rune(0x2205), true + case "emptyset": + // EMPTY SET + return rune(0x2205), true + case "emptyv": + // EMPTY SET + return rune(0x2205), true + case "emsp13": + // THREE-PER-EM SPACE + return rune(0x2004), true + case "emsp14": + // FOUR-PER-EM SPACE + return rune(0x2005), true + case "emsp": + // EM SPACE + return rune(0x2003), true + case "eng": + // LATIN SMALL LETTER ENG + return rune(0x014b), true + case "ensp": + // EN SPACE + return rune(0x2002), true + case "eogon": + // LATIN SMALL LETTER E WITH OGONEK + return rune(0x0119), true + case "eopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL E + return rune(0x01d556), true + case "epar": + // EQUAL AND PARALLEL TO + return rune(0x22d5), true + case "eparsl": + // EQUALS SIGN AND SLANTED PARALLEL + return rune(0x29e3), true + case "eplus": + // EQUALS SIGN ABOVE PLUS SIGN + return rune(0x2a71), true + case "epsilon": + // GREEK SMALL LETTER EPSILON + return rune(0x03b5), true + case "epsis": + // GREEK LUNATE EPSILON SYMBOL + return rune(0x03f5), true + case "epsiv": + // GREEK LUNATE EPSILON SYMBOL + return rune(0x03f5), true + case "epsi": + // GREEK SMALL LETTER EPSILON + return rune(0x03b5), true + case "eqcirc": + // RING IN EQUAL TO + return rune(0x2256), true + case "eqcolon": + // EQUALS COLON + return rune(0x2255), true + case "eqeq": + // TWO CONSECUTIVE EQUALS SIGNS + return rune(0x2a75), true + case "eqsim": + // MINUS TILDE + return rune(0x2242), true + case "eqslantgtr": + // SLANTED EQUAL TO OR GREATER-THAN + return rune(0x2a96), true + case "eqslantless": + // SLANTED EQUAL TO OR LESS-THAN + return rune(0x2a95), true + case "equals": + // EQUALS SIGN + return rune(0x3d), true + case "equest": + // QUESTIONED EQUAL TO + return rune(0x225f), true + case "equiv": + // IDENTICAL TO + return rune(0x2261), true + case "equivDD": + // EQUIVALENT WITH FOUR DOTS ABOVE + return rune(0x2a78), true + case "eqvparsl": + // IDENTICAL TO AND SLANTED PARALLEL + return rune(0x29e5), true + case "erDot": + // IMAGE OF OR APPROXIMATELY EQUAL TO + return rune(0x2253), true + case "erarr": + // EQUALS SIGN ABOVE RIGHTWARDS ARROW + return rune(0x2971), true + case "escr": + // SCRIPT SMALL E + return rune(0x212f), true + case "esdot": + // APPROACHES THE LIMIT + return rune(0x2250), true + case "esim": + // MINUS TILDE + return rune(0x2242), true + case "eta": + // GREEK SMALL LETTER ETA + return rune(0x03b7), true + case "eth": + // LATIN SMALL LETTER ETH + return rune(0xf0), true + case "euml": + // LATIN SMALL LETTER E WITH DIAERESIS + return rune(0xeb), true + case "euro": + // EURO SIGN + return rune(0x20ac), true + case "excl": + // EXCLAMATION MARK + return rune(0x21), true + case "exist": + // THERE EXISTS + return rune(0x2203), true + case "expectation": + // SCRIPT CAPITAL E + return rune(0x2130), true + case "exponentiale": + // DOUBLE-STRUCK ITALIC SMALL E + return rune(0x2147), true + } + + case 'f': + switch name { + case "fallingdotseq": + // APPROXIMATELY EQUAL TO OR THE IMAGE OF + return rune(0x2252), true + case "fbowtie": + // BLACK BOWTIE + return rune(0x29d3), true + case "fcy": + // CYRILLIC SMALL LETTER EF + return rune(0x0444), true + case "fdiag": + // BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT + return rune(0x2572), true + case "fdiordi": + // FALLING DIAGONAL CROSSING RISING DIAGONAL + return rune(0x292c), true + case "fdonearr": + // FALLING DIAGONAL CROSSING NORTH EAST ARROW + return rune(0x292f), true + case "female": + // FEMALE SIGN + return rune(0x2640), true + case "ffilig": + // LATIN SMALL LIGATURE FFI + return rune(0xfb03), true + case "fflig": + // LATIN SMALL LIGATURE FF + return rune(0xfb00), true + case "ffllig": + // LATIN SMALL LIGATURE FFL + return rune(0xfb04), true + case "ffr": + // MATHEMATICAL FRAKTUR SMALL F + return rune(0x01d523), true + case "fhrglass": + // BLACK HOURGLASS + return rune(0x29d7), true + case "filig": + // LATIN SMALL LIGATURE FI + return rune(0xfb01), true + case "fjlig": + // fj ligature + return rune(0x66), true + case "flat": + // MUSIC FLAT SIGN + return rune(0x266d), true + case "fllig": + // LATIN SMALL LIGATURE FL + return rune(0xfb02), true + case "fltns": + // WHITE PARALLELOGRAM + return rune(0x25b1), true + case "fnof": + // LATIN SMALL LETTER F WITH HOOK + return rune(0x0192), true + case "fopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL F + return rune(0x01d557), true + case "forall": + // FOR ALL + return rune(0x2200), true + case "fork": + // PITCHFORK + return rune(0x22d4), true + case "forkv": + // ELEMENT OF OPENING DOWNWARDS + return rune(0x2ad9), true + case "fpartint": + // FINITE PART INTEGRAL + return rune(0x2a0d), true + case "frac12": + // VULGAR FRACTION ONE HALF + return rune(0xbd), true + case "frac13": + // VULGAR FRACTION ONE THIRD + return rune(0x2153), true + case "frac14": + // VULGAR FRACTION ONE QUARTER + return rune(0xbc), true + case "frac15": + // VULGAR FRACTION ONE FIFTH + return rune(0x2155), true + case "frac16": + // VULGAR FRACTION ONE SIXTH + return rune(0x2159), true + case "frac18": + // VULGAR FRACTION ONE EIGHTH + return rune(0x215b), true + case "frac23": + // VULGAR FRACTION TWO THIRDS + return rune(0x2154), true + case "frac25": + // VULGAR FRACTION TWO FIFTHS + return rune(0x2156), true + case "frac34": + // VULGAR FRACTION THREE QUARTERS + return rune(0xbe), true + case "frac35": + // VULGAR FRACTION THREE FIFTHS + return rune(0x2157), true + case "frac38": + // VULGAR FRACTION THREE EIGHTHS + return rune(0x215c), true + case "frac45": + // VULGAR FRACTION FOUR FIFTHS + return rune(0x2158), true + case "frac56": + // VULGAR FRACTION FIVE SIXTHS + return rune(0x215a), true + case "frac58": + // VULGAR FRACTION FIVE EIGHTHS + return rune(0x215d), true + case "frac78": + // VULGAR FRACTION SEVEN EIGHTHS + return rune(0x215e), true + case "frasl": + // FRACTION SLASH + return rune(0x2044), true + case "frown": + // FROWN + return rune(0x2322), true + case "fscr": + // MATHEMATICAL SCRIPT SMALL F + return rune(0x01d4bb), true + } + + case 'g': + switch name { + case "gE": + // GREATER-THAN OVER EQUAL TO + return rune(0x2267), true + case "gEl": + // GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN + return rune(0x2a8c), true + case "gacute": + // LATIN SMALL LETTER G WITH ACUTE + return rune(0x01f5), true + case "gammad": + // GREEK SMALL LETTER DIGAMMA + return rune(0x03dd), true + case "gamma": + // GREEK SMALL LETTER GAMMA + return rune(0x03b3), true + case "gap": + // GREATER-THAN OR APPROXIMATE + return rune(0x2a86), true + case "gbreve": + // LATIN SMALL LETTER G WITH BREVE + return rune(0x011f), true + case "gcedil": + // LATIN SMALL LETTER G WITH CEDILLA + return rune(0x0123), true + case "gcirc": + // LATIN SMALL LETTER G WITH CIRCUMFLEX + return rune(0x011d), true + case "gcy": + // CYRILLIC SMALL LETTER GHE + return rune(0x0433), true + case "gdot": + // LATIN SMALL LETTER G WITH DOT ABOVE + return rune(0x0121), true + case "ge": + // GREATER-THAN OR EQUAL TO + return rune(0x2265), true + case "gel": + // GREATER-THAN EQUAL TO OR LESS-THAN + return rune(0x22db), true + case "geq": + // GREATER-THAN OR EQUAL TO + return rune(0x2265), true + case "geqq": + // GREATER-THAN OVER EQUAL TO + return rune(0x2267), true + case "geqslant": + // GREATER-THAN OR SLANTED EQUAL TO + return rune(0x2a7e), true + case "gesl": + // GREATER-THAN slanted EQUAL TO OR LESS-THAN + return rune(0x22db), true + case "ges": + // GREATER-THAN OR SLANTED EQUAL TO + return rune(0x2a7e), true + case "gescc": + // GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL + return rune(0x2aa9), true + case "gesdot": + // GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE + return rune(0x2a80), true + case "gesdoto": + // GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE + return rune(0x2a82), true + case "gesdotol": + // GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT + return rune(0x2a84), true + case "gesles": + // GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL + return rune(0x2a94), true + case "gfr": + // MATHEMATICAL FRAKTUR SMALL G + return rune(0x01d524), true + case "gg": + // MUCH GREATER-THAN + return rune(0x226b), true + case "ggg": + // VERY MUCH GREATER-THAN + return rune(0x22d9), true + case "ggr": + // GREEK SMALL LETTER GAMMA + return rune(0x03b3), true + case "gimel": + // GIMEL SYMBOL + return rune(0x2137), true + case "gjcy": + // CYRILLIC SMALL LETTER GJE + return rune(0x0453), true + case "gl": + // GREATER-THAN OR LESS-THAN + return rune(0x2277), true + case "glE": + // GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL + return rune(0x2a92), true + case "gla": + // GREATER-THAN BESIDE LESS-THAN + return rune(0x2aa5), true + case "glj": + // GREATER-THAN OVERLAPPING LESS-THAN + return rune(0x2aa4), true + case "gnE": + // GREATER-THAN BUT NOT EQUAL TO + return rune(0x2269), true + case "gnap": + // GREATER-THAN AND NOT APPROXIMATE + return rune(0x2a8a), true + case "gnapprox": + // GREATER-THAN AND NOT APPROXIMATE + return rune(0x2a8a), true + case "gneqq": + // GREATER-THAN BUT NOT EQUAL TO + return rune(0x2269), true + case "gne": + // GREATER-THAN AND SINGLE-LINE NOT EQUAL TO + return rune(0x2a88), true + case "gneq": + // GREATER-THAN AND SINGLE-LINE NOT EQUAL TO + return rune(0x2a88), true + case "gnsim": + // GREATER-THAN BUT NOT EQUIVALENT TO + return rune(0x22e7), true + case "gopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL G + return rune(0x01d558), true + case "grave": + // GRAVE ACCENT + return rune(0x60), true + case "gscr": + // SCRIPT SMALL G + return rune(0x210a), true + case "gsdot": + // GREATER-THAN WITH DOT + return rune(0x22d7), true + case "gsim": + // GREATER-THAN OR EQUIVALENT TO + return rune(0x2273), true + case "gsime": + // GREATER-THAN ABOVE SIMILAR OR EQUAL + return rune(0x2a8e), true + case "gsiml": + // GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN + return rune(0x2a90), true + case "gtcc": + // GREATER-THAN CLOSED BY CURVE + return rune(0x2aa7), true + case "gtcir": + // GREATER-THAN WITH CIRCLE INSIDE + return rune(0x2a7a), true + case "gtdot": + // GREATER-THAN WITH DOT + return rune(0x22d7), true + case "gtlPar": + // DOUBLE LEFT ARC GREATER-THAN BRACKET + return rune(0x2995), true + case "gtquest": + // GREATER-THAN WITH QUESTION MARK ABOVE + return rune(0x2a7c), true + case "gtrapprox": + // GREATER-THAN OR APPROXIMATE + return rune(0x2a86), true + case "gtrarr": + // GREATER-THAN ABOVE RIGHTWARDS ARROW + return rune(0x2978), true + case "gtrdot": + // GREATER-THAN WITH DOT + return rune(0x22d7), true + case "gtreqless": + // GREATER-THAN EQUAL TO OR LESS-THAN + return rune(0x22db), true + case "gtreqqless": + // GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN + return rune(0x2a8c), true + case "gtrless": + // GREATER-THAN OR LESS-THAN + return rune(0x2277), true + case "gtrpar": + // SPHERICAL ANGLE OPENING LEFT + return rune(0x29a0), true + case "gtrsim": + // GREATER-THAN OR EQUIVALENT TO + return rune(0x2273), true + case "gt": + // GREATER-THAN SIGN + return rune(0x3e), true + case "gvertneqq": + // GREATER-THAN BUT NOT EQUAL TO - with vertical stroke + return rune(0x2269), true + case "gvnE": + // GREATER-THAN BUT NOT EQUAL TO - with vertical stroke + return rune(0x2269), true + } + + case 'h': + switch name { + case "hArr": + // LEFT RIGHT DOUBLE ARROW + return rune(0x21d4), true + case "hairsp": + // HAIR SPACE + return rune(0x200a), true + case "half": + // VULGAR FRACTION ONE HALF + return rune(0xbd), true + case "hamilt": + // SCRIPT CAPITAL H + return rune(0x210b), true + case "hardcy": + // CYRILLIC SMALL LETTER HARD SIGN + return rune(0x044a), true + case "harrw": + // LEFT RIGHT WAVE ARROW + return rune(0x21ad), true + case "harr": + // LEFT RIGHT ARROW + return rune(0x2194), true + case "harrcir": + // LEFT RIGHT ARROW THROUGH SMALL CIRCLE + return rune(0x2948), true + case "hbar": + // PLANCK CONSTANT OVER TWO PI + return rune(0x210f), true + case "hcirc": + // LATIN SMALL LETTER H WITH CIRCUMFLEX + return rune(0x0125), true + case "hearts": + // BLACK HEART SUIT + return rune(0x2665), true + case "heartsuit": + // BLACK HEART SUIT + return rune(0x2665), true + case "hellip": + // HORIZONTAL ELLIPSIS + return rune(0x2026), true + case "hercon": + // HERMITIAN CONJUGATE MATRIX + return rune(0x22b9), true + case "hfr": + // MATHEMATICAL FRAKTUR SMALL H + return rune(0x01d525), true + case "hksearow": + // SOUTH EAST ARROW WITH HOOK + return rune(0x2925), true + case "hkswarow": + // SOUTH WEST ARROW WITH HOOK + return rune(0x2926), true + case "hoarr": + // LEFT RIGHT OPEN-HEADED ARROW + return rune(0x21ff), true + case "homtht": + // HOMOTHETIC + return rune(0x223b), true + case "hookleftarrow": + // LEFTWARDS ARROW WITH HOOK + return rune(0x21a9), true + case "hookrightarrow": + // RIGHTWARDS ARROW WITH HOOK + return rune(0x21aa), true + case "hopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL H + return rune(0x01d559), true + case "horbar": + // HORIZONTAL BAR + return rune(0x2015), true + case "hrglass": + // WHITE HOURGLASS + return rune(0x29d6), true + case "hscr": + // MATHEMATICAL SCRIPT SMALL H + return rune(0x01d4bd), true + case "hslash": + // PLANCK CONSTANT OVER TWO PI + return rune(0x210f), true + case "hstrok": + // LATIN SMALL LETTER H WITH STROKE + return rune(0x0127), true + case "htimes": + // VECTOR OR CROSS PRODUCT + return rune(0x2a2f), true + case "hybull": + // HYPHEN BULLET + return rune(0x2043), true + case "hyphen": + // HYPHEN + return rune(0x2010), true + } + + case 'i': + switch name { + case "iacgr": + // GREEK SMALL LETTER IOTA WITH TONOS + return rune(0x03af), true + case "iacute": + // LATIN SMALL LETTER I WITH ACUTE + return rune(0xed), true + case "ic": + // INVISIBLE SEPARATOR + return rune(0x2063), true + case "icirc": + // LATIN SMALL LETTER I WITH CIRCUMFLEX + return rune(0xee), true + case "icy": + // CYRILLIC SMALL LETTER I + return rune(0x0438), true + case "idiagr": + // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS + return rune(0x0390), true + case "idigr": + // GREEK SMALL LETTER IOTA WITH DIALYTIKA + return rune(0x03ca), true + case "iecy": + // CYRILLIC SMALL LETTER IE + return rune(0x0435), true + case "iexcl": + // INVERTED EXCLAMATION MARK + return rune(0xa1), true + case "iff": + // LEFT RIGHT DOUBLE ARROW + return rune(0x21d4), true + case "ifr": + // MATHEMATICAL FRAKTUR SMALL I + return rune(0x01d526), true + case "igr": + // GREEK SMALL LETTER IOTA + return rune(0x03b9), true + case "igrave": + // LATIN SMALL LETTER I WITH GRAVE + return rune(0xec), true + case "iiint": + // TRIPLE INTEGRAL + return rune(0x222d), true + case "ii": + // DOUBLE-STRUCK ITALIC SMALL I + return rune(0x2148), true + case "iiiint": + // QUADRUPLE INTEGRAL OPERATOR + return rune(0x2a0c), true + case "iinfin": + // INCOMPLETE INFINITY + return rune(0x29dc), true + case "iiota": + // TURNED GREEK SMALL LETTER IOTA + return rune(0x2129), true + case "ijlig": + // LATIN SMALL LIGATURE IJ + return rune(0x0133), true + case "imacr": + // LATIN SMALL LETTER I WITH MACRON + return rune(0x012b), true + case "image": + // BLACK-LETTER CAPITAL I + return rune(0x2111), true + case "imagline": + // SCRIPT CAPITAL I + return rune(0x2110), true + case "imagpart": + // BLACK-LETTER CAPITAL I + return rune(0x2111), true + case "imath": + // LATIN SMALL LETTER DOTLESS I + return rune(0x0131), true + case "imof": + // IMAGE OF + return rune(0x22b7), true + case "imped": + // LATIN CAPITAL LETTER Z WITH STROKE + return rune(0x01b5), true + case "in": + // ELEMENT OF + return rune(0x2208), true + case "incare": + // CARE OF + return rune(0x2105), true + case "infin": + // INFINITY + return rune(0x221e), true + case "infintie": + // TIE OVER INFINITY + return rune(0x29dd), true + case "inodot": + // LATIN SMALL LETTER DOTLESS I + return rune(0x0131), true + case "int": + // INTEGRAL + return rune(0x222b), true + case "intcal": + // INTERCALATE + return rune(0x22ba), true + case "integers": + // DOUBLE-STRUCK CAPITAL Z + return rune(0x2124), true + case "intercal": + // INTERCALATE + return rune(0x22ba), true + case "intlarhk": + // INTEGRAL WITH LEFTWARDS ARROW WITH HOOK + return rune(0x2a17), true + case "intprod": + // INTERIOR PRODUCT + return rune(0x2a3c), true + case "iocy": + // CYRILLIC SMALL LETTER IO + return rune(0x0451), true + case "iogon": + // LATIN SMALL LETTER I WITH OGONEK + return rune(0x012f), true + case "iopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL I + return rune(0x01d55a), true + case "iota": + // GREEK SMALL LETTER IOTA + return rune(0x03b9), true + case "iprod": + // INTERIOR PRODUCT + return rune(0x2a3c), true + case "iprodr": + // RIGHTHAND INTERIOR PRODUCT + return rune(0x2a3d), true + case "iquest": + // INVERTED QUESTION MARK + return rune(0xbf), true + case "iscr": + // MATHEMATICAL SCRIPT SMALL I + return rune(0x01d4be), true + case "isin": + // ELEMENT OF + return rune(0x2208), true + case "isinE": + // ELEMENT OF WITH TWO HORIZONTAL STROKES + return rune(0x22f9), true + case "isindot": + // ELEMENT OF WITH DOT ABOVE + return rune(0x22f5), true + case "isinsv": + // ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE + return rune(0x22f3), true + case "isins": + // SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE + return rune(0x22f4), true + case "isinv": + // ELEMENT OF + return rune(0x2208), true + case "isinvb": + // ELEMENT OF WITH UNDERBAR + return rune(0x22f8), true + case "it": + // INVISIBLE TIMES + return rune(0x2062), true + case "itilde": + // LATIN SMALL LETTER I WITH TILDE + return rune(0x0129), true + case "iukcy": + // CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I + return rune(0x0456), true + case "iuml": + // LATIN SMALL LETTER I WITH DIAERESIS + return rune(0xef), true + } + + case 'j': + switch name { + case "jcirc": + // LATIN SMALL LETTER J WITH CIRCUMFLEX + return rune(0x0135), true + case "jcy": + // CYRILLIC SMALL LETTER SHORT I + return rune(0x0439), true + case "jfr": + // MATHEMATICAL FRAKTUR SMALL J + return rune(0x01d527), true + case "jmath": + // LATIN SMALL LETTER DOTLESS J + return rune(0x0237), true + case "jnodot": + // LATIN SMALL LETTER DOTLESS J + return rune(0x0237), true + case "jopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL J + return rune(0x01d55b), true + case "jscr": + // MATHEMATICAL SCRIPT SMALL J + return rune(0x01d4bf), true + case "jsercy": + // CYRILLIC SMALL LETTER JE + return rune(0x0458), true + case "jukcy": + // CYRILLIC SMALL LETTER UKRAINIAN IE + return rune(0x0454), true + } + + case 'k': + switch name { + case "kappav": + // GREEK KAPPA SYMBOL + return rune(0x03f0), true + case "kappa": + // GREEK SMALL LETTER KAPPA + return rune(0x03ba), true + case "kcedil": + // LATIN SMALL LETTER K WITH CEDILLA + return rune(0x0137), true + case "kcy": + // CYRILLIC SMALL LETTER KA + return rune(0x043a), true + case "kfr": + // MATHEMATICAL FRAKTUR SMALL K + return rune(0x01d528), true + case "kgr": + // GREEK SMALL LETTER KAPPA + return rune(0x03ba), true + case "kgreen": + // LATIN SMALL LETTER KRA + return rune(0x0138), true + case "khcy": + // CYRILLIC SMALL LETTER HA + return rune(0x0445), true + case "khgr": + // GREEK SMALL LETTER CHI + return rune(0x03c7), true + case "kjcy": + // CYRILLIC SMALL LETTER KJE + return rune(0x045c), true + case "kopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL K + return rune(0x01d55c), true + case "koppa": + // GREEK LETTER KOPPA + return rune(0x03de), true + case "kscr": + // MATHEMATICAL SCRIPT SMALL K + return rune(0x01d4c0), true + } + + case 'l': + switch name { + case "lAarr": + // LEFTWARDS TRIPLE ARROW + return rune(0x21da), true + case "lArr": + // LEFTWARDS DOUBLE ARROW + return rune(0x21d0), true + case "lAtail": + // LEFTWARDS DOUBLE ARROW-TAIL + return rune(0x291b), true + case "lBarr": + // LEFTWARDS TRIPLE DASH ARROW + return rune(0x290e), true + case "lE": + // LESS-THAN OVER EQUAL TO + return rune(0x2266), true + case "lEg": + // LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN + return rune(0x2a8b), true + case "lHar": + // LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN + return rune(0x2962), true + case "lacute": + // LATIN SMALL LETTER L WITH ACUTE + return rune(0x013a), true + case "laemptyv": + // EMPTY SET WITH LEFT ARROW ABOVE + return rune(0x29b4), true + case "lagran": + // SCRIPT CAPITAL L + return rune(0x2112), true + case "lambda": + // GREEK SMALL LETTER LAMDA + return rune(0x03bb), true + case "lang": + // MATHEMATICAL LEFT ANGLE BRACKET + return rune(0x27e8), true + case "langd": + // LEFT ANGLE BRACKET WITH DOT + return rune(0x2991), true + case "langle": + // MATHEMATICAL LEFT ANGLE BRACKET + return rune(0x27e8), true + case "lap": + // LESS-THAN OR APPROXIMATE + return rune(0x2a85), true + case "laquo": + // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK + return rune(0xab), true + case "larr2": + // LEFTWARDS PAIRED ARROWS + return rune(0x21c7), true + case "larrb": + // LEFTWARDS ARROW TO BAR + return rune(0x21e4), true + case "larrhk": + // LEFTWARDS ARROW WITH HOOK + return rune(0x21a9), true + case "larrlp": + // LEFTWARDS ARROW WITH LOOP + return rune(0x21ab), true + case "larrtl": + // LEFTWARDS ARROW WITH TAIL + return rune(0x21a2), true + case "larr": + // LEFTWARDS ARROW + return rune(0x2190), true + case "larrbfs": + // LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND + return rune(0x291f), true + case "larrfs": + // LEFTWARDS ARROW TO BLACK DIAMOND + return rune(0x291d), true + case "larrpl": + // LEFT-SIDE ARC ANTICLOCKWISE ARROW + return rune(0x2939), true + case "larrsim": + // LEFTWARDS ARROW ABOVE TILDE OPERATOR + return rune(0x2973), true + case "latail": + // LEFTWARDS ARROW-TAIL + return rune(0x2919), true + case "lat": + // LARGER THAN + return rune(0x2aab), true + case "late": + // LARGER THAN OR EQUAL TO + return rune(0x2aad), true + case "lates": + // LARGER THAN OR slanted EQUAL + return rune(0x2aad), true + case "lbarr": + // LEFTWARDS DOUBLE DASH ARROW + return rune(0x290c), true + case "lbbrk": + // LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT + return rune(0x2772), true + case "lbrace": + // LEFT CURLY BRACKET + return rune(0x7b), true + case "lbrack": + // LEFT SQUARE BRACKET + return rune(0x5b), true + case "lbrke": + // LEFT SQUARE BRACKET WITH UNDERBAR + return rune(0x298b), true + case "lbrksld": + // LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER + return rune(0x298f), true + case "lbrkslu": + // LEFT SQUARE BRACKET WITH TICK IN TOP CORNER + return rune(0x298d), true + case "lcaron": + // LATIN SMALL LETTER L WITH CARON + return rune(0x013e), true + case "lcedil": + // LATIN SMALL LETTER L WITH CEDILLA + return rune(0x013c), true + case "lceil": + // LEFT CEILING + return rune(0x2308), true + case "lcub": + // LEFT CURLY BRACKET + return rune(0x7b), true + case "lcy": + // CYRILLIC SMALL LETTER EL + return rune(0x043b), true + case "ldca": + // ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS + return rune(0x2936), true + case "ldharb": + // LEFTWARDS HARPOON WITH BARB DOWN TO BAR + return rune(0x2956), true + case "ldot": + // LESS-THAN WITH DOT + return rune(0x22d6), true + case "ldquor": + // DOUBLE LOW-9 QUOTATION MARK + return rune(0x201e), true + case "ldquo": + // LEFT DOUBLE QUOTATION MARK + return rune(0x201c), true + case "ldrdhar": + // LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN + return rune(0x2967), true + case "ldrdshar": + // LEFT BARB DOWN RIGHT BARB DOWN HARPOON + return rune(0x2950), true + case "ldrushar": + // LEFT BARB DOWN RIGHT BARB UP HARPOON + return rune(0x294b), true + case "ldsh": + // DOWNWARDS ARROW WITH TIP LEFTWARDS + return rune(0x21b2), true + case "leftarrowtail": + // LEFTWARDS ARROW WITH TAIL + return rune(0x21a2), true + case "leftarrow": + // LEFTWARDS ARROW + return rune(0x2190), true + case "leftharpoondown": + // LEFTWARDS HARPOON WITH BARB DOWNWARDS + return rune(0x21bd), true + case "leftharpoonup": + // LEFTWARDS HARPOON WITH BARB UPWARDS + return rune(0x21bc), true + case "leftleftarrows": + // LEFTWARDS PAIRED ARROWS + return rune(0x21c7), true + case "leftrightarrows": + // LEFTWARDS ARROW OVER RIGHTWARDS ARROW + return rune(0x21c6), true + case "leftrightarrow": + // LEFT RIGHT ARROW + return rune(0x2194), true + case "leftrightharpoons": + // LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON + return rune(0x21cb), true + case "leftrightsquigarrow": + // LEFT RIGHT WAVE ARROW + return rune(0x21ad), true + case "le": + // LESS-THAN OR EQUAL TO + return rune(0x2264), true + case "leftthreetimes": + // LEFT SEMIDIRECT PRODUCT + return rune(0x22cb), true + case "leg": + // LESS-THAN EQUAL TO OR GREATER-THAN + return rune(0x22da), true + case "leq": + // LESS-THAN OR EQUAL TO + return rune(0x2264), true + case "leqq": + // LESS-THAN OVER EQUAL TO + return rune(0x2266), true + case "leqslant": + // LESS-THAN OR SLANTED EQUAL TO + return rune(0x2a7d), true + case "lesg": + // LESS-THAN slanted EQUAL TO OR GREATER-THAN + return rune(0x22da), true + case "lessdot": + // LESS-THAN WITH DOT + return rune(0x22d6), true + case "lesseqgtr": + // LESS-THAN EQUAL TO OR GREATER-THAN + return rune(0x22da), true + case "lessgtr": + // LESS-THAN OR GREATER-THAN + return rune(0x2276), true + case "lesssim": + // LESS-THAN OR EQUIVALENT TO + return rune(0x2272), true + case "les": + // LESS-THAN OR SLANTED EQUAL TO + return rune(0x2a7d), true + case "lescc": + // LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL + return rune(0x2aa8), true + case "lesdot": + // LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE + return rune(0x2a7f), true + case "lesdoto": + // LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE + return rune(0x2a81), true + case "lesdotor": + // LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT + return rune(0x2a83), true + case "lesges": + // LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL + return rune(0x2a93), true + case "lessapprox": + // LESS-THAN OR APPROXIMATE + return rune(0x2a85), true + case "lesseqqgtr": + // LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN + return rune(0x2a8b), true + case "lfbowtie": + // BOWTIE WITH LEFT HALF BLACK + return rune(0x29d1), true + case "lfisht": + // LEFT FISH TAIL + return rune(0x297c), true + case "lfloor": + // LEFT FLOOR + return rune(0x230a), true + case "lfr": + // MATHEMATICAL FRAKTUR SMALL L + return rune(0x01d529), true + case "lftimes": + // TIMES WITH LEFT HALF BLACK + return rune(0x29d4), true + case "lg": + // LESS-THAN OR GREATER-THAN + return rune(0x2276), true + case "lgE": + // LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL + return rune(0x2a91), true + case "lgr": + // GREEK SMALL LETTER LAMDA + return rune(0x03bb), true + case "lhard": + // LEFTWARDS HARPOON WITH BARB DOWNWARDS + return rune(0x21bd), true + case "lharu": + // LEFTWARDS HARPOON WITH BARB UPWARDS + return rune(0x21bc), true + case "lharul": + // LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH + return rune(0x296a), true + case "lhblk": + // LOWER HALF BLOCK + return rune(0x2584), true + case "ljcy": + // CYRILLIC SMALL LETTER LJE + return rune(0x0459), true + case "llarr": + // LEFTWARDS PAIRED ARROWS + return rune(0x21c7), true + case "ll": + // MUCH LESS-THAN + return rune(0x226a), true + case "llcorner": + // BOTTOM LEFT CORNER + return rune(0x231e), true + case "llhard": + // LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH + return rune(0x296b), true + case "lltrif": + // BLACK LOWER LEFT TRIANGLE + return rune(0x25e3), true + case "lltri": + // LOWER LEFT TRIANGLE + return rune(0x25fa), true + case "lmidot": + // LATIN SMALL LETTER L WITH MIDDLE DOT + return rune(0x0140), true + case "lmoust": + // UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION + return rune(0x23b0), true + case "lmoustache": + // UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION + return rune(0x23b0), true + case "lnE": + // LESS-THAN BUT NOT EQUAL TO + return rune(0x2268), true + case "lnap": + // LESS-THAN AND NOT APPROXIMATE + return rune(0x2a89), true + case "lnapprox": + // LESS-THAN AND NOT APPROXIMATE + return rune(0x2a89), true + case "lneqq": + // LESS-THAN BUT NOT EQUAL TO + return rune(0x2268), true + case "lne": + // LESS-THAN AND SINGLE-LINE NOT EQUAL TO + return rune(0x2a87), true + case "lneq": + // LESS-THAN AND SINGLE-LINE NOT EQUAL TO + return rune(0x2a87), true + case "lnsim": + // LESS-THAN BUT NOT EQUIVALENT TO + return rune(0x22e6), true + case "loang": + // MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET + return rune(0x27ec), true + case "loarr": + // LEFTWARDS OPEN-HEADED ARROW + return rune(0x21fd), true + case "lobrk": + // MATHEMATICAL LEFT WHITE SQUARE BRACKET + return rune(0x27e6), true + case "locub": + // LEFT WHITE CURLY BRACKET + return rune(0x2983), true + case "longleftarrow": + // LONG LEFTWARDS ARROW + return rune(0x27f5), true + case "longleftrightarrow": + // LONG LEFT RIGHT ARROW + return rune(0x27f7), true + case "longmapsto": + // LONG RIGHTWARDS ARROW FROM BAR + return rune(0x27fc), true + case "longrightarrow": + // LONG RIGHTWARDS ARROW + return rune(0x27f6), true + case "looparrowleft": + // LEFTWARDS ARROW WITH LOOP + return rune(0x21ab), true + case "looparrowright": + // RIGHTWARDS ARROW WITH LOOP + return rune(0x21ac), true + case "lopar": + // LEFT WHITE PARENTHESIS + return rune(0x2985), true + case "lopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL L + return rune(0x01d55d), true + case "loplus": + // PLUS SIGN IN LEFT HALF CIRCLE + return rune(0x2a2d), true + case "lotimes": + // MULTIPLICATION SIGN IN LEFT HALF CIRCLE + return rune(0x2a34), true + case "lowast": + // LOW ASTERISK + return rune(0x204e), true + case "lowbar": + // LOW LINE + return rune(0x5f), true + case "lowint": + // INTEGRAL WITH UNDERBAR + return rune(0x2a1c), true + case "loz": + // LOZENGE + return rune(0x25ca), true + case "lozenge": + // LOZENGE + return rune(0x25ca), true + case "lozf": + // BLACK LOZENGE + return rune(0x29eb), true + case "lpargt": + // SPHERICAL ANGLE OPENING LEFT + return rune(0x29a0), true + case "lparlt": + // LEFT ARC LESS-THAN BRACKET + return rune(0x2993), true + case "lpar": + // LEFT PARENTHESIS + return rune(0x28), true + case "lrarr2": + // LEFTWARDS ARROW OVER RIGHTWARDS ARROW + return rune(0x21c6), true + case "lrarr": + // LEFTWARDS ARROW OVER RIGHTWARDS ARROW + return rune(0x21c6), true + case "lrcorner": + // BOTTOM RIGHT CORNER + return rune(0x231f), true + case "lrhar": + // LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON + return rune(0x21cb), true + case "lrhar2": + // LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON + return rune(0x21cb), true + case "lrhard": + // RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH + return rune(0x296d), true + case "lrm": + // LEFT-TO-RIGHT MARK + return rune(0x200e), true + case "lrtri": + // RIGHT TRIANGLE + return rune(0x22bf), true + case "lsaquo": + // SINGLE LEFT-POINTING ANGLE QUOTATION MARK + return rune(0x2039), true + case "lscr": + // MATHEMATICAL SCRIPT SMALL L + return rune(0x01d4c1), true + case "lsh": + // UPWARDS ARROW WITH TIP LEFTWARDS + return rune(0x21b0), true + case "lsim": + // LESS-THAN OR EQUIVALENT TO + return rune(0x2272), true + case "lsime": + // LESS-THAN ABOVE SIMILAR OR EQUAL + return rune(0x2a8d), true + case "lsimg": + // LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN + return rune(0x2a8f), true + case "lsqb": + // LEFT SQUARE BRACKET + return rune(0x5b), true + case "lsquor": + // SINGLE LOW-9 QUOTATION MARK + return rune(0x201a), true + case "lsquo": + // LEFT SINGLE QUOTATION MARK + return rune(0x2018), true + case "lstrok": + // LATIN SMALL LETTER L WITH STROKE + return rune(0x0142), true + case "ltcc": + // LESS-THAN CLOSED BY CURVE + return rune(0x2aa6), true + case "ltcir": + // LESS-THAN WITH CIRCLE INSIDE + return rune(0x2a79), true + case "ltdot": + // LESS-THAN WITH DOT + return rune(0x22d6), true + case "lthree": + // LEFT SEMIDIRECT PRODUCT + return rune(0x22cb), true + case "ltimes": + // LEFT NORMAL FACTOR SEMIDIRECT PRODUCT + return rune(0x22c9), true + case "ltlarr": + // LESS-THAN ABOVE LEFTWARDS ARROW + return rune(0x2976), true + case "ltquest": + // LESS-THAN WITH QUESTION MARK ABOVE + return rune(0x2a7b), true + case "ltrPar": + // DOUBLE RIGHT ARC LESS-THAN BRACKET + return rune(0x2996), true + case "ltrie": + // NORMAL SUBGROUP OF OR EQUAL TO + return rune(0x22b4), true + case "ltrif": + // BLACK LEFT-POINTING SMALL TRIANGLE + return rune(0x25c2), true + case "ltri": + // WHITE LEFT-POINTING SMALL TRIANGLE + return rune(0x25c3), true + case "ltrivb": + // LEFT TRIANGLE BESIDE VERTICAL BAR + return rune(0x29cf), true + case "lt": + // LESS-THAN SIGN + return rune(0x3c), true + case "luharb": + // LEFTWARDS HARPOON WITH BARB UP TO BAR + return rune(0x2952), true + case "lurdshar": + // LEFT BARB UP RIGHT BARB DOWN HARPOON + return rune(0x294a), true + case "luruhar": + // LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP + return rune(0x2966), true + case "lurushar": + // LEFT BARB UP RIGHT BARB UP HARPOON + return rune(0x294e), true + case "lvertneqq": + // LESS-THAN BUT NOT EQUAL TO - with vertical stroke + return rune(0x2268), true + case "lvnE": + // LESS-THAN BUT NOT EQUAL TO - with vertical stroke + return rune(0x2268), true + } + + case 'm': + switch name { + case "mDDot": + // GEOMETRIC PROPORTION + return rune(0x223a), true + case "macr": + // MACRON + return rune(0xaf), true + case "male": + // MALE SIGN + return rune(0x2642), true + case "malt": + // MALTESE CROSS + return rune(0x2720), true + case "maltese": + // MALTESE CROSS + return rune(0x2720), true + case "mapstodown": + // DOWNWARDS ARROW FROM BAR + return rune(0x21a7), true + case "mapsto": + // RIGHTWARDS ARROW FROM BAR + return rune(0x21a6), true + case "map": + // RIGHTWARDS ARROW FROM BAR + return rune(0x21a6), true + case "mapstoleft": + // LEFTWARDS ARROW FROM BAR + return rune(0x21a4), true + case "mapstoup": + // UPWARDS ARROW FROM BAR + return rune(0x21a5), true + case "marker": + // BLACK VERTICAL RECTANGLE + return rune(0x25ae), true + case "mcomma": + // MINUS SIGN WITH COMMA ABOVE + return rune(0x2a29), true + case "mcy": + // CYRILLIC SMALL LETTER EM + return rune(0x043c), true + case "mdash": + // EM DASH + return rune(0x2014), true + case "measuredangle": + // MEASURED ANGLE + return rune(0x2221), true + case "mfr": + // MATHEMATICAL FRAKTUR SMALL M + return rune(0x01d52a), true + case "mgr": + // GREEK SMALL LETTER MU + return rune(0x03bc), true + case "mho": + // INVERTED OHM SIGN + return rune(0x2127), true + case "micro": + // MICRO SIGN + return rune(0xb5), true + case "mid": + // DIVIDES + return rune(0x2223), true + case "midast": + // ASTERISK + return rune(0x2a), true + case "midcir": + // VERTICAL LINE WITH CIRCLE BELOW + return rune(0x2af0), true + case "middot": + // MIDDLE DOT + return rune(0xb7), true + case "minus": + // MINUS SIGN + return rune(0x2212), true + case "minusb": + // SQUARED MINUS + return rune(0x229f), true + case "minusd": + // DOT MINUS + return rune(0x2238), true + case "minusdu": + // MINUS SIGN WITH DOT BELOW + return rune(0x2a2a), true + case "mlcp": + // TRANSVERSAL INTERSECTION + return rune(0x2adb), true + case "mldr": + // HORIZONTAL ELLIPSIS + return rune(0x2026), true + case "mnplus": + // MINUS-OR-PLUS SIGN + return rune(0x2213), true + case "models": + // MODELS + return rune(0x22a7), true + case "mopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL M + return rune(0x01d55e), true + case "mp": + // MINUS-OR-PLUS SIGN + return rune(0x2213), true + case "mscr": + // MATHEMATICAL SCRIPT SMALL M + return rune(0x01d4c2), true + case "mstpos": + // INVERTED LAZY S + return rune(0x223e), true + case "multimap": + // MULTIMAP + return rune(0x22b8), true + case "mumap": + // MULTIMAP + return rune(0x22b8), true + case "mu": + // GREEK SMALL LETTER MU + return rune(0x03bc), true + } + + case 'n': + switch name { + case "nGg": + // VERY MUCH GREATER-THAN with slash + return rune(0x22d9), true + case "nGtv": + // MUCH GREATER THAN with slash + return rune(0x226b), true + case "nGt": + // MUCH GREATER THAN with vertical line + return rune(0x226b), true + case "nLeftarrow": + // LEFTWARDS DOUBLE ARROW WITH STROKE + return rune(0x21cd), true + case "nLeftrightarrow": + // LEFT RIGHT DOUBLE ARROW WITH STROKE + return rune(0x21ce), true + case "nLl": + // VERY MUCH LESS-THAN with slash + return rune(0x22d8), true + case "nLtv": + // MUCH LESS THAN with slash + return rune(0x226a), true + case "nLt": + // MUCH LESS THAN with vertical line + return rune(0x226a), true + case "nRightarrow": + // RIGHTWARDS DOUBLE ARROW WITH STROKE + return rune(0x21cf), true + case "nVDash": + // NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE + return rune(0x22af), true + case "nVdash": + // DOES NOT FORCE + return rune(0x22ae), true + case "nabla": + // NABLA + return rune(0x2207), true + case "nacute": + // LATIN SMALL LETTER N WITH ACUTE + return rune(0x0144), true + case "nang": + // ANGLE with vertical line + return rune(0x2220), true + case "nap": + // NOT ALMOST EQUAL TO + return rune(0x2249), true + case "napE": + // APPROXIMATELY EQUAL OR EQUAL TO with slash + return rune(0x2a70), true + case "napid": + // TRIPLE TILDE with slash + return rune(0x224b), true + case "napos": + // LATIN SMALL LETTER N PRECEDED BY APOSTROPHE + return rune(0x0149), true + case "napprox": + // NOT ALMOST EQUAL TO + return rune(0x2249), true + case "naturals": + // DOUBLE-STRUCK CAPITAL N + return rune(0x2115), true + case "natur": + // MUSIC NATURAL SIGN + return rune(0x266e), true + case "natural": + // MUSIC NATURAL SIGN + return rune(0x266e), true + case "nbsp": + // NO-BREAK SPACE + return rune(0xa0), true + case "nbump": + // GEOMETRICALLY EQUIVALENT TO with slash + return rune(0x224e), true + case "nbumpe": + // DIFFERENCE BETWEEN with slash + return rune(0x224f), true + case "ncap": + // INTERSECTION WITH OVERBAR + return rune(0x2a43), true + case "ncaron": + // LATIN SMALL LETTER N WITH CARON + return rune(0x0148), true + case "ncedil": + // LATIN SMALL LETTER N WITH CEDILLA + return rune(0x0146), true + case "ncong": + // NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO + return rune(0x2247), true + case "ncongdot": + // CONGRUENT WITH DOT ABOVE with slash + return rune(0x2a6d), true + case "ncup": + // UNION WITH OVERBAR + return rune(0x2a42), true + case "ncy": + // CYRILLIC SMALL LETTER EN + return rune(0x043d), true + case "ndash": + // EN DASH + return rune(0x2013), true + case "neArr": + // NORTH EAST DOUBLE ARROW + return rune(0x21d7), true + case "nearrow": + // NORTH EAST ARROW + return rune(0x2197), true + case "nearr": + // NORTH EAST ARROW + return rune(0x2197), true + case "nedot": + // APPROACHES THE LIMIT with slash + return rune(0x2250), true + case "nesim": + // MINUS TILDE with slash + return rune(0x2242), true + case "nexist": + // THERE DOES NOT EXIST + return rune(0x2204), true + case "nexists": + // THERE DOES NOT EXIST + return rune(0x2204), true + case "ne": + // NOT EQUAL TO + return rune(0x2260), true + case "nearhk": + // NORTH EAST ARROW WITH HOOK + return rune(0x2924), true + case "neonwarr": + // NORTH EAST ARROW CROSSING NORTH WEST ARROW + return rune(0x2931), true + case "neosearr": + // NORTH EAST ARROW CROSSING SOUTH EAST ARROW + return rune(0x292e), true + case "nequiv": + // NOT IDENTICAL TO + return rune(0x2262), true + case "nesear": + // NORTH EAST ARROW AND SOUTH EAST ARROW + return rune(0x2928), true + case "neswsarr": + // NORTH EAST AND SOUTH WEST ARROW + return rune(0x2922), true + case "nfr": + // MATHEMATICAL FRAKTUR SMALL N + return rune(0x01d52b), true + case "ngE": + // GREATER-THAN OVER EQUAL TO with slash + return rune(0x2267), true + case "ngeqq": + // GREATER-THAN OVER EQUAL TO with slash + return rune(0x2267), true + case "nge": + // NEITHER GREATER-THAN NOR EQUAL TO + return rune(0x2271), true + case "ngeq": + // NEITHER GREATER-THAN NOR EQUAL TO + return rune(0x2271), true + case "ngeqslant": + // GREATER-THAN OR SLANTED EQUAL TO with slash + return rune(0x2a7e), true + case "nges": + // GREATER-THAN OR SLANTED EQUAL TO with slash + return rune(0x2a7e), true + case "ngr": + // GREEK SMALL LETTER NU + return rune(0x03bd), true + case "ngsim": + // NEITHER GREATER-THAN NOR EQUIVALENT TO + return rune(0x2275), true + case "ngt": + // NOT GREATER-THAN + return rune(0x226f), true + case "ngtr": + // NOT GREATER-THAN + return rune(0x226f), true + case "nhArr": + // LEFT RIGHT DOUBLE ARROW WITH STROKE + return rune(0x21ce), true + case "nharr": + // LEFT RIGHT ARROW WITH STROKE + return rune(0x21ae), true + case "nhpar": + // PARALLEL WITH HORIZONTAL STROKE + return rune(0x2af2), true + case "niv": + // CONTAINS AS MEMBER + return rune(0x220b), true + case "ni": + // CONTAINS AS MEMBER + return rune(0x220b), true + case "nisd": + // CONTAINS WITH LONG HORIZONTAL STROKE + return rune(0x22fa), true + case "nis": + // SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE + return rune(0x22fc), true + case "njcy": + // CYRILLIC SMALL LETTER NJE + return rune(0x045a), true + case "nlArr": + // LEFTWARDS DOUBLE ARROW WITH STROKE + return rune(0x21cd), true + case "nlE": + // LESS-THAN OVER EQUAL TO with slash + return rune(0x2266), true + case "nlarr": + // LEFTWARDS ARROW WITH STROKE + return rune(0x219a), true + case "nldr": + // TWO DOT LEADER + return rune(0x2025), true + case "nleftarrow": + // LEFTWARDS ARROW WITH STROKE + return rune(0x219a), true + case "nleftrightarrow": + // LEFT RIGHT ARROW WITH STROKE + return rune(0x21ae), true + case "nleqq": + // LESS-THAN OVER EQUAL TO with slash + return rune(0x2266), true + case "nless": + // NOT LESS-THAN + return rune(0x226e), true + case "nle": + // NEITHER LESS-THAN NOR EQUAL TO + return rune(0x2270), true + case "nleq": + // NEITHER LESS-THAN NOR EQUAL TO + return rune(0x2270), true + case "nleqslant": + // LESS-THAN OR SLANTED EQUAL TO with slash + return rune(0x2a7d), true + case "nles": + // LESS-THAN OR SLANTED EQUAL TO with slash + return rune(0x2a7d), true + case "nlsim": + // NEITHER LESS-THAN NOR EQUIVALENT TO + return rune(0x2274), true + case "nlt": + // NOT LESS-THAN + return rune(0x226e), true + case "nltri": + // NOT NORMAL SUBGROUP OF + return rune(0x22ea), true + case "nltrie": + // NOT NORMAL SUBGROUP OF OR EQUAL TO + return rune(0x22ec), true + case "nltrivb": + // LEFT TRIANGLE BESIDE VERTICAL BAR with slash + return rune(0x29cf), true + case "nmid": + // DOES NOT DIVIDE + return rune(0x2224), true + case "nopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL N + return rune(0x01d55f), true + case "notin": + // NOT AN ELEMENT OF + return rune(0x2209), true + case "notinE": + // ELEMENT OF WITH TWO HORIZONTAL STROKES with slash + return rune(0x22f9), true + case "notindot": + // ELEMENT OF WITH DOT ABOVE with slash + return rune(0x22f5), true + case "notinva": + // NOT AN ELEMENT OF + return rune(0x2209), true + case "notinvb": + // SMALL ELEMENT OF WITH OVERBAR + return rune(0x22f7), true + case "notinvc": + // ELEMENT OF WITH OVERBAR + return rune(0x22f6), true + case "notni": + // DOES NOT CONTAIN AS MEMBER + return rune(0x220c), true + case "notniva": + // DOES NOT CONTAIN AS MEMBER + return rune(0x220c), true + case "notnivb": + // SMALL CONTAINS WITH OVERBAR + return rune(0x22fe), true + case "notnivc": + // CONTAINS WITH OVERBAR + return rune(0x22fd), true + case "not": + // NOT SIGN + return rune(0xac), true + case "npart": + // PARTIAL DIFFERENTIAL with slash + return rune(0x2202), true + case "npar": + // NOT PARALLEL TO + return rune(0x2226), true + case "nparallel": + // NOT PARALLEL TO + return rune(0x2226), true + case "nparsl": + // DOUBLE SOLIDUS OPERATOR with reverse slash + return rune(0x2afd), true + case "npolint": + // LINE INTEGRATION NOT INCLUDING THE POLE + return rune(0x2a14), true + case "nprsim": + // PRECEDES OR EQUIVALENT TO with slash + return rune(0x227e), true + case "npr": + // DOES NOT PRECEDE + return rune(0x2280), true + case "nprcue": + // DOES NOT PRECEDE OR EQUAL + return rune(0x22e0), true + case "nprec": + // DOES NOT PRECEDE + return rune(0x2280), true + case "npre": + // PRECEDES ABOVE SINGLE-LINE EQUALS SIGN with slash + return rune(0x2aaf), true + case "npreceq": + // PRECEDES ABOVE SINGLE-LINE EQUALS SIGN with slash + return rune(0x2aaf), true + case "nrArr": + // RIGHTWARDS DOUBLE ARROW WITH STROKE + return rune(0x21cf), true + case "nrarrw": + // RIGHTWARDS WAVE ARROW with slash + return rune(0x219d), true + case "nrarr": + // RIGHTWARDS ARROW WITH STROKE + return rune(0x219b), true + case "nrarrc": + // WAVE ARROW POINTING DIRECTLY RIGHT with slash + return rune(0x2933), true + case "nrightarrow": + // RIGHTWARDS ARROW WITH STROKE + return rune(0x219b), true + case "nrtri": + // DOES NOT CONTAIN AS NORMAL SUBGROUP + return rune(0x22eb), true + case "nrtrie": + // DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL + return rune(0x22ed), true + case "nsGt": + // DOUBLE NESTED GREATER-THAN with slash + return rune(0x2aa2), true + case "nsLt": + // DOUBLE NESTED LESS-THAN with slash + return rune(0x2aa1), true + case "nscsim": + // SUCCEEDS OR EQUIVALENT TO with slash + return rune(0x227f), true + case "nsc": + // DOES NOT SUCCEED + return rune(0x2281), true + case "nsccue": + // DOES NOT SUCCEED OR EQUAL + return rune(0x22e1), true + case "nsce": + // SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN with slash + return rune(0x2ab0), true + case "nscr": + // MATHEMATICAL SCRIPT SMALL N + return rune(0x01d4c3), true + case "nshortmid": + // DOES NOT DIVIDE + return rune(0x2224), true + case "nshortparallel": + // NOT PARALLEL TO + return rune(0x2226), true + case "nsim": + // NOT TILDE + return rune(0x2241), true + case "nsime": + // NOT ASYMPTOTICALLY EQUAL TO + return rune(0x2244), true + case "nsimeq": + // NOT ASYMPTOTICALLY EQUAL TO + return rune(0x2244), true + case "nsmid": + // DOES NOT DIVIDE + return rune(0x2224), true + case "nspar": + // NOT PARALLEL TO + return rune(0x2226), true + case "nsqsub": + // SQUARE IMAGE OF with slash + return rune(0x228f), true + case "nsqsube": + // NOT SQUARE IMAGE OF OR EQUAL TO + return rune(0x22e2), true + case "nsqsup": + // SQUARE ORIGINAL OF with slash + return rune(0x2290), true + case "nsqsupe": + // NOT SQUARE ORIGINAL OF OR EQUAL TO + return rune(0x22e3), true + case "nsubset": + // SUBSET OF with vertical line + return rune(0x2282), true + case "nsub": + // NOT A SUBSET OF + return rune(0x2284), true + case "nsubE": + // SUBSET OF ABOVE EQUALS SIGN with slash + return rune(0x2ac5), true + case "nsube": + // NEITHER A SUBSET OF NOR EQUAL TO + return rune(0x2288), true + case "nsubseteq": + // NEITHER A SUBSET OF NOR EQUAL TO + return rune(0x2288), true + case "nsubseteqq": + // SUBSET OF ABOVE EQUALS SIGN with slash + return rune(0x2ac5), true + case "nsucc": + // DOES NOT SUCCEED + return rune(0x2281), true + case "nsucceq": + // SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN with slash + return rune(0x2ab0), true + case "nsupset": + // SUPERSET OF with vertical line + return rune(0x2283), true + case "nsup": + // NOT A SUPERSET OF + return rune(0x2285), true + case "nsupE": + // SUPERSET OF ABOVE EQUALS SIGN with slash + return rune(0x2ac6), true + case "nsupe": + // NEITHER A SUPERSET OF NOR EQUAL TO + return rune(0x2289), true + case "nsupseteq": + // NEITHER A SUPERSET OF NOR EQUAL TO + return rune(0x2289), true + case "nsupseteqq": + // SUPERSET OF ABOVE EQUALS SIGN with slash + return rune(0x2ac6), true + case "ntgl": + // NEITHER GREATER-THAN NOR LESS-THAN + return rune(0x2279), true + case "ntilde": + // LATIN SMALL LETTER N WITH TILDE + return rune(0xf1), true + case "ntlg": + // NEITHER LESS-THAN NOR GREATER-THAN + return rune(0x2278), true + case "ntriangleleft": + // NOT NORMAL SUBGROUP OF + return rune(0x22ea), true + case "ntrianglelefteq": + // NOT NORMAL SUBGROUP OF OR EQUAL TO + return rune(0x22ec), true + case "ntriangleright": + // DOES NOT CONTAIN AS NORMAL SUBGROUP + return rune(0x22eb), true + case "ntrianglerighteq": + // DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL + return rune(0x22ed), true + case "numero": + // NUMERO SIGN + return rune(0x2116), true + case "numsp": + // FIGURE SPACE + return rune(0x2007), true + case "nu": + // GREEK SMALL LETTER NU + return rune(0x03bd), true + case "num": + // NUMBER SIGN + return rune(0x23), true + case "nvDash": + // NOT TRUE + return rune(0x22ad), true + case "nvHarr": + // LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE + return rune(0x2904), true + case "nvap": + // EQUIVALENT TO with vertical line + return rune(0x224d), true + case "nvbrtri": + // VERTICAL BAR BESIDE RIGHT TRIANGLE with slash + return rune(0x29d0), true + case "nvdash": + // DOES NOT PROVE + return rune(0x22ac), true + case "nvge": + // GREATER-THAN OR EQUAL TO with vertical line + return rune(0x2265), true + case "nvgt": + // GREATER-THAN SIGN with vertical line + return rune(0x3e), true + case "nvinfin": + // INFINITY NEGATED WITH VERTICAL BAR + return rune(0x29de), true + case "nvlArr": + // LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE + return rune(0x2902), true + case "nvle": + // LESS-THAN OR EQUAL TO with vertical line + return rune(0x2264), true + case "nvltrie": + // NORMAL SUBGROUP OF OR EQUAL TO with vertical line + return rune(0x22b4), true + case "nvlt": + // LESS-THAN SIGN with vertical line + return rune(0x3c), true + case "nvrArr": + // RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE + return rune(0x2903), true + case "nvrtrie": + // CONTAINS AS NORMAL SUBGROUP OR EQUAL TO with vertical line + return rune(0x22b5), true + case "nvsim": + // TILDE OPERATOR with vertical line + return rune(0x223c), true + case "nwArr": + // NORTH WEST DOUBLE ARROW + return rune(0x21d6), true + case "nwarhk": + // NORTH WEST ARROW WITH HOOK + return rune(0x2923), true + case "nwarrow": + // NORTH WEST ARROW + return rune(0x2196), true + case "nwarr": + // NORTH WEST ARROW + return rune(0x2196), true + case "nwnear": + // NORTH WEST ARROW AND NORTH EAST ARROW + return rune(0x2927), true + case "nwonearr": + // NORTH WEST ARROW CROSSING NORTH EAST ARROW + return rune(0x2932), true + case "nwsesarr": + // NORTH WEST AND SOUTH EAST ARROW + return rune(0x2921), true + } + + case 'o': + switch name { + case "oS": + // CIRCLED LATIN CAPITAL LETTER S + return rune(0x24c8), true + case "oacgr": + // GREEK SMALL LETTER OMICRON WITH TONOS + return rune(0x03cc), true + case "oacute": + // LATIN SMALL LETTER O WITH ACUTE + return rune(0xf3), true + case "oast": + // CIRCLED ASTERISK OPERATOR + return rune(0x229b), true + case "obsol": + // CIRCLED REVERSE SOLIDUS + return rune(0x29b8), true + case "ocir": + // CIRCLED RING OPERATOR + return rune(0x229a), true + case "ocirc": + // LATIN SMALL LETTER O WITH CIRCUMFLEX + return rune(0xf4), true + case "ocy": + // CYRILLIC SMALL LETTER O + return rune(0x043e), true + case "odash": + // CIRCLED DASH + return rune(0x229d), true + case "odblac": + // LATIN SMALL LETTER O WITH DOUBLE ACUTE + return rune(0x0151), true + case "odiv": + // CIRCLED DIVISION SIGN + return rune(0x2a38), true + case "odot": + // CIRCLED DOT OPERATOR + return rune(0x2299), true + case "odsold": + // CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN + return rune(0x29bc), true + case "oelig": + // LATIN SMALL LIGATURE OE + return rune(0x0153), true + case "ofcir": + // CIRCLED BULLET + return rune(0x29bf), true + case "ofr": + // MATHEMATICAL FRAKTUR SMALL O + return rune(0x01d52c), true + case "ogon": + // OGONEK + return rune(0x02db), true + case "ogr": + // GREEK SMALL LETTER OMICRON + return rune(0x03bf), true + case "ograve": + // LATIN SMALL LETTER O WITH GRAVE + return rune(0xf2), true + case "ogt": + // CIRCLED GREATER-THAN + return rune(0x29c1), true + case "ohacgr": + // GREEK SMALL LETTER OMEGA WITH TONOS + return rune(0x03ce), true + case "ohbar": + // CIRCLE WITH HORIZONTAL BAR + return rune(0x29b5), true + case "ohgr": + // GREEK SMALL LETTER OMEGA + return rune(0x03c9), true + case "ohm": + // GREEK CAPITAL LETTER OMEGA + return rune(0x03a9), true + case "oint": + // CONTOUR INTEGRAL + return rune(0x222e), true + case "olarr": + // ANTICLOCKWISE OPEN CIRCLE ARROW + return rune(0x21ba), true + case "olcir": + // CIRCLED WHITE BULLET + return rune(0x29be), true + case "olcross": + // CIRCLE WITH SUPERIMPOSED X + return rune(0x29bb), true + case "oline": + // OVERLINE + return rune(0x203e), true + case "olt": + // CIRCLED LESS-THAN + return rune(0x29c0), true + case "omacr": + // LATIN SMALL LETTER O WITH MACRON + return rune(0x014d), true + case "omega": + // GREEK SMALL LETTER OMEGA + return rune(0x03c9), true + case "omicron": + // GREEK SMALL LETTER OMICRON + return rune(0x03bf), true + case "omid": + // CIRCLED VERTICAL BAR + return rune(0x29b6), true + case "ominus": + // CIRCLED MINUS + return rune(0x2296), true + case "oopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL O + return rune(0x01d560), true + case "opar": + // CIRCLED PARALLEL + return rune(0x29b7), true + case "operp": + // CIRCLED PERPENDICULAR + return rune(0x29b9), true + case "opfgamma": + // DOUBLE-STRUCK SMALL GAMMA + return rune(0x213d), true + case "opfpi": + // DOUBLE-STRUCK CAPITAL PI + return rune(0x213f), true + case "opfsum": + // DOUBLE-STRUCK N-ARY SUMMATION + return rune(0x2140), true + case "oplus": + // CIRCLED PLUS + return rune(0x2295), true + case "orarr": + // CLOCKWISE OPEN CIRCLE ARROW + return rune(0x21bb), true + case "or": + // LOGICAL OR + return rune(0x2228), true + case "orderof": + // SCRIPT SMALL O + return rune(0x2134), true + case "order": + // SCRIPT SMALL O + return rune(0x2134), true + case "ord": + // LOGICAL OR WITH HORIZONTAL DASH + return rune(0x2a5d), true + case "ordf": + // FEMININE ORDINAL INDICATOR + return rune(0xaa), true + case "ordm": + // MASCULINE ORDINAL INDICATOR + return rune(0xba), true + case "origof": + // ORIGINAL OF + return rune(0x22b6), true + case "oror": + // TWO INTERSECTING LOGICAL OR + return rune(0x2a56), true + case "orslope": + // SLOPING LARGE OR + return rune(0x2a57), true + case "orv": + // LOGICAL OR WITH MIDDLE STEM + return rune(0x2a5b), true + case "oscr": + // SCRIPT SMALL O + return rune(0x2134), true + case "oslash": + // LATIN SMALL LETTER O WITH STROKE + return rune(0xf8), true + case "osol": + // CIRCLED DIVISION SLASH + return rune(0x2298), true + case "otilde": + // LATIN SMALL LETTER O WITH TILDE + return rune(0xf5), true + case "otimes": + // CIRCLED TIMES + return rune(0x2297), true + case "otimesas": + // CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT + return rune(0x2a36), true + case "ouml": + // LATIN SMALL LETTER O WITH DIAERESIS + return rune(0xf6), true + case "ovbar": + // APL FUNCTIONAL SYMBOL CIRCLE STILE + return rune(0x233d), true + case "ovrbrk": + // TOP SQUARE BRACKET + return rune(0x23b4), true + case "ovrcub": + // TOP CURLY BRACKET + return rune(0x23de), true + case "ovrpar": + // TOP PARENTHESIS + return rune(0x23dc), true + case "oxuarr": + // UP ARROW THROUGH CIRCLE + return rune(0x29bd), true + } + + case 'p': + switch name { + case "part": + // PARTIAL DIFFERENTIAL + return rune(0x2202), true + case "par": + // PARALLEL TO + return rune(0x2225), true + case "parallel": + // PARALLEL TO + return rune(0x2225), true + case "para": + // PILCROW SIGN + return rune(0xb6), true + case "parsim": + // PARALLEL WITH TILDE OPERATOR + return rune(0x2af3), true + case "parsl": + // DOUBLE SOLIDUS OPERATOR + return rune(0x2afd), true + case "pcy": + // CYRILLIC SMALL LETTER PE + return rune(0x043f), true + case "percnt": + // PERCENT SIGN + return rune(0x25), true + case "period": + // FULL STOP + return rune(0x2e), true + case "permil": + // PER MILLE SIGN + return rune(0x2030), true + case "perp": + // UP TACK + return rune(0x22a5), true + case "pertenk": + // PER TEN THOUSAND SIGN + return rune(0x2031), true + case "pfr": + // MATHEMATICAL FRAKTUR SMALL P + return rune(0x01d52d), true + case "pgr": + // GREEK SMALL LETTER PI + return rune(0x03c0), true + case "phgr": + // GREEK SMALL LETTER PHI + return rune(0x03c6), true + case "phis": + // GREEK PHI SYMBOL + return rune(0x03d5), true + case "phiv": + // GREEK PHI SYMBOL + return rune(0x03d5), true + case "phi": + // GREEK SMALL LETTER PHI + return rune(0x03c6), true + case "phmmat": + // SCRIPT CAPITAL M + return rune(0x2133), true + case "phone": + // BLACK TELEPHONE + return rune(0x260e), true + case "pitchfork": + // PITCHFORK + return rune(0x22d4), true + case "piv": + // GREEK PI SYMBOL + return rune(0x03d6), true + case "pi": + // GREEK SMALL LETTER PI + return rune(0x03c0), true + case "planck": + // PLANCK CONSTANT OVER TWO PI + return rune(0x210f), true + case "planckh": + // PLANCK CONSTANT + return rune(0x210e), true + case "plankv": + // PLANCK CONSTANT OVER TWO PI + return rune(0x210f), true + case "plusacir": + // PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE + return rune(0x2a23), true + case "plusb": + // SQUARED PLUS + return rune(0x229e), true + case "pluscir": + // PLUS SIGN WITH SMALL CIRCLE ABOVE + return rune(0x2a22), true + case "plusdo": + // DOT PLUS + return rune(0x2214), true + case "plusdu": + // PLUS SIGN WITH DOT BELOW + return rune(0x2a25), true + case "pluse": + // PLUS SIGN ABOVE EQUALS SIGN + return rune(0x2a72), true + case "plusmn": + // PLUS-MINUS SIGN + return rune(0xb1), true + case "plussim": + // PLUS SIGN WITH TILDE BELOW + return rune(0x2a26), true + case "plustrif": + // PLUS SIGN WITH BLACK TRIANGLE + return rune(0x2a28), true + case "plustwo": + // PLUS SIGN WITH SUBSCRIPT TWO + return rune(0x2a27), true + case "plus": + // PLUS SIGN + return rune(0x2b), true + case "pm": + // PLUS-MINUS SIGN + return rune(0xb1), true + case "pointint": + // INTEGRAL AROUND A POINT OPERATOR + return rune(0x2a15), true + case "popf": + // MATHEMATICAL DOUBLE-STRUCK SMALL P + return rune(0x01d561), true + case "pound": + // POUND SIGN + return rune(0xa3), true + case "prod": + // N-ARY PRODUCT + return rune(0x220f), true + case "prop": + // PROPORTIONAL TO + return rune(0x221d), true + case "propto": + // PROPORTIONAL TO + return rune(0x221d), true + case "pr": + // PRECEDES + return rune(0x227a), true + case "prE": + // PRECEDES ABOVE EQUALS SIGN + return rune(0x2ab3), true + case "prap": + // PRECEDES ABOVE ALMOST EQUAL TO + return rune(0x2ab7), true + case "prcue": + // PRECEDES OR EQUAL TO + return rune(0x227c), true + case "prec": + // PRECEDES + return rune(0x227a), true + case "preccurlyeq": + // PRECEDES OR EQUAL TO + return rune(0x227c), true + case "precnsim": + // PRECEDES BUT NOT EQUIVALENT TO + return rune(0x22e8), true + case "precsim": + // PRECEDES OR EQUIVALENT TO + return rune(0x227e), true + case "pre": + // PRECEDES ABOVE SINGLE-LINE EQUALS SIGN + return rune(0x2aaf), true + case "precapprox": + // PRECEDES ABOVE ALMOST EQUAL TO + return rune(0x2ab7), true + case "preceq": + // PRECEDES ABOVE SINGLE-LINE EQUALS SIGN + return rune(0x2aaf), true + case "precnapprox": + // PRECEDES ABOVE NOT ALMOST EQUAL TO + return rune(0x2ab9), true + case "precneqq": + // PRECEDES ABOVE NOT EQUAL TO + return rune(0x2ab5), true + case "primes": + // DOUBLE-STRUCK CAPITAL P + return rune(0x2119), true + case "prime": + // PRIME + return rune(0x2032), true + case "prnE": + // PRECEDES ABOVE NOT EQUAL TO + return rune(0x2ab5), true + case "prnap": + // PRECEDES ABOVE NOT ALMOST EQUAL TO + return rune(0x2ab9), true + case "prnsim": + // PRECEDES BUT NOT EQUIVALENT TO + return rune(0x22e8), true + case "profalar": + // ALL AROUND-PROFILE + return rune(0x232e), true + case "profline": + // ARC + return rune(0x2312), true + case "profsurf": + // SEGMENT + return rune(0x2313), true + case "prsim": + // PRECEDES OR EQUIVALENT TO + return rune(0x227e), true + case "prurel": + // PRECEDES UNDER RELATION + return rune(0x22b0), true + case "pscr": + // MATHEMATICAL SCRIPT SMALL P + return rune(0x01d4c5), true + case "psgr": + // GREEK SMALL LETTER PSI + return rune(0x03c8), true + case "psi": + // GREEK SMALL LETTER PSI + return rune(0x03c8), true + case "puncsp": + // PUNCTUATION SPACE + return rune(0x2008), true + } + + case 'q': + switch name { + case "qfr": + // MATHEMATICAL FRAKTUR SMALL Q + return rune(0x01d52e), true + case "qint": + // QUADRUPLE INTEGRAL OPERATOR + return rune(0x2a0c), true + case "qopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL Q + return rune(0x01d562), true + case "qprime": + // QUADRUPLE PRIME + return rune(0x2057), true + case "qscr": + // MATHEMATICAL SCRIPT SMALL Q + return rune(0x01d4c6), true + case "quaternions": + // DOUBLE-STRUCK CAPITAL H + return rune(0x210d), true + case "quatint": + // QUATERNION INTEGRAL OPERATOR + return rune(0x2a16), true + case "questeq": + // QUESTIONED EQUAL TO + return rune(0x225f), true + case "quest": + // QUESTION MARK + return rune(0x3f), true + case "quot": + // QUOTATION MARK + return rune(0x22), true + } + + case 'r': + switch name { + case "rAarr": + // RIGHTWARDS TRIPLE ARROW + return rune(0x21db), true + case "rArr": + // RIGHTWARDS DOUBLE ARROW + return rune(0x21d2), true + case "rAtail": + // RIGHTWARDS DOUBLE ARROW-TAIL + return rune(0x291c), true + case "rBarr": + // RIGHTWARDS TRIPLE DASH ARROW + return rune(0x290f), true + case "rHar": + // RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN + return rune(0x2964), true + case "race": + // REVERSED TILDE with underline + return rune(0x223d), true + case "racute": + // LATIN SMALL LETTER R WITH ACUTE + return rune(0x0155), true + case "radic": + // SQUARE ROOT + return rune(0x221a), true + case "raemptyv": + // EMPTY SET WITH RIGHT ARROW ABOVE + return rune(0x29b3), true + case "rang": + // MATHEMATICAL RIGHT ANGLE BRACKET + return rune(0x27e9), true + case "rangd": + // RIGHT ANGLE BRACKET WITH DOT + return rune(0x2992), true + case "range": + // REVERSED ANGLE WITH UNDERBAR + return rune(0x29a5), true + case "rangle": + // MATHEMATICAL RIGHT ANGLE BRACKET + return rune(0x27e9), true + case "raquo": + // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + return rune(0xbb), true + case "rarr2": + // RIGHTWARDS PAIRED ARROWS + return rune(0x21c9), true + case "rarr3": + // THREE RIGHTWARDS ARROWS + return rune(0x21f6), true + case "rarrb": + // RIGHTWARDS ARROW TO BAR + return rune(0x21e5), true + case "rarrhk": + // RIGHTWARDS ARROW WITH HOOK + return rune(0x21aa), true + case "rarrlp": + // RIGHTWARDS ARROW WITH LOOP + return rune(0x21ac), true + case "rarrtl": + // RIGHTWARDS ARROW WITH TAIL + return rune(0x21a3), true + case "rarrw": + // RIGHTWARDS WAVE ARROW + return rune(0x219d), true + case "rarr": + // RIGHTWARDS ARROW + return rune(0x2192), true + case "rarrap": + // RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO + return rune(0x2975), true + case "rarrbfs": + // RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND + return rune(0x2920), true + case "rarrc": + // WAVE ARROW POINTING DIRECTLY RIGHT + return rune(0x2933), true + case "rarrfs": + // RIGHTWARDS ARROW TO BLACK DIAMOND + return rune(0x291e), true + case "rarrpl": + // RIGHTWARDS ARROW WITH PLUS BELOW + return rune(0x2945), true + case "rarrsim": + // RIGHTWARDS ARROW ABOVE TILDE OPERATOR + return rune(0x2974), true + case "rarrx": + // RIGHTWARDS ARROW THROUGH X + return rune(0x2947), true + case "ratail": + // RIGHTWARDS ARROW-TAIL + return rune(0x291a), true + case "ratio": + // RATIO + return rune(0x2236), true + case "rationals": + // DOUBLE-STRUCK CAPITAL Q + return rune(0x211a), true + case "rbarr": + // RIGHTWARDS DOUBLE DASH ARROW + return rune(0x290d), true + case "rbbrk": + // LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT + return rune(0x2773), true + case "rbrace": + // RIGHT CURLY BRACKET + return rune(0x7d), true + case "rbrack": + // RIGHT SQUARE BRACKET + return rune(0x5d), true + case "rbrke": + // RIGHT SQUARE BRACKET WITH UNDERBAR + return rune(0x298c), true + case "rbrksld": + // RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER + return rune(0x298e), true + case "rbrkslu": + // RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER + return rune(0x2990), true + case "rcaron": + // LATIN SMALL LETTER R WITH CARON + return rune(0x0159), true + case "rcedil": + // LATIN SMALL LETTER R WITH CEDILLA + return rune(0x0157), true + case "rceil": + // RIGHT CEILING + return rune(0x2309), true + case "rcub": + // RIGHT CURLY BRACKET + return rune(0x7d), true + case "rcy": + // CYRILLIC SMALL LETTER ER + return rune(0x0440), true + case "rdca": + // ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS + return rune(0x2937), true + case "rdharb": + // RIGHTWARDS HARPOON WITH BARB DOWN TO BAR + return rune(0x2957), true + case "rdiag": + // BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT + return rune(0x2571), true + case "rdiofdi": + // RISING DIAGONAL CROSSING FALLING DIAGONAL + return rune(0x292b), true + case "rdldhar": + // RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN + return rune(0x2969), true + case "rdosearr": + // RISING DIAGONAL CROSSING SOUTH EAST ARROW + return rune(0x2930), true + case "rdquor": + // RIGHT DOUBLE QUOTATION MARK + return rune(0x201d), true + case "rdquo": + // RIGHT DOUBLE QUOTATION MARK + return rune(0x201d), true + case "rdsh": + // DOWNWARDS ARROW WITH TIP RIGHTWARDS + return rune(0x21b3), true + case "realpart": + // BLACK-LETTER CAPITAL R + return rune(0x211c), true + case "reals": + // DOUBLE-STRUCK CAPITAL R + return rune(0x211d), true + case "real": + // BLACK-LETTER CAPITAL R + return rune(0x211c), true + case "realine": + // SCRIPT CAPITAL R + return rune(0x211b), true + case "rect": + // WHITE RECTANGLE + return rune(0x25ad), true + case "reg": + // REGISTERED SIGN + return rune(0xae), true + case "rfbowtie": + // BOWTIE WITH RIGHT HALF BLACK + return rune(0x29d2), true + case "rfisht": + // RIGHT FISH TAIL + return rune(0x297d), true + case "rfloor": + // RIGHT FLOOR + return rune(0x230b), true + case "rfr": + // MATHEMATICAL FRAKTUR SMALL R + return rune(0x01d52f), true + case "rftimes": + // TIMES WITH RIGHT HALF BLACK + return rune(0x29d5), true + case "rgr": + // GREEK SMALL LETTER RHO + return rune(0x03c1), true + case "rhard": + // RIGHTWARDS HARPOON WITH BARB DOWNWARDS + return rune(0x21c1), true + case "rharu": + // RIGHTWARDS HARPOON WITH BARB UPWARDS + return rune(0x21c0), true + case "rharul": + // RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH + return rune(0x296c), true + case "rhov": + // GREEK RHO SYMBOL + return rune(0x03f1), true + case "rho": + // GREEK SMALL LETTER RHO + return rune(0x03c1), true + case "rightarrowtail": + // RIGHTWARDS ARROW WITH TAIL + return rune(0x21a3), true + case "rightarrow": + // RIGHTWARDS ARROW + return rune(0x2192), true + case "rightharpoondown": + // RIGHTWARDS HARPOON WITH BARB DOWNWARDS + return rune(0x21c1), true + case "rightharpoonup": + // RIGHTWARDS HARPOON WITH BARB UPWARDS + return rune(0x21c0), true + case "rightleftarrows": + // RIGHTWARDS ARROW OVER LEFTWARDS ARROW + return rune(0x21c4), true + case "rightleftharpoons": + // RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON + return rune(0x21cc), true + case "rightrightarrows": + // RIGHTWARDS PAIRED ARROWS + return rune(0x21c9), true + case "rightsquigarrow": + // RIGHTWARDS WAVE ARROW + return rune(0x219d), true + case "rightthreetimes": + // RIGHT SEMIDIRECT PRODUCT + return rune(0x22cc), true + case "rimply": + // RIGHT DOUBLE ARROW WITH ROUNDED HEAD + return rune(0x2970), true + case "ring": + // RING ABOVE + return rune(0x02da), true + case "risingdotseq": + // IMAGE OF OR APPROXIMATELY EQUAL TO + return rune(0x2253), true + case "rlarr2": + // RIGHTWARDS ARROW OVER LEFTWARDS ARROW + return rune(0x21c4), true + case "rlarr": + // RIGHTWARDS ARROW OVER LEFTWARDS ARROW + return rune(0x21c4), true + case "rlhar": + // RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON + return rune(0x21cc), true + case "rlhar2": + // RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON + return rune(0x21cc), true + case "rlm": + // RIGHT-TO-LEFT MARK + return rune(0x200f), true + case "rmoust": + // UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION + return rune(0x23b1), true + case "rmoustache": + // UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION + return rune(0x23b1), true + case "rnmid": + // DOES NOT DIVIDE WITH REVERSED NEGATION SLASH + return rune(0x2aee), true + case "roang": + // MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET + return rune(0x27ed), true + case "roarr": + // RIGHTWARDS OPEN-HEADED ARROW + return rune(0x21fe), true + case "robrk": + // MATHEMATICAL RIGHT WHITE SQUARE BRACKET + return rune(0x27e7), true + case "rocub": + // RIGHT WHITE CURLY BRACKET + return rune(0x2984), true + case "ropar": + // RIGHT WHITE PARENTHESIS + return rune(0x2986), true + case "ropf": + // MATHEMATICAL DOUBLE-STRUCK SMALL R + return rune(0x01d563), true + case "roplus": + // PLUS SIGN IN RIGHT HALF CIRCLE + return rune(0x2a2e), true + case "rotimes": + // MULTIPLICATION SIGN IN RIGHT HALF CIRCLE + return rune(0x2a35), true + case "rpargt": + // RIGHT ARC GREATER-THAN BRACKET + return rune(0x2994), true + case "rpar": + // RIGHT PARENTHESIS + return rune(0x29), true + case "rppolint": + // LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE + return rune(0x2a12), true + case "rrarr": + // RIGHTWARDS PAIRED ARROWS + return rune(0x21c9), true + case "rsaquo": + // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK + return rune(0x203a), true + case "rscr": + // MATHEMATICAL SCRIPT SMALL R + return rune(0x01d4c7), true + case "rsh": + // UPWARDS ARROW WITH TIP RIGHTWARDS + return rune(0x21b1), true + case "rsolbar": + // REVERSE SOLIDUS WITH HORIZONTAL STROKE + return rune(0x29f7), true + case "rsqb": + // RIGHT SQUARE BRACKET + return rune(0x5d), true + case "rsquor": + // RIGHT SINGLE QUOTATION MARK + return rune(0x2019), true + case "rsquo": + // RIGHT SINGLE QUOTATION MARK + return rune(0x2019), true + case "rthree": + // RIGHT SEMIDIRECT PRODUCT + return rune(0x22cc), true + case "rtimes": + // RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT + return rune(0x22ca), true + case "rtrie": + // CONTAINS AS NORMAL SUBGROUP OR EQUAL TO + return rune(0x22b5), true + case "rtrif": + // BLACK RIGHT-POINTING SMALL TRIANGLE + return rune(0x25b8), true + case "rtri": + // WHITE RIGHT-POINTING SMALL TRIANGLE + return rune(0x25b9), true + case "rtriltri": + // RIGHT TRIANGLE ABOVE LEFT TRIANGLE + return rune(0x29ce), true + case "ruharb": + // RIGHTWARDS HARPOON WITH BARB UP TO BAR + return rune(0x2953), true + case "ruluhar": + // RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP + return rune(0x2968), true + case "rx": + // PRESCRIPTION TAKE + return rune(0x211e), true + } + + case 's': + switch name { + case "sacute": + // LATIN SMALL LETTER S WITH ACUTE + return rune(0x015b), true + case "samalg": + // N-ARY COPRODUCT + return rune(0x2210), true + case "sampi": + // GREEK LETTER SAMPI + return rune(0x03e0), true + case "sbquo": + // SINGLE LOW-9 QUOTATION MARK + return rune(0x201a), true + case "sbsol": + // SMALL REVERSE SOLIDUS + return rune(0xfe68), true + case "sc": + // SUCCEEDS + return rune(0x227b), true + case "scE": + // SUCCEEDS ABOVE EQUALS SIGN + return rune(0x2ab4), true + case "scap": + // SUCCEEDS ABOVE ALMOST EQUAL TO + return rune(0x2ab8), true + case "scaron": + // LATIN SMALL LETTER S WITH CARON + return rune(0x0161), true + case "sccue": + // SUCCEEDS OR EQUAL TO + return rune(0x227d), true + case "scedil": + // LATIN SMALL LETTER S WITH CEDILLA + return rune(0x015f), true + case "sce": + // SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN + return rune(0x2ab0), true + case "scirc": + // LATIN SMALL LETTER S WITH CIRCUMFLEX + return rune(0x015d), true + case "scnE": + // SUCCEEDS ABOVE NOT EQUAL TO + return rune(0x2ab6), true + case "scnap": + // SUCCEEDS ABOVE NOT ALMOST EQUAL TO + return rune(0x2aba), true + case "scnsim": + // SUCCEEDS BUT NOT EQUIVALENT TO + return rune(0x22e9), true + case "scpolint": + // LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE + return rune(0x2a13), true + case "scsim": + // SUCCEEDS OR EQUIVALENT TO + return rune(0x227f), true + case "scy": + // CYRILLIC SMALL LETTER ES + return rune(0x0441), true + case "sdotb": + // SQUARED DOT OPERATOR + return rune(0x22a1), true + case "sdot": + // DOT OPERATOR + return rune(0x22c5), true + case "sdote": + // EQUALS SIGN WITH DOT BELOW + return rune(0x2a66), true + case "seArr": + // SOUTH EAST DOUBLE ARROW + return rune(0x21d8), true + case "searhk": + // SOUTH EAST ARROW WITH HOOK + return rune(0x2925), true + case "searrow": + // SOUTH EAST ARROW + return rune(0x2198), true + case "searr": + // SOUTH EAST ARROW + return rune(0x2198), true + case "sect": + // SECTION SIGN + return rune(0xa7), true + case "semi": + // SEMICOLON + return rune(0x3b), true + case "seonearr": + // SOUTH EAST ARROW CROSSING NORTH EAST ARROW + return rune(0x292d), true + case "seswar": + // SOUTH EAST ARROW AND SOUTH WEST ARROW + return rune(0x2929), true + case "setminus": + // SET MINUS + return rune(0x2216), true + case "setmn": + // SET MINUS + return rune(0x2216), true + case "sext": + // SIX POINTED BLACK STAR + return rune(0x2736), true + case "sfgr": + // GREEK SMALL LETTER FINAL SIGMA + return rune(0x03c2), true + case "sfrown": + // FROWN + return rune(0x2322), true + case "sfr": + // MATHEMATICAL FRAKTUR SMALL S + return rune(0x01d530), true + case "sgr": + // GREEK SMALL LETTER SIGMA + return rune(0x03c3), true + case "sharp": + // MUSIC SHARP SIGN + return rune(0x266f), true + case "shchcy": + // CYRILLIC SMALL LETTER SHCHA + return rune(0x0449), true + case "shcy": + // CYRILLIC SMALL LETTER SHA + return rune(0x0448), true + case "shortmid": + // DIVIDES + return rune(0x2223), true + case "shortparallel": + // PARALLEL TO + return rune(0x2225), true + case "shuffle": + // SHUFFLE PRODUCT + return rune(0x29e2), true + case "shy": + // SOFT HYPHEN + return rune(0xad), true + case "sigma": + // GREEK SMALL LETTER SIGMA + return rune(0x03c3), true + case "sigmaf": + // GREEK SMALL LETTER FINAL SIGMA + return rune(0x03c2), true + case "sigmav": + // GREEK SMALL LETTER FINAL SIGMA + return rune(0x03c2), true + case "sim": + // TILDE OPERATOR + return rune(0x223c), true + case "simdot": + // TILDE OPERATOR WITH DOT ABOVE + return rune(0x2a6a), true + case "sime": + // ASYMPTOTICALLY EQUAL TO + return rune(0x2243), true + case "simeq": + // ASYMPTOTICALLY EQUAL TO + return rune(0x2243), true + case "simg": + // SIMILAR OR GREATER-THAN + return rune(0x2a9e), true + case "simgE": + // SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN + return rune(0x2aa0), true + case "siml": + // SIMILAR OR LESS-THAN + return rune(0x2a9d), true + case "simlE": + // SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN + return rune(0x2a9f), true + case "simne": + // APPROXIMATELY BUT NOT ACTUALLY EQUAL TO + return rune(0x2246), true + case "simplus": + // PLUS SIGN WITH TILDE ABOVE + return rune(0x2a24), true + case "simrarr": + // TILDE OPERATOR ABOVE RIGHTWARDS ARROW + return rune(0x2972), true + case "slarr": + // LEFTWARDS ARROW + return rune(0x2190), true + case "slint": + // INTEGRAL AVERAGE WITH SLASH + return rune(0x2a0f), true + case "smallsetminus": + // SET MINUS + return rune(0x2216), true + case "smashp": + // SMASH PRODUCT + return rune(0x2a33), true + case "smeparsl": + // EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE + return rune(0x29e4), true + case "smid": + // DIVIDES + return rune(0x2223), true + case "smile": + // SMILE + return rune(0x2323), true + case "smt": + // SMALLER THAN + return rune(0x2aaa), true + case "smte": + // SMALLER THAN OR EQUAL TO + return rune(0x2aac), true + case "smtes": + // SMALLER THAN OR slanted EQUAL + return rune(0x2aac), true + case "softcy": + // CYRILLIC SMALL LETTER SOFT SIGN + return rune(0x044c), true + case "solbar": + // APL FUNCTIONAL SYMBOL SLASH BAR + return rune(0x233f), true + case "solb": + // SQUARED RISING DIAGONAL SLASH + return rune(0x29c4), true + case "sol": + // SOLIDUS + return rune(0x2f), true + case "sopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL S + return rune(0x01d564), true + case "spades": + // BLACK SPADE SUIT + return rune(0x2660), true + case "spadesuit": + // BLACK SPADE SUIT + return rune(0x2660), true + case "spar": + // PARALLEL TO + return rune(0x2225), true + case "sqcap": + // SQUARE CAP + return rune(0x2293), true + case "sqcaps": + // SQUARE CAP with serifs + return rune(0x2293), true + case "sqcup": + // SQUARE CUP + return rune(0x2294), true + case "sqcups": + // SQUARE CUP with serifs + return rune(0x2294), true + case "sqsub": + // SQUARE IMAGE OF + return rune(0x228f), true + case "sqsube": + // SQUARE IMAGE OF OR EQUAL TO + return rune(0x2291), true + case "sqsubset": + // SQUARE IMAGE OF + return rune(0x228f), true + case "sqsubseteq": + // SQUARE IMAGE OF OR EQUAL TO + return rune(0x2291), true + case "sqsup": + // SQUARE ORIGINAL OF + return rune(0x2290), true + case "sqsupe": + // SQUARE ORIGINAL OF OR EQUAL TO + return rune(0x2292), true + case "sqsupset": + // SQUARE ORIGINAL OF + return rune(0x2290), true + case "sqsupseteq": + // SQUARE ORIGINAL OF OR EQUAL TO + return rune(0x2292), true + case "squ": + // WHITE SQUARE + return rune(0x25a1), true + case "square": + // WHITE SQUARE + return rune(0x25a1), true + case "squarf": + // BLACK SMALL SQUARE + return rune(0x25aa), true + case "squb": + // SQUARED SQUARE + return rune(0x29c8), true + case "squerr": + // ERROR-BARRED WHITE SQUARE + return rune(0x29ee), true + case "squf": + // BLACK SMALL SQUARE + return rune(0x25aa), true + case "squferr": + // ERROR-BARRED BLACK SQUARE + return rune(0x29ef), true + case "srarr": + // RIGHTWARDS ARROW + return rune(0x2192), true + case "sscr": + // MATHEMATICAL SCRIPT SMALL S + return rune(0x01d4c8), true + case "ssetmn": + // SET MINUS + return rune(0x2216), true + case "ssmile": + // SMILE + return rune(0x2323), true + case "sstarf": + // STAR OPERATOR + return rune(0x22c6), true + case "starf": + // BLACK STAR + return rune(0x2605), true + case "star": + // WHITE STAR + return rune(0x2606), true + case "stigma": + // GREEK LETTER STIGMA + return rune(0x03da), true + case "straightepsilon": + // GREEK LUNATE EPSILON SYMBOL + return rune(0x03f5), true + case "straightphi": + // GREEK PHI SYMBOL + return rune(0x03d5), true + case "strns": + // MACRON + return rune(0xaf), true + case "sub": + // SUBSET OF + return rune(0x2282), true + case "subE": + // SUBSET OF ABOVE EQUALS SIGN + return rune(0x2ac5), true + case "subdot": + // SUBSET WITH DOT + return rune(0x2abd), true + case "sube": + // SUBSET OF OR EQUAL TO + return rune(0x2286), true + case "subedot": + // SUBSET OF OR EQUAL TO WITH DOT ABOVE + return rune(0x2ac3), true + case "submult": + // SUBSET WITH MULTIPLICATION SIGN BELOW + return rune(0x2ac1), true + case "subnE": + // SUBSET OF ABOVE NOT EQUAL TO + return rune(0x2acb), true + case "subne": + // SUBSET OF WITH NOT EQUAL TO + return rune(0x228a), true + case "subplus": + // SUBSET WITH PLUS SIGN BELOW + return rune(0x2abf), true + case "subrarr": + // SUBSET ABOVE RIGHTWARDS ARROW + return rune(0x2979), true + case "subset": + // SUBSET OF + return rune(0x2282), true + case "subseteq": + // SUBSET OF OR EQUAL TO + return rune(0x2286), true + case "subseteqq": + // SUBSET OF ABOVE EQUALS SIGN + return rune(0x2ac5), true + case "subsetneq": + // SUBSET OF WITH NOT EQUAL TO + return rune(0x228a), true + case "subsetneqq": + // SUBSET OF ABOVE NOT EQUAL TO + return rune(0x2acb), true + case "subsim": + // SUBSET OF ABOVE TILDE OPERATOR + return rune(0x2ac7), true + case "subsub": + // SUBSET ABOVE SUBSET + return rune(0x2ad5), true + case "subsup": + // SUBSET ABOVE SUPERSET + return rune(0x2ad3), true + case "succ": + // SUCCEEDS + return rune(0x227b), true + case "succapprox": + // SUCCEEDS ABOVE ALMOST EQUAL TO + return rune(0x2ab8), true + case "succcurlyeq": + // SUCCEEDS OR EQUAL TO + return rune(0x227d), true + case "succeq": + // SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN + return rune(0x2ab0), true + case "succnapprox": + // SUCCEEDS ABOVE NOT ALMOST EQUAL TO + return rune(0x2aba), true + case "succneqq": + // SUCCEEDS ABOVE NOT EQUAL TO + return rune(0x2ab6), true + case "succnsim": + // SUCCEEDS BUT NOT EQUIVALENT TO + return rune(0x22e9), true + case "succsim": + // SUCCEEDS OR EQUIVALENT TO + return rune(0x227f), true + case "sum": + // N-ARY SUMMATION + return rune(0x2211), true + case "sumint": + // SUMMATION WITH INTEGRAL + return rune(0x2a0b), true + case "sung": + // EIGHTH NOTE + return rune(0x266a), true + case "sup": + // SUPERSET OF + return rune(0x2283), true + case "sup1": + // SUPERSCRIPT ONE + return rune(0xb9), true + case "sup2": + // SUPERSCRIPT TWO + return rune(0xb2), true + case "sup3": + // SUPERSCRIPT THREE + return rune(0xb3), true + case "supE": + // SUPERSET OF ABOVE EQUALS SIGN + return rune(0x2ac6), true + case "supdot": + // SUPERSET WITH DOT + return rune(0x2abe), true + case "supdsub": + // SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET + return rune(0x2ad8), true + case "supe": + // SUPERSET OF OR EQUAL TO + return rune(0x2287), true + case "supedot": + // SUPERSET OF OR EQUAL TO WITH DOT ABOVE + return rune(0x2ac4), true + case "suphsol": + // SUPERSET PRECEDING SOLIDUS + return rune(0x27c9), true + case "suphsub": + // SUPERSET BESIDE SUBSET + return rune(0x2ad7), true + case "suplarr": + // SUPERSET ABOVE LEFTWARDS ARROW + return rune(0x297b), true + case "supmult": + // SUPERSET WITH MULTIPLICATION SIGN BELOW + return rune(0x2ac2), true + case "supnE": + // SUPERSET OF ABOVE NOT EQUAL TO + return rune(0x2acc), true + case "supne": + // SUPERSET OF WITH NOT EQUAL TO + return rune(0x228b), true + case "supplus": + // SUPERSET WITH PLUS SIGN BELOW + return rune(0x2ac0), true + case "supset": + // SUPERSET OF + return rune(0x2283), true + case "supseteq": + // SUPERSET OF OR EQUAL TO + return rune(0x2287), true + case "supseteqq": + // SUPERSET OF ABOVE EQUALS SIGN + return rune(0x2ac6), true + case "supsetneq": + // SUPERSET OF WITH NOT EQUAL TO + return rune(0x228b), true + case "supsetneqq": + // SUPERSET OF ABOVE NOT EQUAL TO + return rune(0x2acc), true + case "supsim": + // SUPERSET OF ABOVE TILDE OPERATOR + return rune(0x2ac8), true + case "supsub": + // SUPERSET ABOVE SUBSET + return rune(0x2ad4), true + case "supsup": + // SUPERSET ABOVE SUPERSET + return rune(0x2ad6), true + case "swArr": + // SOUTH WEST DOUBLE ARROW + return rune(0x21d9), true + case "swarhk": + // SOUTH WEST ARROW WITH HOOK + return rune(0x2926), true + case "swarrow": + // SOUTH WEST ARROW + return rune(0x2199), true + case "swarr": + // SOUTH WEST ARROW + return rune(0x2199), true + case "swnwar": + // SOUTH WEST ARROW AND NORTH WEST ARROW + return rune(0x292a), true + case "szlig": + // LATIN SMALL LETTER SHARP S + return rune(0xdf), true + } + + case 't': + switch name { + case "target": + // POSITION INDICATOR + return rune(0x2316), true + case "tau": + // GREEK SMALL LETTER TAU + return rune(0x03c4), true + case "tbrk": + // TOP SQUARE BRACKET + return rune(0x23b4), true + case "tcaron": + // LATIN SMALL LETTER T WITH CARON + return rune(0x0165), true + case "tcedil": + // LATIN SMALL LETTER T WITH CEDILLA + return rune(0x0163), true + case "tcy": + // CYRILLIC SMALL LETTER TE + return rune(0x0442), true + case "tdot": + // COMBINING THREE DOTS ABOVE + return rune(0x20db), true + case "telrec": + // TELEPHONE RECORDER + return rune(0x2315), true + case "tfr": + // MATHEMATICAL FRAKTUR SMALL T + return rune(0x01d531), true + case "tgr": + // GREEK SMALL LETTER TAU + return rune(0x03c4), true + case "there4": + // THEREFORE + return rune(0x2234), true + case "therefore": + // THEREFORE + return rune(0x2234), true + case "thermod": + // THERMODYNAMIC + return rune(0x29e7), true + case "thetasym": + // GREEK THETA SYMBOL + return rune(0x03d1), true + case "thetas": + // GREEK SMALL LETTER THETA + return rune(0x03b8), true + case "thetav": + // GREEK THETA SYMBOL + return rune(0x03d1), true + case "theta": + // GREEK SMALL LETTER THETA + return rune(0x03b8), true + case "thgr": + // GREEK SMALL LETTER THETA + return rune(0x03b8), true + case "thickapprox": + // ALMOST EQUAL TO + return rune(0x2248), true + case "thicksim": + // TILDE OPERATOR + return rune(0x223c), true + case "thinsp": + // THIN SPACE + return rune(0x2009), true + case "thkap": + // ALMOST EQUAL TO + return rune(0x2248), true + case "thksim": + // TILDE OPERATOR + return rune(0x223c), true + case "thorn": + // LATIN SMALL LETTER THORN + return rune(0xfe), true + case "tilde": + // SMALL TILDE + return rune(0x02dc), true + case "timeint": + // INTEGRAL WITH TIMES SIGN + return rune(0x2a18), true + case "timesb": + // SQUARED TIMES + return rune(0x22a0), true + case "timesbar": + // MULTIPLICATION SIGN WITH UNDERBAR + return rune(0x2a31), true + case "timesd": + // MULTIPLICATION SIGN WITH DOT ABOVE + return rune(0x2a30), true + case "times": + // MULTIPLICATION SIGN + return rune(0xd7), true + case "tint": + // TRIPLE INTEGRAL + return rune(0x222d), true + case "toea": + // NORTH EAST ARROW AND SOUTH EAST ARROW + return rune(0x2928), true + case "top": + // DOWN TACK + return rune(0x22a4), true + case "topbot": + // APL FUNCTIONAL SYMBOL I-BEAM + return rune(0x2336), true + case "topcir": + // DOWN TACK WITH CIRCLE BELOW + return rune(0x2af1), true + case "topfork": + // PITCHFORK WITH TEE TOP + return rune(0x2ada), true + case "topf": + // MATHEMATICAL DOUBLE-STRUCK SMALL T + return rune(0x01d565), true + case "tosa": + // SOUTH EAST ARROW AND SOUTH WEST ARROW + return rune(0x2929), true + case "tprime": + // TRIPLE PRIME + return rune(0x2034), true + case "trade": + // TRADE MARK SIGN + return rune(0x2122), true + case "triS": + // S IN TRIANGLE + return rune(0x29cc), true + case "trianglelefteq": + // NORMAL SUBGROUP OF OR EQUAL TO + return rune(0x22b4), true + case "triangleq": + // DELTA EQUAL TO + return rune(0x225c), true + case "trianglerighteq": + // CONTAINS AS NORMAL SUBGROUP OR EQUAL TO + return rune(0x22b5), true + case "triangle": + // WHITE UP-POINTING SMALL TRIANGLE + return rune(0x25b5), true + case "triangledown": + // WHITE DOWN-POINTING SMALL TRIANGLE + return rune(0x25bf), true + case "triangleleft": + // WHITE LEFT-POINTING SMALL TRIANGLE + return rune(0x25c3), true + case "triangleright": + // WHITE RIGHT-POINTING SMALL TRIANGLE + return rune(0x25b9), true + case "tribar": + // TRIANGLE WITH UNDERBAR + return rune(0x29cb), true + case "tridot": + // WHITE UP-POINTING TRIANGLE WITH DOT + return rune(0x25ec), true + case "tridoto": + // TRIANGLE WITH DOT ABOVE + return rune(0x29ca), true + case "trie": + // DELTA EQUAL TO + return rune(0x225c), true + case "triminus": + // MINUS SIGN IN TRIANGLE + return rune(0x2a3a), true + case "triplus": + // PLUS SIGN IN TRIANGLE + return rune(0x2a39), true + case "trisb": + // TRIANGLE WITH SERIFS AT BOTTOM + return rune(0x29cd), true + case "tritime": + // MULTIPLICATION SIGN IN TRIANGLE + return rune(0x2a3b), true + case "trpezium": + // WHITE TRAPEZIUM + return rune(0x23e2), true + case "tscr": + // MATHEMATICAL SCRIPT SMALL T + return rune(0x01d4c9), true + case "tscy": + // CYRILLIC SMALL LETTER TSE + return rune(0x0446), true + case "tshcy": + // CYRILLIC SMALL LETTER TSHE + return rune(0x045b), true + case "tstrok": + // LATIN SMALL LETTER T WITH STROKE + return rune(0x0167), true + case "tverbar": + // TRIPLE VERTICAL BAR DELIMITER + return rune(0x2980), true + case "twixt": + // BETWEEN + return rune(0x226c), true + case "twoheadleftarrow": + // LEFTWARDS TWO HEADED ARROW + return rune(0x219e), true + case "twoheadrightarrow": + // RIGHTWARDS TWO HEADED ARROW + return rune(0x21a0), true + } + + case 'u': + switch name { + case "uAarr": + // UPWARDS TRIPLE ARROW + return rune(0x290a), true + case "uArr": + // UPWARDS DOUBLE ARROW + return rune(0x21d1), true + case "uHar": + // UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT + return rune(0x2963), true + case "uacgr": + // GREEK SMALL LETTER UPSILON WITH TONOS + return rune(0x03cd), true + case "uacute": + // LATIN SMALL LETTER U WITH ACUTE + return rune(0xfa), true + case "uarr2": + // UPWARDS PAIRED ARROWS + return rune(0x21c8), true + case "uarr": + // UPWARDS ARROW + return rune(0x2191), true + case "uarrb": + // UPWARDS ARROW TO BAR + return rune(0x2912), true + case "uarrln": + // UPWARDS ARROW WITH HORIZONTAL STROKE + return rune(0x2909), true + case "ubrcy": + // CYRILLIC SMALL LETTER SHORT U + return rune(0x045e), true + case "ubreve": + // LATIN SMALL LETTER U WITH BREVE + return rune(0x016d), true + case "ucirc": + // LATIN SMALL LETTER U WITH CIRCUMFLEX + return rune(0xfb), true + case "ucy": + // CYRILLIC SMALL LETTER U + return rune(0x0443), true + case "udarr": + // UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW + return rune(0x21c5), true + case "udblac": + // LATIN SMALL LETTER U WITH DOUBLE ACUTE + return rune(0x0171), true + case "udhar": + // UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT + return rune(0x296e), true + case "udiagr": + // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS + return rune(0x03b0), true + case "udigr": + // GREEK SMALL LETTER UPSILON WITH DIALYTIKA + return rune(0x03cb), true + case "udrbrk": + // BOTTOM SQUARE BRACKET + return rune(0x23b5), true + case "udrcub": + // BOTTOM CURLY BRACKET + return rune(0x23df), true + case "udrpar": + // BOTTOM PARENTHESIS + return rune(0x23dd), true + case "ufisht": + // UP FISH TAIL + return rune(0x297e), true + case "ufr": + // MATHEMATICAL FRAKTUR SMALL U + return rune(0x01d532), true + case "ugr": + // GREEK SMALL LETTER UPSILON + return rune(0x03c5), true + case "ugrave": + // LATIN SMALL LETTER U WITH GRAVE + return rune(0xf9), true + case "uharl": + // UPWARDS HARPOON WITH BARB LEFTWARDS + return rune(0x21bf), true + case "uharr": + // UPWARDS HARPOON WITH BARB RIGHTWARDS + return rune(0x21be), true + case "uhblk": + // UPPER HALF BLOCK + return rune(0x2580), true + case "ulcorn": + // TOP LEFT CORNER + return rune(0x231c), true + case "ulcorner": + // TOP LEFT CORNER + return rune(0x231c), true + case "ulcrop": + // TOP LEFT CROP + return rune(0x230f), true + case "uldlshar": + // UP BARB LEFT DOWN BARB LEFT HARPOON + return rune(0x2951), true + case "ulharb": + // UPWARDS HARPOON WITH BARB LEFT TO BAR + return rune(0x2958), true + case "ultri": + // UPPER LEFT TRIANGLE + return rune(0x25f8), true + case "umacr": + // LATIN SMALL LETTER U WITH MACRON + return rune(0x016b), true + case "uml": + // DIAERESIS + return rune(0xa8), true + case "uogon": + // LATIN SMALL LETTER U WITH OGONEK + return rune(0x0173), true + case "uopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL U + return rune(0x01d566), true + case "uparrow": + // UPWARDS ARROW + return rune(0x2191), true + case "updownarrow": + // UP DOWN ARROW + return rune(0x2195), true + case "upharpoonleft": + // UPWARDS HARPOON WITH BARB LEFTWARDS + return rune(0x21bf), true + case "upharpoonright": + // UPWARDS HARPOON WITH BARB RIGHTWARDS + return rune(0x21be), true + case "upint": + // INTEGRAL WITH OVERBAR + return rune(0x2a1b), true + case "uplus": + // MULTISET UNION + return rune(0x228e), true + case "upsih": + // GREEK UPSILON WITH HOOK SYMBOL + return rune(0x03d2), true + case "upsilon": + // GREEK SMALL LETTER UPSILON + return rune(0x03c5), true + case "upsi": + // GREEK SMALL LETTER UPSILON + return rune(0x03c5), true + case "upuparrows": + // UPWARDS PAIRED ARROWS + return rune(0x21c8), true + case "urcorn": + // TOP RIGHT CORNER + return rune(0x231d), true + case "urcorner": + // TOP RIGHT CORNER + return rune(0x231d), true + case "urcrop": + // TOP RIGHT CROP + return rune(0x230e), true + case "urdrshar": + // UP BARB RIGHT DOWN BARB RIGHT HARPOON + return rune(0x294f), true + case "urharb": + // UPWARDS HARPOON WITH BARB RIGHT TO BAR + return rune(0x2954), true + case "uring": + // LATIN SMALL LETTER U WITH RING ABOVE + return rune(0x016f), true + case "urtrif": + // BLACK UPPER RIGHT TRIANGLE + return rune(0x25e5), true + case "urtri": + // UPPER RIGHT TRIANGLE + return rune(0x25f9), true + case "uscr": + // MATHEMATICAL SCRIPT SMALL U + return rune(0x01d4ca), true + case "utdot": + // UP RIGHT DIAGONAL ELLIPSIS + return rune(0x22f0), true + case "utilde": + // LATIN SMALL LETTER U WITH TILDE + return rune(0x0169), true + case "utrif": + // BLACK UP-POINTING SMALL TRIANGLE + return rune(0x25b4), true + case "utri": + // WHITE UP-POINTING SMALL TRIANGLE + return rune(0x25b5), true + case "uuarr": + // UPWARDS PAIRED ARROWS + return rune(0x21c8), true + case "uuml": + // LATIN SMALL LETTER U WITH DIAERESIS + return rune(0xfc), true + case "uwangle": + // OBLIQUE ANGLE OPENING DOWN + return rune(0x29a7), true + } + + case 'v': + switch name { + case "vArr": + // UP DOWN DOUBLE ARROW + return rune(0x21d5), true + case "vBar": + // SHORT UP TACK WITH UNDERBAR + return rune(0x2ae8), true + case "vBarv": + // SHORT UP TACK ABOVE SHORT DOWN TACK + return rune(0x2ae9), true + case "vDash": + // TRUE + return rune(0x22a8), true + case "vDdash": + // VERTICAL BAR TRIPLE RIGHT TURNSTILE + return rune(0x2ae2), true + case "vangrt": + // RIGHT ANGLE VARIANT WITH SQUARE + return rune(0x299c), true + case "varepsilon": + // GREEK LUNATE EPSILON SYMBOL + return rune(0x03f5), true + case "varkappa": + // GREEK KAPPA SYMBOL + return rune(0x03f0), true + case "varnothing": + // EMPTY SET + return rune(0x2205), true + case "varphi": + // GREEK PHI SYMBOL + return rune(0x03d5), true + case "varpi": + // GREEK PI SYMBOL + return rune(0x03d6), true + case "varpropto": + // PROPORTIONAL TO + return rune(0x221d), true + case "varr": + // UP DOWN ARROW + return rune(0x2195), true + case "varrho": + // GREEK RHO SYMBOL + return rune(0x03f1), true + case "varsigma": + // GREEK SMALL LETTER FINAL SIGMA + return rune(0x03c2), true + case "varsubsetneq": + // SUBSET OF WITH NOT EQUAL TO - variant with stroke through bottom members + return rune(0x228a), true + case "varsubsetneqq": + // SUBSET OF ABOVE NOT EQUAL TO - variant with stroke through bottom members + return rune(0x2acb), true + case "varsupsetneq": + // SUPERSET OF WITH NOT EQUAL TO - variant with stroke through bottom members + return rune(0x228b), true + case "varsupsetneqq": + // SUPERSET OF ABOVE NOT EQUAL TO - variant with stroke through bottom members + return rune(0x2acc), true + case "vartheta": + // GREEK THETA SYMBOL + return rune(0x03d1), true + case "vartriangleleft": + // NORMAL SUBGROUP OF + return rune(0x22b2), true + case "vartriangleright": + // CONTAINS AS NORMAL SUBGROUP + return rune(0x22b3), true + case "vbrtri": + // VERTICAL BAR BESIDE RIGHT TRIANGLE + return rune(0x29d0), true + case "vcy": + // CYRILLIC SMALL LETTER VE + return rune(0x0432), true + case "vdash": + // RIGHT TACK + return rune(0x22a2), true + case "vee": + // LOGICAL OR + return rune(0x2228), true + case "veeBar": + // LOGICAL OR WITH DOUBLE UNDERBAR + return rune(0x2a63), true + case "veebar": + // XOR + return rune(0x22bb), true + case "veeeq": + // EQUIANGULAR TO + return rune(0x225a), true + case "vellip": + // VERTICAL ELLIPSIS + return rune(0x22ee), true + case "vellip4": + // DOTTED FENCE + return rune(0x2999), true + case "vellipv": + // TRIPLE COLON OPERATOR + return rune(0x2af6), true + case "verbar": + // VERTICAL LINE + return rune(0x7c), true + case "vert3": + // TRIPLE VERTICAL BAR BINARY RELATION + return rune(0x2af4), true + case "vert": + // VERTICAL LINE + return rune(0x7c), true + case "vfr": + // MATHEMATICAL FRAKTUR SMALL V + return rune(0x01d533), true + case "vldash": + // LEFT SQUARE BRACKET LOWER CORNER + return rune(0x23a3), true + case "vltri": + // NORMAL SUBGROUP OF + return rune(0x22b2), true + case "vnsub": + // SUBSET OF with vertical line + return rune(0x2282), true + case "vnsup": + // SUPERSET OF with vertical line + return rune(0x2283), true + case "vopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL V + return rune(0x01d567), true + case "vprime": + // PRIME + return rune(0x2032), true + case "vprop": + // PROPORTIONAL TO + return rune(0x221d), true + case "vrtri": + // CONTAINS AS NORMAL SUBGROUP + return rune(0x22b3), true + case "vscr": + // MATHEMATICAL SCRIPT SMALL V + return rune(0x01d4cb), true + case "vsubnE": + // SUBSET OF ABOVE NOT EQUAL TO - variant with stroke through bottom members + return rune(0x2acb), true + case "vsubne": + // SUBSET OF WITH NOT EQUAL TO - variant with stroke through bottom members + return rune(0x228a), true + case "vsupnE": + // SUPERSET OF ABOVE NOT EQUAL TO - variant with stroke through bottom members + return rune(0x2acc), true + case "vsupne": + // SUPERSET OF WITH NOT EQUAL TO - variant with stroke through bottom members + return rune(0x228b), true + case "vzigzag": + // VERTICAL ZIGZAG LINE + return rune(0x299a), true + } + + case 'w': + switch name { + case "wcirc": + // LATIN SMALL LETTER W WITH CIRCUMFLEX + return rune(0x0175), true + case "wedbar": + // LOGICAL AND WITH UNDERBAR + return rune(0x2a5f), true + case "wedge": + // LOGICAL AND + return rune(0x2227), true + case "wedgeq": + // ESTIMATES + return rune(0x2259), true + case "weierp": + // SCRIPT CAPITAL P + return rune(0x2118), true + case "wfr": + // MATHEMATICAL FRAKTUR SMALL W + return rune(0x01d534), true + case "wopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL W + return rune(0x01d568), true + case "wp": + // SCRIPT CAPITAL P + return rune(0x2118), true + case "wreath": + // WREATH PRODUCT + return rune(0x2240), true + case "wr": + // WREATH PRODUCT + return rune(0x2240), true + case "wscr": + // MATHEMATICAL SCRIPT SMALL W + return rune(0x01d4cc), true + } + + case 'x': + switch name { + case "xandand": + // TWO LOGICAL AND OPERATOR + return rune(0x2a07), true + case "xbsol": + // BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT + return rune(0x2571), true + case "xcap": + // N-ARY INTERSECTION + return rune(0x22c2), true + case "xcirc": + // LARGE CIRCLE + return rune(0x25ef), true + case "xcup": + // N-ARY UNION + return rune(0x22c3), true + case "xcupdot": + // N-ARY UNION OPERATOR WITH DOT + return rune(0x2a03), true + case "xdtri": + // WHITE DOWN-POINTING TRIANGLE + return rune(0x25bd), true + case "xfr": + // MATHEMATICAL FRAKTUR SMALL X + return rune(0x01d535), true + case "xgr": + // GREEK SMALL LETTER XI + return rune(0x03be), true + case "xhArr": + // LONG LEFT RIGHT DOUBLE ARROW + return rune(0x27fa), true + case "xharr": + // LONG LEFT RIGHT ARROW + return rune(0x27f7), true + case "xi": + // GREEK SMALL LETTER XI + return rune(0x03be), true + case "xlArr": + // LONG LEFTWARDS DOUBLE ARROW + return rune(0x27f8), true + case "xlarr": + // LONG LEFTWARDS ARROW + return rune(0x27f5), true + case "xmap": + // LONG RIGHTWARDS ARROW FROM BAR + return rune(0x27fc), true + case "xnis": + // CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE + return rune(0x22fb), true + case "xodot": + // N-ARY CIRCLED DOT OPERATOR + return rune(0x2a00), true + case "xopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL X + return rune(0x01d569), true + case "xoplus": + // N-ARY CIRCLED PLUS OPERATOR + return rune(0x2a01), true + case "xoror": + // TWO LOGICAL OR OPERATOR + return rune(0x2a08), true + case "xotime": + // N-ARY CIRCLED TIMES OPERATOR + return rune(0x2a02), true + case "xrArr": + // LONG RIGHTWARDS DOUBLE ARROW + return rune(0x27f9), true + case "xrarr": + // LONG RIGHTWARDS ARROW + return rune(0x27f6), true + case "xscr": + // MATHEMATICAL SCRIPT SMALL X + return rune(0x01d4cd), true + case "xsol": + // BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT + return rune(0x2572), true + case "xsqcap": + // N-ARY SQUARE INTERSECTION OPERATOR + return rune(0x2a05), true + case "xsqcup": + // N-ARY SQUARE UNION OPERATOR + return rune(0x2a06), true + case "xsqu": + // WHITE MEDIUM SQUARE + return rune(0x25fb), true + case "xsquf": + // BLACK MEDIUM SQUARE + return rune(0x25fc), true + case "xtimes": + // N-ARY TIMES OPERATOR + return rune(0x2a09), true + case "xuplus": + // N-ARY UNION OPERATOR WITH PLUS + return rune(0x2a04), true + case "xutri": + // WHITE UP-POINTING TRIANGLE + return rune(0x25b3), true + case "xvee": + // N-ARY LOGICAL OR + return rune(0x22c1), true + case "xwedge": + // N-ARY LOGICAL AND + return rune(0x22c0), true + } + + case 'y': + switch name { + case "yacute": + // LATIN SMALL LETTER Y WITH ACUTE + return rune(0xfd), true + case "yacy": + // CYRILLIC SMALL LETTER YA + return rune(0x044f), true + case "ycirc": + // LATIN SMALL LETTER Y WITH CIRCUMFLEX + return rune(0x0177), true + case "ycy": + // CYRILLIC SMALL LETTER YERU + return rune(0x044b), true + case "yen": + // YEN SIGN + return rune(0xa5), true + case "yfr": + // MATHEMATICAL FRAKTUR SMALL Y + return rune(0x01d536), true + case "yicy": + // CYRILLIC SMALL LETTER YI + return rune(0x0457), true + case "yopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL Y + return rune(0x01d56a), true + case "yscr": + // MATHEMATICAL SCRIPT SMALL Y + return rune(0x01d4ce), true + case "yucy": + // CYRILLIC SMALL LETTER YU + return rune(0x044e), true + case "yuml": + // LATIN SMALL LETTER Y WITH DIAERESIS + return rune(0xff), true + } + + case 'z': + switch name { + case "zacute": + // LATIN SMALL LETTER Z WITH ACUTE + return rune(0x017a), true + case "zcaron": + // LATIN SMALL LETTER Z WITH CARON + return rune(0x017e), true + case "zcy": + // CYRILLIC SMALL LETTER ZE + return rune(0x0437), true + case "zdot": + // LATIN SMALL LETTER Z WITH DOT ABOVE + return rune(0x017c), true + case "zeetrf": + // BLACK-LETTER CAPITAL Z + return rune(0x2128), true + case "zeta": + // GREEK SMALL LETTER ZETA + return rune(0x03b6), true + case "zfr": + // MATHEMATICAL FRAKTUR SMALL Z + return rune(0x01d537), true + case "zgr": + // GREEK SMALL LETTER ZETA + return rune(0x03b6), true + case "zhcy": + // CYRILLIC SMALL LETTER ZHE + return rune(0x0436), true + case "zigrarr": + // RIGHTWARDS SQUIGGLE ARROW + return rune(0x21dd), true + case "zopf": + // MATHEMATICAL DOUBLE-STRUCK SMALL Z + return rune(0x01d56b), true + case "zscr": + // MATHEMATICAL SCRIPT SMALL Z + return rune(0x01d4cf), true + case "zwj": + // ZERO WIDTH JOINER + return rune(0x200d), true + case "zwnj": + // ZERO WIDTH NON-JOINER + return rune(0x200c), true + } + } + return -1, false +} + +/* + ------ GENERATED ------ DO NOT EDIT ------ GENERATED ------ DO NOT EDIT ------ GENERATED ------ +*/ diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 563294309..146c278cb 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -519,8 +519,6 @@ parse_attribute :: proc(doc: ^Document) -> (attr: Attr, offset: int, err: Error) _ = expect(t, .Eq) or_return value := expect(t, .String) or_return - error(t, t.offset, "String: %v\n", value) - attr.key = strings.intern_get(&doc.intern, key.text) attr.val = strings.intern_get(&doc.intern, value.text) diff --git a/core/unicode/tools/generate_entity_table.odin b/core/unicode/tools/generate_entity_table.odin new file mode 100644 index 000000000..075ec1cca --- /dev/null +++ b/core/unicode/tools/generate_entity_table.odin @@ -0,0 +1,287 @@ +package xml_example + +import "core:encoding/xml" +import "core:os" +import "core:path" +import "core:mem" +import "core:strings" +import "core:strconv" +import "core:slice" +import "core:fmt" + +/* + Silent error handler for the parser. +*/ +Error_Handler :: proc(pos: xml.Pos, fmt: string, args: ..any) {} + +OPTIONS :: xml.Options{ flags = { .Ignore_Unsupported, }, expected_doctype = "unicode", } + +Entity :: struct { + name: string, + codepoint: rune, + description: string, +} + +generate_encoding_entity_table :: proc() { + using fmt + + filename := path.join(ODIN_ROOT, "tests", "core", "assets", "XML", "unicode.xml") + defer delete(filename) + + generated_filename := path.join(ODIN_ROOT, "core", "encoding", "entity", "generated.odin") + defer delete(generated_filename) + + doc, err := xml.parse(filename, OPTIONS, Error_Handler) + defer xml.destroy(doc) + + if err != .None { + printf("Load/Parse error: %v\n", err) + if err == .File_Error { + printf("\"%v\" not found. Did you run \"tests\\download_assets.py\"?", filename) + } + os.exit(1) + } + + printf("\"%v\" loaded and parsed.\n", filename) + + generated_buf: strings.Builder + defer strings.destroy_builder(&generated_buf) + w := strings.to_writer(&generated_buf) + + charlist, charlist_ok := xml.find_child_by_ident(doc.root, "charlist") + if !charlist_ok { + eprintln("Could not locate top-level `` tag.") + os.exit(1) + } + + printf("Found `` with %v children.\n", len(charlist.children)) + + entity_map: map[string]Entity + names: [dynamic]string + + min_name_length := max(int) + max_name_length := min(int) + shortest_name: string + longest_name: string + + count := 0 + for char in charlist.children { + if char.ident != "character" { + eprintf("Expected ``, got `<%v>`\n", char.ident) + os.exit(1) + } + + if codepoint_string, ok := xml.find_attribute_val_by_key(char, "dec"); !ok { + eprintln("`` attribute not found.") + os.exit(1) + } else { + codepoint := strconv.atoi(codepoint_string) + + desc, desc_ok := xml.find_child_by_ident(char, "description") + description := desc.value if desc_ok else "" + + /* + For us to be interested in this codepoint, it has to have at least one entity. + */ + + nth := 0 + for { + character_entity, entity_ok := xml.find_child_by_ident(char, "entity", nth) + if !entity_ok { break } + + nth += 1 + if name, name_ok := xml.find_attribute_val_by_key(character_entity, "id"); name_ok { + + if len(name) == 0 { + /* + Invalid name. Skip. + */ + continue + } + + if name == "\"\"" { + printf("%#v\n", char) + printf("%#v\n", character_entity) + } + + if len(name) > max_name_length { longest_name = name } + if len(name) < min_name_length { shortest_name = name } + + min_name_length = min(min_name_length, len(name)) + max_name_length = max(max_name_length, len(name)) + + e := Entity{ + name = name, + codepoint = rune(codepoint), + description = description, + } + + if _, seen := entity_map[name]; seen { + continue + } + + entity_map[name] = e + append(&names, name) + count += 1 + } + } + } + } + + /* + Sort by name. + */ + slice.sort(names[:]) + + printf("Found %v unique `&name;` -> rune mappings.\n", count) + printf("Shortest name: %v (%v)\n", shortest_name, min_name_length) + printf("Longest name: %v (%v)\n", longest_name, max_name_length) + + // println(rune_to_string(1234)) + + /* + Generate table. + */ + wprintln(w, "package unicode_entity") + wprintln(w, "") + wprintln(w, GENERATED) + wprintln(w, "") + wprintf (w, TABLE_FILE_PROLOG) + wprintln(w, "") + + wprintf (w, "// `&%v;`\n", shortest_name) + wprintf (w, "XML_NAME_TO_RUNE_MIN_LENGTH :: %v\n", min_name_length) + wprintf (w, "// `&%v;`\n", longest_name) + wprintf (w, "XML_NAME_TO_RUNE_MAX_LENGTH :: %v\n", max_name_length) + wprintln(w, "") + + wprintln(w, +` +/* + Input: + entity_name - a string, like "copy" that describes a user-encoded Unicode entity as used in XML. + + Output: + "decoded" - The decoded rune if found by name, or -1 otherwise. + "ok" - true if found, false if not. + + IMPORTANT: XML processors (including browsers) treat these names as case-sensitive. So do we. +*/ +named_xml_entity_to_rune :: proc(name: string) -> (decoded: rune, ok: bool) { + /* + Early out if the name is too short or too long. + min as a precaution in case the generated table has a bogus value. + */ + if len(name) < min(1, XML_NAME_TO_RUNE_MIN_LENGTH) || len(name) > XML_NAME_TO_RUNE_MAX_LENGTH { + return -1, false + } + + switch rune(name[0]) { +`) + + prefix := '?' + should_close := false + + for v in names { + if rune(v[0]) != prefix { + if should_close { + wprintln(w, "\t\t}\n") + } + + prefix = rune(v[0]) + wprintf (w, "\tcase '%v':\n", prefix) + wprintln(w, "\t\tswitch name {") + } + + e := entity_map[v] + + wprintf(w, "\t\t\tcase \"%v\": \n", e.name) + wprintf(w, "\t\t\t\t// %v\n", e.description) + wprintf(w, "\t\t\t\treturn %v, true\n", rune_to_string(e.codepoint)) + + should_close = true + } + wprintln(w, "\t\t}") + wprintln(w, "\t}") + wprintln(w, "\treturn -1, false") + wprintln(w, "}\n") + wprintln(w, GENERATED) + + println() + println(strings.to_string(generated_buf)) + println() + + written := os.write_entire_file(generated_filename, transmute([]byte)strings.to_string(generated_buf)) + + if written { + fmt.printf("Successfully written generated \"%v\".", generated_filename) + } else { + fmt.printf("Failed to write generated \"%v\".", generated_filename) + } + + delete(entity_map) + delete(names) + for name in &names { + free(&name) + } +} + +GENERATED :: `/* + ------ GENERATED ------ DO NOT EDIT ------ GENERATED ------ DO NOT EDIT ------ GENERATED ------ +*/` + +TABLE_FILE_PROLOG :: `/* + This file is generated from "https://www.w3.org/2003/entities/2007xml/unicode.xml". + + UPDATE: + - Ensure the XML file was downloaded using "tests\core\download_assets.py". + - Run "core/unicode/tools/generate_entity_table.odin" + + Odin unicode generated tables: https://github.com/odin-lang/Odin/tree/master/core/encoding/entity + + Copyright © 2021 World Wide Web Consortium, (Massachusetts Institute of Technology, + European Research Consortium for Informatics and Mathematics, Keio University, Beihang). + + All Rights Reserved. + + This work is distributed under the W3C® Software License [1] in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + [1] http://www.w3.org/Consortium/Legal/copyright-software + + See also: LICENSE_table.md +*/ +` + +rune_to_string :: proc(r: rune) -> (res: string) { + res = fmt.tprintf("%08x", int(r)) + for len(res) > 2 && res[:2] == "00" { + res = res[2:] + } + return fmt.tprintf("rune(0x%v)", res) +} + +is_dotted_name :: proc(name: string) -> (dotted: bool) { + for r in name { + if r == '.' { return true} + } + return false +} + +main :: proc() { + using fmt + + track: mem.Tracking_Allocator + mem.tracking_allocator_init(&track, context.allocator) + context.allocator = mem.tracking_allocator(&track) + + generate_encoding_entity_table() + + if len(track.allocation_map) > 0 { + println() + for _, v in track.allocation_map { + printf("%v Leaked %v bytes.\n", v.location, v.size) + } + } + println("Done and cleaned up!") +} \ No newline at end of file From 3d72e80ccf0f382f03a1c9407c4728862c5bca91 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 2 Dec 2021 21:07:40 +0100 Subject: [PATCH 011/245] [xml] Implement optional unboxing of CDATA and decoding of tag values. --- core/encoding/entity/entity.odin | 39 ++++++----- .../entity/example/entity_example.odin | 67 +++---------------- core/encoding/entity/example/test.html | 2 + core/encoding/xml/xml_reader.odin | 41 ++++++------ 4 files changed, 56 insertions(+), 93 deletions(-) diff --git a/core/encoding/entity/entity.odin b/core/encoding/entity/entity.odin index e40896819..8742446e6 100644 --- a/core/encoding/entity/entity.odin +++ b/core/encoding/entity/entity.odin @@ -60,16 +60,22 @@ COMMENT_END :: "-->" Default: CDATA and comments are passed through unchanged. */ XML_Decode_Option :: enum u8 { + /* + Do not decode & entities. It decodes by default. + If given, overrides `Decode_CDATA`. + */ + No_Entity_Decode, + /* CDATA is unboxed. */ - CDATA_Unbox, + Unbox_CDATA, /* Unboxed CDATA is decoded as well. - Ignored if `.CDATA_Unbox` is not given. + Ignored if `.Unbox_CDATA` is not given. */ - CDATA_Decode, + Decode_CDATA, /* Comments are stripped. @@ -129,7 +135,7 @@ decode_xml :: proc(input: string, options := XML_Decode_Options{}, allocator := } case: - if in_data && .CDATA_Decode not_in options { + if in_data && .Decode_CDATA not_in options { /* Unboxed, but undecoded. */ @@ -145,17 +151,20 @@ decode_xml :: proc(input: string, options := XML_Decode_Options{}, allocator := */ write_string(&builder, entity) } else { - if decoded, ok := xml_decode_entity(entity); ok { - write_rune(&builder, decoded) - } else { - /* - Decode failed. Pass through original. - */ - write_string(&builder, "&") - write_string(&builder, entity) - write_string(&builder, ";") + + if .No_Entity_Decode not_in options { + if decoded, ok := xml_decode_entity(entity); ok { + write_rune(&builder, decoded) + continue + } } + /* + Literal passthrough because the decode failed or we want entities not decoded. + */ + write_string(&builder, "&") + write_string(&builder, entity) + write_string(&builder, ";") } } else { write_rune(&builder, t.r) @@ -290,7 +299,7 @@ _handle_xml_special :: proc(t: ^Tokenizer, builder: ^strings.Builder, options: X if string(t.src[t.offset:][:len(CDATA_START)]) == CDATA_START { t.read_offset += len(CDATA_START) - 1 - if .CDATA_Unbox in options && .CDATA_Decode in options { + if .Unbox_CDATA in options && .Decode_CDATA in options { /* We're unboxing _and_ decoding CDATA */ @@ -315,7 +324,7 @@ _handle_xml_special :: proc(t: ^Tokenizer, builder: ^strings.Builder, options: X cdata := string(t.src[offset : t.read_offset]) - if .CDATA_Unbox in options { + if .Unbox_CDATA in options { cdata = cdata[len(CDATA_START):] cdata = cdata[:len(cdata) - len(CDATA_END)] } diff --git a/core/encoding/entity/example/entity_example.odin b/core/encoding/entity/example/entity_example.odin index 8758d9ad9..161a44827 100644 --- a/core/encoding/entity/example/entity_example.odin +++ b/core/encoding/entity/example/entity_example.odin @@ -1,19 +1,11 @@ package unicode_entity_example import "core:encoding/xml" -import "core:encoding/entity" import "core:strings" import "core:mem" import "core:fmt" import "core:time" -OPTIONS :: xml.Options{ - flags = { - .Ignore_Unsupported, .Intern_Comments, - }, - expected_doctype = "", -} - doc_print :: proc(doc: ^xml.Document) { buf: strings.Builder defer strings.destroy_builder(&buf) @@ -29,6 +21,13 @@ _entities :: proc() { DOC :: #load("../../../../tests/core/assets/XML/unicode.xml") + OPTIONS :: xml.Options{ + flags = { + .Ignore_Unsupported, .Intern_Comments, + }, + expected_doctype = "", + } + parse_duration: time.Duration { @@ -50,57 +49,11 @@ _entities :: proc() { _main :: proc() { using fmt - doc, err := xml.parse(#load("test.html")) + options := xml.Options{ flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities }} + doc, _ := xml.parse(#load("test.html"), options) + defer xml.destroy(doc) doc_print(doc) - - if false { - val := doc.root.children[1].children[2].value - - println() - replaced, ok := entity.decode_xml(val) - defer delete(replaced) - - printf("Before: '%v', Err: %v\n", val, err) - printf("Passthrough: '%v'\nOK: %v\n", replaced, ok) - println() - } - - if false { - val := doc.root.children[1].children[2].value - - println() - replaced, ok := entity.decode_xml(val, { .CDATA_Unbox }) - defer delete(replaced) - - printf("Before: '%v', Err: %v\n", val, err) - printf("CDATA_Unbox: '%v'\nOK: %v\n", replaced, ok) - println() - } - - if true { - val := doc.root.children[1].children[2].value - - println() - replaced, ok := entity.decode_xml(val, { .CDATA_Unbox, .CDATA_Decode }) - defer delete(replaced) - - printf("Before: '%v', Err: %v\n", val, err) - printf("CDATA_Decode: '%v'\nOK: %v\n", replaced, ok) - println() - } - - if true { - val := doc.root.children[1].children[1].value - - println() - replaced, ok := entity.decode_xml(val, { .Comment_Strip }) - defer delete(replaced) - - printf("Before: '%v', Err: %v\n", val, err) - printf("Comment_Strip: '%v'\nOK: %v\n", replaced, ok) - println() - } } main :: proc() { diff --git a/core/encoding/entity/example/test.html b/core/encoding/entity/example/test.html index 60e32bf03..62a0bb35a 100644 --- a/core/encoding/entity/example/test.html +++ b/core/encoding/entity/example/test.html @@ -16,9 +16,11 @@
Foozle]! © 42&;1234&
+
Foozle]! © 42&;1234&
+
| | | fj ` \ ® ϱ ∳
diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 146c278cb..6f49b8e08 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -18,10 +18,6 @@ package xml - We do NOT support UTF-16. If you have a UTF-16 XML file, please convert it to UTF-8 first. Also, our condolences. - <[!ELEMENT and <[!ATTLIST are not supported, and will be either ignored or return an error depending on the parser options. - TODO: - - Optional CDATA unboxing. - - Optional `>`, ` `, ` ` and other escape substitution in tag bodies. - MAYBE: - XML writer? - Serialize/deserialize Odin types? @@ -31,6 +27,7 @@ package xml */ import "core:strings" +import "core:encoding/entity" import "core:mem" import "core:os" @@ -196,12 +193,6 @@ Error :: enum { Duplicate_Attribute, Conflicting_Options, - - /* - Unhandled TODO: - */ - Unhandled_CDATA_Unboxing, - Unhandled_SGML_Entity_Decoding, } /* @@ -422,8 +413,25 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err /* This should be a tag's body text. */ - body_text := scan_string(t, t.offset) or_return - element.value = strings.intern_get(&doc.intern, body_text) + body_text := scan_string(t, t.offset) or_return + + decode_opts := entity.XML_Decode_Options{ .Comment_Strip } + + if .Decode_SGML_Entities not_in opts.flags { + decode_opts += { .No_Entity_Decode } + } + if .Unbox_CDATA in opts.flags { + decode_opts += { .Unbox_CDATA, .Decode_CDATA } + } + + decoded, decode_err := entity.decode_xml(body_text, decode_opts) + defer delete(decoded) + + if decode_err == .None { + element.value = strings.intern_get(&doc.intern, decoded) + } else { + element.value = strings.intern_get(&doc.intern, body_text) + } } } @@ -488,15 +496,6 @@ validate_options :: proc(options: Options) -> (validated: Options, err: Error) { if .Error_on_Unsupported in validated.flags && .Ignore_Unsupported in validated.flags { return options, .Conflicting_Options } - - if .Unbox_CDATA in validated.flags { - return options, .Unhandled_CDATA_Unboxing - } - - if .Decode_SGML_Entities in validated.flags { - return options, .Unhandled_SGML_Entity_Decoding - } - return validated, .None } From d65d6edb0e1887871c4de6a4e8a1630927153eae Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 5 Dec 2021 02:17:48 +0100 Subject: [PATCH 012/245] [xml] Improve XML tests, test `core:encoding/entity`. --- core/encoding/entity/entity.odin | 7 + .../entity/example/entity_example.odin | 1 + core/encoding/entity/example/test.html | 2 +- tests/core/assets/XML/entities.html | 29 ++ ...-xliff-1.0.xliff => nl_NL-xliff-1.2.xliff} | 0 tests/core/assets/XML/utf8.xml | 2 +- tests/core/encoding/xml/test_core_xml.odin | 426 +++++++++++------- 7 files changed, 291 insertions(+), 176 deletions(-) create mode 100644 tests/core/assets/XML/entities.html rename tests/core/assets/XML/{nl_NL-xliff-1.0.xliff => nl_NL-xliff-1.2.xliff} (100%) diff --git a/core/encoding/entity/entity.odin b/core/encoding/entity/entity.odin index 8742446e6..db1a5ad0b 100644 --- a/core/encoding/entity/entity.odin +++ b/core/encoding/entity/entity.odin @@ -115,7 +115,14 @@ decode_xml :: proc(input: string, options := XML_Decode_Options{}, allocator := We don't need to check if we need to write a `<`, because if it isn't CDATA or a comment, it couldn't have been part of an XML tag body to be decoded here. + + Keep in mind that we could already *be* inside a CDATA tag. + If so, write `>` as a literal and continue. */ + if in_data { + write_rune(&builder, '<') + continue + } in_data = _handle_xml_special(&t, &builder, options) or_return case ']': diff --git a/core/encoding/entity/example/entity_example.odin b/core/encoding/entity/example/entity_example.odin index 161a44827..882203f48 100644 --- a/core/encoding/entity/example/entity_example.odin +++ b/core/encoding/entity/example/entity_example.odin @@ -50,6 +50,7 @@ _main :: proc() { using fmt options := xml.Options{ flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities }} + doc, _ := xml.parse(#load("test.html"), options) defer xml.destroy(doc) diff --git a/core/encoding/entity/example/test.html b/core/encoding/entity/example/test.html index 62a0bb35a..ebbc6470c 100644 --- a/core/encoding/entity/example/test.html +++ b/core/encoding/entity/example/test.html @@ -22,7 +22,7 @@
- | | | fj ` \ ® ϱ ∳ + | | | fj ` \ ® ϱ ∳ ⁏
\ No newline at end of file diff --git a/tests/core/assets/XML/entities.html b/tests/core/assets/XML/entities.html new file mode 100644 index 000000000..05a6b107e --- /dev/null +++ b/tests/core/assets/XML/entities.html @@ -0,0 +1,29 @@ + + + Entity Reference Test + + + +

Entity Reference Test

+
+ Foozle]! © 42&;1234& +
+ + +
+ Foozle]! © 42&;1234& +
+ +
+ | | | fj ` \ ® ϱ ∳ ⁏ +
+ + \ No newline at end of file diff --git a/tests/core/assets/XML/nl_NL-xliff-1.0.xliff b/tests/core/assets/XML/nl_NL-xliff-1.2.xliff similarity index 100% rename from tests/core/assets/XML/nl_NL-xliff-1.0.xliff rename to tests/core/assets/XML/nl_NL-xliff-1.2.xliff diff --git a/tests/core/assets/XML/utf8.xml b/tests/core/assets/XML/utf8.xml index c9ed3bf69..6e1a897ea 100644 --- a/tests/core/assets/XML/utf8.xml +++ b/tests/core/assets/XML/utf8.xml @@ -4,5 +4,5 @@ <부끄러운:barzle> ရှက်စရာ ဇီးကွက် Owl of Shame - More CDATA Hello, world! Nonsense. + More CDATA Hello, world! Nonsense. \ No newline at end of file diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index c2e0aa172..5cb59e001 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -3,16 +3,16 @@ package test_core_xml import "core:encoding/xml" import "core:testing" import "core:mem" +import "core:strings" +import "core:io" import "core:fmt" +import "core:hash" Silent :: proc(pos: xml.Pos, fmt: string, args: ..any) { // Custom (silent) error handler. } -OPTIONS :: xml.Options{ - flags = { - .Ignore_Unsupported, .Intern_Comments, - }, +OPTIONS :: xml.Options{ flags = { .Ignore_Unsupported, .Intern_Comments, }, expected_doctype = "", } @@ -22,76 +22,153 @@ TEST_fail := 0 TEST :: struct { filename: string, options: xml.Options, - expected: struct { - error: xml.Error, - xml_version: string, - xml_encoding: string, - doctype: string, - }, + err: xml.Error, + crc32: u32, } +/* + Relative to ODIN_ROOT +*/ +TEST_FILE_PATH_PREFIX :: "tests/core/assets/XML" + TESTS :: []TEST{ /* First we test that certain files parse without error. */ + { - filename = "assets/XML/utf8.xml", - options = OPTIONS, - expected = { - error = .None, - xml_version = "1.0", - xml_encoding = "utf-8", - doctype = "恥ずべきフクロウ", + /* + + + <恥ずべきフクロウ 올빼미_id="Foozle Hello, world!"]]>Barzle"> + <부끄러운:barzle> + ရှက်စရာ ဇီးကွက် + Owl of Shame + More CDATA Hello, world! Nonsense. + + */ + + /* + Tests UTF-8 idents and values. + Test namespaced ident. + Tests that nested partial CDATA start doesn't trip up parser. + */ + filename = "utf8.xml", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, + }, + expected_doctype = "恥ずべきフクロウ", }, + crc32 = 0x30d82264, }, + { - filename = "assets/XML/nl_NL-qt-ts.ts", - options = OPTIONS, - expected = { - error = .None, - xml_version = "1.0", - xml_encoding = "utf-8", - doctype = "TS", + /* + Same as above. + Unbox CDATA in data tag. + */ + filename = "utf8.xml", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, + }, + expected_doctype = "恥ずべきフクロウ", }, + crc32 = 0x6d38ac58, }, + { - filename = "assets/XML/nl_NL-xliff-1.0.xliff", - options = OPTIONS, - expected = { - error = .None, - xml_version = "1.0", - xml_encoding = "UTF-8", - doctype = "", + /* + Simple Qt TS translation file. + `core:i18n` requires it to be parsed properly. + */ + filename = "nl_NL-qt-ts.ts", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, + }, + expected_doctype = "TS", }, + crc32 = 0x7bce2630, }, + { - filename = "assets/XML/nl_NL-xliff-2.0.xliff", - options = OPTIONS, - expected = { - error = .None, - xml_version = "1.0", - xml_encoding = "utf-8", - doctype = "", + /* + Simple XLiff 1.2 file. + `core:i18n` requires it to be parsed properly. + */ + filename = "nl_NL-xliff-1.2.xliff", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, + }, + expected_doctype = "xliff", }, + crc32 = 0x43f19d61, + }, + + { + /* + Simple XLiff 2.0 file. + `core:i18n` requires it to be parsed properly. + */ + filename = "nl_NL-xliff-2.0.xliff", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, + }, + expected_doctype = "xliff", + }, + crc32 = 0x961e7635, + }, + + { + filename = "entities.html", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, + }, + expected_doctype = "html", + }, + crc32 = 0xdb4a1e79, + }, + + { + filename = "entities.html", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, + }, + expected_doctype = "html", + }, + crc32 = 0x82588917, + }, + + { + filename = "entities.html", + options = { + flags = { + .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, + }, + expected_doctype = "html", + }, + crc32 = 0x5e74d8a6, }, /* Then we test that certain errors are returned as expected. */ { - filename = "assets/XML/utf8.xml", + filename = "utf8.xml", options = { flags = { .Ignore_Unsupported, .Intern_Comments, }, expected_doctype = "Odin", }, - expected = { - error = .Invalid_DocType, - xml_version = "1.0", - xml_encoding = "utf-8", - doctype = "恥ずべきフクロウ", - }, + err = .Invalid_DocType, + crc32 = 0x49b83d0a, }, } @@ -115,6 +192,136 @@ when ODIN_TEST { } } +test_file_path :: proc(filename: string) -> (path: string) { + + path = fmt.tprintf("%v%v/%v", ODIN_ROOT, TEST_FILE_PATH_PREFIX, filename) + temp := transmute([]u8)path + + for r, i in path { + if r == '\\' { + temp[i] = '/' + } + } + return path +} + +doc_to_string :: proc(doc: ^xml.Document) -> (result: string) { + /* + Effectively a clone of the debug printer in the xml package. + We duplicate it here so that the way it prints an XML document to a string is stable. + + This way we can hash the output. If it changes, it means that the document or how it was parsed changed, + not how it was printed. One less source of variability. + */ + print :: proc(writer: io.Writer, doc: ^xml.Document) -> (written: int, err: io.Error) { + if doc == nil { return } + using fmt + + written += wprintf(writer, "[XML Prolog]\n") + + for attr in doc.prolog { + written += wprintf(writer, "\t%v: %v\n", attr.key, attr.val) + } + + written += wprintf(writer, "[Encoding] %v\n", doc.encoding) + + if len(doc.doctype.ident) > 0 { + written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident) + + if len(doc.doctype.rest) > 0 { + wprintf(writer, "\t%v\n", doc.doctype.rest) + } + } + + for comment in doc.comments { + written += wprintf(writer, "[Pre-root comment] %v\n", comment) + } + + if doc.root != nil { + wprintln(writer, " --- ") + print_element(writer, doc.root) + wprintln(writer, " --- ") + } + + return written, .None + } + + print_element :: proc(writer: io.Writer, element: ^xml.Element, indent := 0) -> (written: int, err: io.Error) { + if element == nil { return } + using fmt + + tab :: proc(writer: io.Writer, indent: int) { + for _ in 0..=indent { + wprintf(writer, "\t") + } + } + + tab(writer, indent) + + if element.kind == .Element { + wprintf(writer, "<%v>\n", element.ident) + if len(element.value) > 0 { + tab(writer, indent + 1) + wprintf(writer, "[Value] %v\n", element.value) + } + + for attr in element.attribs { + tab(writer, indent + 1) + wprintf(writer, "[Attr] %v: %v\n", attr.key, attr.val) + } + + for child in element.children { + print_element(writer, child, indent + 1) + } + } else if element.kind == .Comment { + wprintf(writer, "[COMMENT] %v\n", element.value) + } + + return written, .None + } + + buf: strings.Builder + defer strings.destroy_builder(&buf) + + print(strings.to_writer(&buf), doc) + return strings.clone(strings.to_string(buf)) +} + +@test +run_tests :: proc(t: ^testing.T) { + using fmt + + for test in TESTS { + path := test_file_path(test.filename) + printf("\nTrying to parse %v\n\n", path) + + doc, err := xml.parse(path, test.options, Silent) + defer xml.destroy(doc) + + tree_string := doc_to_string(doc) + tree_bytes := transmute([]u8)tree_string + defer delete(tree_bytes) + + crc32 := hash.crc32(tree_bytes) + + failed := err != test.err + err_msg := tprintf("Expected return value %v, got %v", test.err, err) + expect(t, err == test.err, err_msg) + + failed |= crc32 != test.crc32 + err_msg = tprintf("Expected CRC 0x%08x, got 0x%08x", test.crc32, crc32) + expect(t, crc32 == test.crc32, err_msg) + + if failed { + /* + Don't fully print big trees. + */ + tree_string = tree_string[:min(2_048, len(tree_string))] + println(tree_string) + } + } +} + main :: proc() { t := testing.T{} @@ -132,133 +339,4 @@ main :: proc() { } fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) -} - -@test -run_tests :: proc(t: ^testing.T) { - using fmt - - count := 0 - - for test in TESTS { - printf("Trying to parse %v\n\n", test.filename) - - doc, err := xml.parse(test.filename, test.options, Silent) - defer xml.destroy(doc) - - err_msg := tprintf("Expected return value %v, got %v", test.expected.error, err) - expect(t, err == test.expected.error, err_msg) - - if len(test.expected.xml_version) > 0 { - xml_version := "" - for attr in doc.prolog { - if attr.key == "version" { - xml_version = attr.val - } - } - - err_msg = tprintf("Expected XML version %v, got %v", test.expected.xml_version, xml_version) - expect(t, xml_version == test.expected.xml_version, err_msg) - } - - if len(test.expected.xml_encoding) > 0 { - xml_encoding := "" - for attr in doc.prolog { - if attr.key == "encoding" { - xml_encoding = attr.val - } - } - - err_msg = tprintf("Expected XML encoding %v, got %v", test.expected.xml_encoding, xml_encoding) - expect(t, xml_encoding == test.expected.xml_encoding, err_msg) - } - - err_msg = tprintf("Expected DOCTYPE %v, got %v", test.expected.doctype, doc.doctype.ident) - expect(t, doc.doctype.ident == test.expected.doctype, err_msg) - - /* - File-specific tests. - */ - switch count { - case 0: - expect(t, len(doc.root.attribs) > 0, "Expected the root tag to have an attribute.") - attr := doc.root.attribs[0] - - attr_key_expected := "올빼미_id" - attr_val_expected := "Foozle Hello, world!\"]]>Barzle" - - attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) - expect(t, attr.key == attr_key_expected, attr_err) - - attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) - expect(t, attr.val == attr_val_expected, attr_err) - - expect(t, len(doc.root.children) > 0, "Expected the root tag to have children.") - child := doc.root.children[0] - - first_child_ident := "부끄러운:barzle" - attr_err = tprintf("Expected first child tag's ident to be %v, got %v", first_child_ident, child.ident) - expect(t, child.ident == first_child_ident, attr_err) - - case 2: - expect(t, len(doc.root.attribs) > 0, "Expected the root tag to have an attribute.") - - { - attr := doc.root.attribs[0] - - attr_key_expected := "version" - attr_val_expected := "1.2" - - attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) - expect(t, attr.key == attr_key_expected, attr_err) - - attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) - expect(t, attr.val == attr_val_expected, attr_err) - } - - { - attr := doc.root.attribs[1] - - attr_key_expected := "xmlns" - attr_val_expected := "urn:oasis:names:tc:xliff:document:1.2" - - attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) - expect(t, attr.key == attr_key_expected, attr_err) - - attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) - expect(t, attr.val == attr_val_expected, attr_err) - } - - case 3: - expect(t, len(doc.root.attribs) > 0, "Expected the root tag to have an attribute.") - - { - attr := doc.root.attribs[0] - - attr_key_expected := "xmlns" - attr_val_expected := "urn:oasis:names:tc:xliff:document:2.0" - - attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) - expect(t, attr.key == attr_key_expected, attr_err) - - attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) - expect(t, attr.val == attr_val_expected, attr_err) - } - - { - attr := doc.root.attribs[1] - - attr_key_expected := "version" - attr_val_expected := "2.0" - - attr_err := tprintf("Expected %v, got %v", attr_key_expected, attr.key) - expect(t, attr.key == attr_key_expected, attr_err) - - attr_err = tprintf("Expected %v, got %v", attr_val_expected, attr.val) - expect(t, attr.val == attr_val_expected, attr_err) - } - } - - count += 1 - } } \ No newline at end of file From d7200f61441b6acfc4f0b47e900095f08490da58 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 5 Dec 2021 02:40:13 +0100 Subject: [PATCH 013/245] Improve tests in general. Less spammy core tests: They don't print PASSes now, only logs and failures. `core:image` and `core:encoding/xml` tests also find their assets relative to `ODIN_ROOT` now. --- tests/core/compress/test_core_compress.odin | 9 +- tests/core/crypto/test_core_crypto.odin | 1691 +++++++++--------- tests/core/encoding/json/test_core_json.odin | 9 +- tests/core/encoding/xml/test_core_xml.odin | 43 +- tests/core/hash/test_core_hash.odin | 9 +- tests/core/image/test_core_image.odin | 51 +- tests/core/odin/test_parser.odin | 37 +- tests/core/strings/test_core_strings.odin | 59 +- 8 files changed, 948 insertions(+), 960 deletions(-) diff --git a/tests/core/compress/test_core_compress.odin b/tests/core/compress/test_core_compress.odin index c925c0258..908ef12e4 100644 --- a/tests/core/compress/test_core_compress.odin +++ b/tests/core/compress/test_core_compress.odin @@ -30,18 +30,15 @@ when ODIN_TEST { log :: testing.log } else { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) TEST_count += 1 if !condition { TEST_fail += 1 - fmt.println(message) + fmt.printf("[%v] %v\n", loc, message) return } - fmt.println(" PASS") } log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) } } @@ -51,7 +48,7 @@ main :: proc() { zlib_test(&t) gzip_test(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } @test diff --git a/tests/core/crypto/test_core_crypto.odin b/tests/core/crypto/test_core_crypto.odin index 2ad00be66..6d3a9f8e4 100644 --- a/tests/core/crypto/test_core_crypto.odin +++ b/tests/core/crypto/test_core_crypto.odin @@ -1,15 +1,15 @@ package test_core_crypto /* - Copyright 2021 zhibog - Made available under the BSD-3 license. + Copyright 2021 zhibog + Made available under the BSD-3 license. - List of contributors: - zhibog, dotbmp: Initial implementation. - Jeroen van Rijn: Test runner setup. + List of contributors: + zhibog, dotbmp: Initial implementation. + Jeroen van Rijn: Test runner setup. - Tests for the hashing algorithms within the crypto library. - Where possible, the official test vectors are used to validate the implementation. + Tests for the hashing algorithms within the crypto library. + Where possible, the official test vectors are used to validate the implementation. */ import "core:testing" @@ -41,1065 +41,1062 @@ TEST_count := 0 TEST_fail := 0 when ODIN_TEST { - expect :: testing.expect - log :: testing.log + expect :: testing.expect + log :: testing.log } else { - expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) - TEST_count += 1 - if !condition { - TEST_fail += 1 - fmt.println(message) - return - } - fmt.println(" PASS") - } - log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) - } + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.printf("[%v] %v\n", loc, message) + return + } + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) + } } main :: proc() { - t := testing.T{} - test_md2(&t) - test_md4(&t) - test_md5(&t) - test_sha1(&t) - test_sha224(&t) - test_sha256(&t) - test_sha384(&t) - test_sha512(&t) - test_sha3_224(&t) - test_sha3_256(&t) - test_sha3_384(&t) - test_sha3_512(&t) - test_shake_128(&t) - test_shake_256(&t) - test_keccak_224(&t) - test_keccak_256(&t) - test_keccak_384(&t) - test_keccak_512(&t) - test_whirlpool(&t) - test_gost(&t) - test_streebog_256(&t) - test_streebog_512(&t) - test_blake_224(&t) - test_blake_256(&t) - test_blake_384(&t) - test_blake_512(&t) - test_blake2b(&t) - test_blake2s(&t) - test_ripemd_128(&t) - test_ripemd_160(&t) - test_ripemd_256(&t) - test_ripemd_320(&t) - test_tiger_128(&t) - test_tiger_160(&t) - test_tiger_192(&t) - test_tiger2_128(&t) - test_tiger2_160(&t) - test_tiger2_192(&t) - test_sm3(&t) - test_jh_224(&t) - test_jh_256(&t) - test_jh_384(&t) - test_jh_512(&t) - test_groestl_224(&t) - test_groestl_256(&t) - test_groestl_384(&t) - test_groestl_512(&t) - test_haval_128(&t) - test_haval_160(&t) - test_haval_192(&t) - test_haval_224(&t) - test_haval_256(&t) + t := testing.T{} + test_md2(&t) + test_md4(&t) + test_md5(&t) + test_sha1(&t) + test_sha224(&t) + test_sha256(&t) + test_sha384(&t) + test_sha512(&t) + test_sha3_224(&t) + test_sha3_256(&t) + test_sha3_384(&t) + test_sha3_512(&t) + test_shake_128(&t) + test_shake_256(&t) + test_keccak_224(&t) + test_keccak_256(&t) + test_keccak_384(&t) + test_keccak_512(&t) + test_whirlpool(&t) + test_gost(&t) + test_streebog_256(&t) + test_streebog_512(&t) + test_blake_224(&t) + test_blake_256(&t) + test_blake_384(&t) + test_blake_512(&t) + test_blake2b(&t) + test_blake2s(&t) + test_ripemd_128(&t) + test_ripemd_160(&t) + test_ripemd_256(&t) + test_ripemd_320(&t) + test_tiger_128(&t) + test_tiger_160(&t) + test_tiger_192(&t) + test_tiger2_128(&t) + test_tiger2_160(&t) + test_tiger2_192(&t) + test_sm3(&t) + test_jh_224(&t) + test_jh_256(&t) + test_jh_384(&t) + test_jh_512(&t) + test_groestl_224(&t) + test_groestl_256(&t) + test_groestl_384(&t) + test_groestl_512(&t) + test_haval_128(&t) + test_haval_160(&t) + test_haval_192(&t) + test_haval_224(&t) + test_haval_256(&t) - // "modern" crypto tests - test_chacha20(&t) - test_poly1305(&t) - test_chacha20poly1305(&t) - test_x25519(&t) - test_rand_bytes(&t) + // "modern" crypto tests + test_chacha20(&t) + test_poly1305(&t) + test_chacha20poly1305(&t) + test_x25519(&t) + test_rand_bytes(&t) - bench_modern(&t) + bench_modern(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } TestHash :: struct { - hash: string, - str: string, + hash: string, + str: string, } hex_string :: proc(bytes: []byte, allocator := context.temp_allocator) -> string { - lut: [16]byte = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'} - buf := make([]byte, len(bytes) * 2, allocator) - for i := 0; i < len(bytes); i += 1 { - buf[i * 2 + 0] = lut[bytes[i] >> 4 & 0xf] - buf[i * 2 + 1] = lut[bytes[i] & 0xf] - } - return string(buf) + lut: [16]byte = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'} + buf := make([]byte, len(bytes) * 2, allocator) + for i := 0; i < len(bytes); i += 1 { + buf[i * 2 + 0] = lut[bytes[i] >> 4 & 0xf] + buf[i * 2 + 1] = lut[bytes[i] & 0xf] + } + return string(buf) } @(test) test_md2 :: proc(t: ^testing.T) { - // Official test vectors from https://datatracker.ietf.org/doc/html/rfc1319 - test_vectors := [?]TestHash { - TestHash{"8350e5a3e24c153df2275c9f80692773", ""}, - TestHash{"32ec01ec4a6dac72c0ab96fb34c0b5d1", "a"}, - TestHash{"da853b0d3f88d99b30283a69e6ded6bb", "abc"}, - TestHash{"ab4f496bfb2a530b219ff33031fe06b0", "message digest"}, - TestHash{"4e8ddff3650292ab5a4108c3aa47940b", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"da33def2a42df13975352846c30338cd", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - TestHash{"d5976f79d83d3a0dc9806c3c66f3efd8", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := md2.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Official test vectors from https://datatracker.ietf.org/doc/html/rfc1319 + test_vectors := [?]TestHash { + TestHash{"8350e5a3e24c153df2275c9f80692773", ""}, + TestHash{"32ec01ec4a6dac72c0ab96fb34c0b5d1", "a"}, + TestHash{"da853b0d3f88d99b30283a69e6ded6bb", "abc"}, + TestHash{"ab4f496bfb2a530b219ff33031fe06b0", "message digest"}, + TestHash{"4e8ddff3650292ab5a4108c3aa47940b", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"da33def2a42df13975352846c30338cd", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + TestHash{"d5976f79d83d3a0dc9806c3c66f3efd8", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := md2.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_md4 :: proc(t: ^testing.T) { - // Official test vectors from https://datatracker.ietf.org/doc/html/rfc1320 - test_vectors := [?]TestHash { - TestHash{"31d6cfe0d16ae931b73c59d7e0c089c0", ""}, - TestHash{"bde52cb31de33e46245e05fbdbd6fb24", "a"}, - TestHash{"a448017aaf21d8525fc10ae87aa6729d", "abc"}, - TestHash{"d9130a8164549fe818874806e1c7014b", "message digest"}, - TestHash{"d79e1c308aa5bbcdeea8ed63df412da9", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"043f8582f241db351ce627e153e7f0e4", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - TestHash{"e33b4ddc9c38f2199c3e7b164fcc0536", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := md4.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Official test vectors from https://datatracker.ietf.org/doc/html/rfc1320 + test_vectors := [?]TestHash { + TestHash{"31d6cfe0d16ae931b73c59d7e0c089c0", ""}, + TestHash{"bde52cb31de33e46245e05fbdbd6fb24", "a"}, + TestHash{"a448017aaf21d8525fc10ae87aa6729d", "abc"}, + TestHash{"d9130a8164549fe818874806e1c7014b", "message digest"}, + TestHash{"d79e1c308aa5bbcdeea8ed63df412da9", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"043f8582f241db351ce627e153e7f0e4", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + TestHash{"e33b4ddc9c38f2199c3e7b164fcc0536", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := md4.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_md5 :: proc(t: ^testing.T) { - // Official test vectors from https://datatracker.ietf.org/doc/html/rfc1321 - test_vectors := [?]TestHash { - TestHash{"d41d8cd98f00b204e9800998ecf8427e", ""}, - TestHash{"0cc175b9c0f1b6a831c399e269772661", "a"}, - TestHash{"900150983cd24fb0d6963f7d28e17f72", "abc"}, - TestHash{"f96b697d7cb7938d525a2f31aaf161d0", "message digest"}, - TestHash{"c3fcd3d76192e4007dfb496cca67e13b", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"d174ab98d277d9f5a5611c2c9f419d9f", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - TestHash{"57edf4a22be3c955ac49da2e2107b67a", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := md5.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Official test vectors from https://datatracker.ietf.org/doc/html/rfc1321 + test_vectors := [?]TestHash { + TestHash{"d41d8cd98f00b204e9800998ecf8427e", ""}, + TestHash{"0cc175b9c0f1b6a831c399e269772661", "a"}, + TestHash{"900150983cd24fb0d6963f7d28e17f72", "abc"}, + TestHash{"f96b697d7cb7938d525a2f31aaf161d0", "message digest"}, + TestHash{"c3fcd3d76192e4007dfb496cca67e13b", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"d174ab98d277d9f5a5611c2c9f419d9f", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + TestHash{"57edf4a22be3c955ac49da2e2107b67a", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := md5.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha1 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"da39a3ee5e6b4b0d3255bfef95601890afd80709", ""}, - TestHash{"a9993e364706816aba3e25717850c26c9cd0d89d", "abc"}, - TestHash{"f9537c23893d2014f365adf8ffe33b8eb0297ed1", "abcdbcdecdefdefgefghfghighijhi"}, - TestHash{"346fb528a24b48f563cb061470bcfd23740427ad", "jkijkljklmklmnlmnomnopnopq"}, - TestHash{"86f7e437faa5a7fce15d1ddcb9eaeaea377667b8", "a"}, - TestHash{"c729c8996ee0a6f74f4f3248e8957edf704fb624", "01234567012345670123456701234567"}, - TestHash{"84983e441c3bd26ebaae4aa1f95129e5e54670f1", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"a49b2446a02c645bf419f995b67091253a04a259", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha1.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"da39a3ee5e6b4b0d3255bfef95601890afd80709", ""}, + TestHash{"a9993e364706816aba3e25717850c26c9cd0d89d", "abc"}, + TestHash{"f9537c23893d2014f365adf8ffe33b8eb0297ed1", "abcdbcdecdefdefgefghfghighijhi"}, + TestHash{"346fb528a24b48f563cb061470bcfd23740427ad", "jkijkljklmklmnlmnomnopnopq"}, + TestHash{"86f7e437faa5a7fce15d1ddcb9eaeaea377667b8", "a"}, + TestHash{"c729c8996ee0a6f74f4f3248e8957edf704fb624", "01234567012345670123456701234567"}, + TestHash{"84983e441c3bd26ebaae4aa1f95129e5e54670f1", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"a49b2446a02c645bf419f995b67091253a04a259", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha1.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha224 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f", ""}, - TestHash{"23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7", "abc"}, - TestHash{"75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"c97ca9a559850ce97a04a96def6d99a9e0e0e2ab14e6b8df265fc0b3", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha2.hash_224(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f", ""}, + TestHash{"23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7", "abc"}, + TestHash{"75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"c97ca9a559850ce97a04a96def6d99a9e0e0e2ab14e6b8df265fc0b3", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha2.hash_224(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha256 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", ""}, - TestHash{"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", "abc"}, - TestHash{"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha2.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", ""}, + TestHash{"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", "abc"}, + TestHash{"248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"cf5b16a778af8380036ce59e7b0492370b249b11e8f07a51afac45037afee9d1", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha2.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha384 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b", ""}, - TestHash{"cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7", "abc"}, - TestHash{"3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha2.hash_384(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b", ""}, + TestHash{"cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7", "abc"}, + TestHash{"3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha2.hash_384(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha512 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e", ""}, - TestHash{"ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f", "abc"}, - TestHash{"204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha2.hash_512(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e", ""}, + TestHash{"ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f", "abc"}, + TestHash{"204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha2.hash_512(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha3_224 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7", ""}, - TestHash{"e642824c3f8cf24ad09234ee7d3c766fc9a3a5168d0c94ad73b46fdf", "abc"}, - TestHash{"10241ac5187380bd501192e4e56b5280908727dd8fe0d10d4e5ad91e", "abcdbcdecdefdefgefghfghighijhi"}, - TestHash{"fd645fe07d814c397e85e85f92fe58b949f55efa4d3468b2468da45a", "jkijkljklmklmnlmnomnopnopq"}, - TestHash{"9e86ff69557ca95f405f081269685b38e3a819b309ee942f482b6a8b", "a"}, - TestHash{"6961f694b2ff3ed6f0c830d2c66da0c5e7ca9445f7c0dca679171112", "01234567012345670123456701234567"}, - TestHash{"8a24108b154ada21c9fd5574494479ba5c7e7ab76ef264ead0fcce33", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"543e6868e1666c1a643630df77367ae5a62a85070a51c14cbf665cbc", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha3.hash_224(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7", ""}, + TestHash{"e642824c3f8cf24ad09234ee7d3c766fc9a3a5168d0c94ad73b46fdf", "abc"}, + TestHash{"10241ac5187380bd501192e4e56b5280908727dd8fe0d10d4e5ad91e", "abcdbcdecdefdefgefghfghighijhi"}, + TestHash{"fd645fe07d814c397e85e85f92fe58b949f55efa4d3468b2468da45a", "jkijkljklmklmnlmnomnopnopq"}, + TestHash{"9e86ff69557ca95f405f081269685b38e3a819b309ee942f482b6a8b", "a"}, + TestHash{"6961f694b2ff3ed6f0c830d2c66da0c5e7ca9445f7c0dca679171112", "01234567012345670123456701234567"}, + TestHash{"8a24108b154ada21c9fd5574494479ba5c7e7ab76ef264ead0fcce33", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"543e6868e1666c1a643630df77367ae5a62a85070a51c14cbf665cbc", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha3.hash_224(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha3_256 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a", ""}, - TestHash{"3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532", "abc"}, - TestHash{"565ada1ced21278cfaffdde00dea0107964121ac25e4e978abc59412be74550a", "abcdbcdecdefdefgefghfghighijhi"}, - TestHash{"8cc1709d520f495ce972ece48b0d2e1f74ec80d53bc5c47457142158fae15d98", "jkijkljklmklmnlmnomnopnopq"}, - TestHash{"80084bf2fba02475726feb2cab2d8215eab14bc6bdd8bfb2c8151257032ecd8b", "a"}, - TestHash{"e4786de5f88f7d374b7288f225ea9f2f7654da200bab5d417e1fb52d49202767", "01234567012345670123456701234567"}, - TestHash{"41c0dba2a9d6240849100376a8235e2c82e1b9998a999e21db32dd97496d3376", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"916f6061fe879741ca6469b43971dfdb28b1a32dc36cb3254e812be27aad1d18", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha3.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a", ""}, + TestHash{"3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532", "abc"}, + TestHash{"565ada1ced21278cfaffdde00dea0107964121ac25e4e978abc59412be74550a", "abcdbcdecdefdefgefghfghighijhi"}, + TestHash{"8cc1709d520f495ce972ece48b0d2e1f74ec80d53bc5c47457142158fae15d98", "jkijkljklmklmnlmnomnopnopq"}, + TestHash{"80084bf2fba02475726feb2cab2d8215eab14bc6bdd8bfb2c8151257032ecd8b", "a"}, + TestHash{"e4786de5f88f7d374b7288f225ea9f2f7654da200bab5d417e1fb52d49202767", "01234567012345670123456701234567"}, + TestHash{"41c0dba2a9d6240849100376a8235e2c82e1b9998a999e21db32dd97496d3376", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"916f6061fe879741ca6469b43971dfdb28b1a32dc36cb3254e812be27aad1d18", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha3.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha3_384 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004", ""}, - TestHash{"ec01498288516fc926459f58e2c6ad8df9b473cb0fc08c2596da7cf0e49be4b298d88cea927ac7f539f1edf228376d25", "abc"}, - TestHash{"9aa92dbb716ebb573def0d5e3cdd28d6add38ada310b602b8916e690a3257b7144e5ddd3d0dbbc559c48480d34d57a9a", "abcdbcdecdefdefgefghfghighijhi"}, - TestHash{"77c90323d7392bcdee8a3e7f74f19f47b7d1b1a825ac6a2d8d882a72317879cc26597035f1fc24fe65090b125a691282", "jkijkljklmklmnlmnomnopnopq"}, - TestHash{"1815f774f320491b48569efec794d249eeb59aae46d22bf77dafe25c5edc28d7ea44f93ee1234aa88f61c91912a4ccd9", "a"}, - TestHash{"51072590ad4c51b27ff8265590d74f92de7cc55284168e414ca960087c693285b08a283c6b19d77632994cb9eb93f1be", "01234567012345670123456701234567"}, - TestHash{"991c665755eb3a4b6bbdfb75c78a492e8c56a22c5c4d7e429bfdbc32b9d4ad5aa04a1f076e62fea19eef51acd0657c22", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"79407d3b5916b59c3e30b09822974791c313fb9ecc849e406f23592d04f625dc8c709b98b43b3852b337216179aa7fc7", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha3.hash_384(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004", ""}, + TestHash{"ec01498288516fc926459f58e2c6ad8df9b473cb0fc08c2596da7cf0e49be4b298d88cea927ac7f539f1edf228376d25", "abc"}, + TestHash{"9aa92dbb716ebb573def0d5e3cdd28d6add38ada310b602b8916e690a3257b7144e5ddd3d0dbbc559c48480d34d57a9a", "abcdbcdecdefdefgefghfghighijhi"}, + TestHash{"77c90323d7392bcdee8a3e7f74f19f47b7d1b1a825ac6a2d8d882a72317879cc26597035f1fc24fe65090b125a691282", "jkijkljklmklmnlmnomnopnopq"}, + TestHash{"1815f774f320491b48569efec794d249eeb59aae46d22bf77dafe25c5edc28d7ea44f93ee1234aa88f61c91912a4ccd9", "a"}, + TestHash{"51072590ad4c51b27ff8265590d74f92de7cc55284168e414ca960087c693285b08a283c6b19d77632994cb9eb93f1be", "01234567012345670123456701234567"}, + TestHash{"991c665755eb3a4b6bbdfb75c78a492e8c56a22c5c4d7e429bfdbc32b9d4ad5aa04a1f076e62fea19eef51acd0657c22", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"79407d3b5916b59c3e30b09822974791c313fb9ecc849e406f23592d04f625dc8c709b98b43b3852b337216179aa7fc7", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha3.hash_384(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sha3_512 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26", ""}, - TestHash{"b751850b1a57168a5693cd924b6b096e08f621827444f70d884f5d0240d2712e10e116e9192af3c91a7ec57647e3934057340b4cf408d5a56592f8274eec53f0", "abc"}, - TestHash{"9f9a327944a35988d67effc4fa748b3c07744f736ac70b479d8e12a3d10d6884d00a7ef593690305462e9e9030a67c51636fd346fd8fa0ee28a5ac2aee103d2e", "abcdbcdecdefdefgefghfghighijhi"}, - TestHash{"dbb124a0deda966eb4d199d0844fa0beb0770ea1ccddabcd335a7939a931ac6fb4fa6aebc6573f462ced2e4e7178277803be0d24d8bc2864626d9603109b7891", "jkijkljklmklmnlmnomnopnopq"}, - TestHash{"697f2d856172cb8309d6b8b97dac4de344b549d4dee61edfb4962d8698b7fa803f4f93ff24393586e28b5b957ac3d1d369420ce53332712f997bd336d09ab02a", "a"}, - TestHash{"5679e353bc8eeea3e801ca60448b249bcfd3ac4a6c3abe429a807bcbd4c9cd12da87a5a9dc74fde64c0d44718632cae966b078397c6f9ec155c6a238f2347cf1", "01234567012345670123456701234567"}, - TestHash{"04a371e84ecfb5b8b77cb48610fca8182dd457ce6f326a0fd3d7ec2f1e91636dee691fbe0c985302ba1b0d8dc78c086346b533b49c030d99a27daf1139d6e75e", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"afebb2ef542e6579c50cad06d2e578f9f8dd6881d7dc824d26360feebf18a4fa73e3261122948efcfd492e74e82e2189ed0fb440d187f382270cb455f21dd185", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, - } - for v, _ in test_vectors { - computed := sha3.hash_512(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26", ""}, + TestHash{"b751850b1a57168a5693cd924b6b096e08f621827444f70d884f5d0240d2712e10e116e9192af3c91a7ec57647e3934057340b4cf408d5a56592f8274eec53f0", "abc"}, + TestHash{"9f9a327944a35988d67effc4fa748b3c07744f736ac70b479d8e12a3d10d6884d00a7ef593690305462e9e9030a67c51636fd346fd8fa0ee28a5ac2aee103d2e", "abcdbcdecdefdefgefghfghighijhi"}, + TestHash{"dbb124a0deda966eb4d199d0844fa0beb0770ea1ccddabcd335a7939a931ac6fb4fa6aebc6573f462ced2e4e7178277803be0d24d8bc2864626d9603109b7891", "jkijkljklmklmnlmnomnopnopq"}, + TestHash{"697f2d856172cb8309d6b8b97dac4de344b549d4dee61edfb4962d8698b7fa803f4f93ff24393586e28b5b957ac3d1d369420ce53332712f997bd336d09ab02a", "a"}, + TestHash{"5679e353bc8eeea3e801ca60448b249bcfd3ac4a6c3abe429a807bcbd4c9cd12da87a5a9dc74fde64c0d44718632cae966b078397c6f9ec155c6a238f2347cf1", "01234567012345670123456701234567"}, + TestHash{"04a371e84ecfb5b8b77cb48610fca8182dd457ce6f326a0fd3d7ec2f1e91636dee691fbe0c985302ba1b0d8dc78c086346b533b49c030d99a27daf1139d6e75e", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"afebb2ef542e6579c50cad06d2e578f9f8dd6881d7dc824d26360feebf18a4fa73e3261122948efcfd492e74e82e2189ed0fb440d187f382270cb455f21dd185", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"}, + } + for v, _ in test_vectors { + computed := sha3.hash_512(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_shake_128 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"7f9c2ba4e88f827d616045507605853e", ""}, - TestHash{"f4202e3c5852f9182a0430fd8144f0a7", "The quick brown fox jumps over the lazy dog"}, - TestHash{"853f4538be0db9621a6cea659a06c110", "The quick brown fox jumps over the lazy dof"}, - } - for v, _ in test_vectors { - computed := shake.hash_128(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"7f9c2ba4e88f827d616045507605853e", ""}, + TestHash{"f4202e3c5852f9182a0430fd8144f0a7", "The quick brown fox jumps over the lazy dog"}, + TestHash{"853f4538be0db9621a6cea659a06c110", "The quick brown fox jumps over the lazy dof"}, + } + for v, _ in test_vectors { + computed := shake.hash_128(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_shake_256 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762f", ""}, - TestHash{"2f671343d9b2e1604dc9dcf0753e5fe15c7c64a0d283cbbf722d411a0e36f6ca", "The quick brown fox jumps over the lazy dog"}, - TestHash{"46b1ebb2e142c38b9ac9081bef72877fe4723959640fa57119b366ce6899d401", "The quick brown fox jumps over the lazy dof"}, - } - for v, _ in test_vectors { - computed := shake.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762f", ""}, + TestHash{"2f671343d9b2e1604dc9dcf0753e5fe15c7c64a0d283cbbf722d411a0e36f6ca", "The quick brown fox jumps over the lazy dog"}, + TestHash{"46b1ebb2e142c38b9ac9081bef72877fe4723959640fa57119b366ce6899d401", "The quick brown fox jumps over the lazy dof"}, + } + for v, _ in test_vectors { + computed := shake.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_keccak_224 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"f71837502ba8e10837bdd8d365adb85591895602fc552b48b7390abd", ""}, - TestHash{"c30411768506ebe1c2871b1ee2e87d38df342317300a9b97a95ec6a8", "abc"}, - } - for v, _ in test_vectors { - computed := keccak.hash_224(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"f71837502ba8e10837bdd8d365adb85591895602fc552b48b7390abd", ""}, + TestHash{"c30411768506ebe1c2871b1ee2e87d38df342317300a9b97a95ec6a8", "abc"}, + } + for v, _ in test_vectors { + computed := keccak.hash_224(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_keccak_256 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", ""}, - TestHash{"4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45", "abc"}, - } - for v, _ in test_vectors { - computed := keccak.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", ""}, + TestHash{"4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45", "abc"}, + } + for v, _ in test_vectors { + computed := keccak.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_keccak_384 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"2c23146a63a29acf99e73b88f8c24eaa7dc60aa771780ccc006afbfa8fe2479b2dd2b21362337441ac12b515911957ff", ""}, - TestHash{"f7df1165f033337be098e7d288ad6a2f74409d7a60b49c36642218de161b1f99f8c681e4afaf31a34db29fb763e3c28e", "abc"}, - } - for v, _ in test_vectors { - computed := keccak.hash_384(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"2c23146a63a29acf99e73b88f8c24eaa7dc60aa771780ccc006afbfa8fe2479b2dd2b21362337441ac12b515911957ff", ""}, + TestHash{"f7df1165f033337be098e7d288ad6a2f74409d7a60b49c36642218de161b1f99f8c681e4afaf31a34db29fb763e3c28e", "abc"}, + } + for v, _ in test_vectors { + computed := keccak.hash_384(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_keccak_512 :: proc(t: ^testing.T) { - // Test vectors from - // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf - // https://www.di-mgt.com.au/sha_testvectors.html - test_vectors := [?]TestHash { - TestHash{"0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e", ""}, - TestHash{"18587dc2ea106b9a1563e32b3312421ca164c7f1f07bc922a9c83d77cea3a1e5d0c69910739025372dc14ac9642629379540c17e2a65b19d77aa511a9d00bb96", "abc"}, - } - for v, _ in test_vectors { - computed := keccak.hash_512(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://csrc.nist.gov/csrc/media/projects/cryptographic-standards-and-guidelines/documents/examples/sha_all.pdf + // https://www.di-mgt.com.au/sha_testvectors.html + test_vectors := [?]TestHash { + TestHash{"0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e", ""}, + TestHash{"18587dc2ea106b9a1563e32b3312421ca164c7f1f07bc922a9c83d77cea3a1e5d0c69910739025372dc14ac9642629379540c17e2a65b19d77aa511a9d00bb96", "abc"}, + } + for v, _ in test_vectors { + computed := keccak.hash_512(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_whirlpool :: proc(t: ^testing.T) { - // Test vectors from - // https://web.archive.org/web/20171129084214/http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html - test_vectors := [?]TestHash { - TestHash{"19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3", ""}, - TestHash{"8aca2602792aec6f11a67206531fb7d7f0dff59413145e6973c45001d0087b42d11bc645413aeff63a42391a39145a591a92200d560195e53b478584fdae231a", "a"}, - TestHash{"33e24e6cbebf168016942df8a7174048f9cebc45cbd829c3b94b401a498acb11c5abcca7f2a1238aaf534371e87a4e4b19758965d5a35a7cad87cf5517043d97", "ab"}, - TestHash{"4e2448a4c6f486bb16b6562c73b4020bf3043e3a731bce721ae1b303d97e6d4c7181eebdb6c57e277d0e34957114cbd6c797fc9d95d8b582d225292076d4eef5", "abc"}, - TestHash{"bda164f0b930c43a1bacb5df880b205d15ac847add35145bf25d991ae74f0b72b1ac794f8aacda5fcb3c47038c954742b1857b5856519de4d1e54bfa2fa4eac5", "abcd"}, - TestHash{"5d745e26ccb20fe655d39c9e7f69455758fbae541cb892b3581e4869244ab35b4fd6078f5d28b1f1a217452a67d9801033d92724a221255a5e377fe9e9e5f0b2", "abcde"}, - TestHash{"a73e425459567308ba5f9eb2ae23570d0d0575eb1357ecf6ac88d4e0358b0ac3ea2371261f5d4c070211784b525911b9eec0ad968429bb7c7891d341cff4e811", "abcdef"}, - TestHash{"08b388f68fd3eb51906ac3d3c699b8e9c3ac65d7ceb49d2e34f8a482cbc3082bc401cead90e85a97b8647c948bf35e448740b79659f3bee42145f0bd653d1f25", "abcdefg"}, - TestHash{"1f1a84d30612820243afe2022712f9dac6d07c4c8bb41b40eacab0184c8d82275da5bcadbb35c7ca1960ff21c90acbae8c14e48d9309e4819027900e882c7ad9", "abcdefgh"}, - TestHash{"11882bc9a31ac1cf1c41dcd9fd6fdd3ccdb9b017fc7f4582680134f314d7bb49af4c71f5a920bc0a6a3c1ff9a00021bf361d9867fe636b0bc1da1552e4237de4", "abcdefghi"}, - TestHash{"717163de24809ffcf7ff6d5aba72b8d67c2129721953c252a4ddfb107614be857cbd76a9d5927de14633d6bdc9ddf335160b919db5c6f12cb2e6549181912eef", "abcdefghij"}, - TestHash{"b97de512e91e3828b40d2b0fdce9ceb3c4a71f9bea8d88e75c4fa854df36725fd2b52eb6544edcacd6f8beddfea403cb55ae31f03ad62a5ef54e42ee82c3fb35", "The quick brown fox jumps over the lazy dog"}, - TestHash{"c27ba124205f72e6847f3e19834f925cc666d0974167af915bb462420ed40cc50900d85a1f923219d832357750492d5c143011a76988344c2635e69d06f2d38c", "The quick brown fox jumps over the lazy eog"}, - } - for v, _ in test_vectors { - computed := whirlpool.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://web.archive.org/web/20171129084214/http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html + test_vectors := [?]TestHash { + TestHash{"19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3", ""}, + TestHash{"8aca2602792aec6f11a67206531fb7d7f0dff59413145e6973c45001d0087b42d11bc645413aeff63a42391a39145a591a92200d560195e53b478584fdae231a", "a"}, + TestHash{"33e24e6cbebf168016942df8a7174048f9cebc45cbd829c3b94b401a498acb11c5abcca7f2a1238aaf534371e87a4e4b19758965d5a35a7cad87cf5517043d97", "ab"}, + TestHash{"4e2448a4c6f486bb16b6562c73b4020bf3043e3a731bce721ae1b303d97e6d4c7181eebdb6c57e277d0e34957114cbd6c797fc9d95d8b582d225292076d4eef5", "abc"}, + TestHash{"bda164f0b930c43a1bacb5df880b205d15ac847add35145bf25d991ae74f0b72b1ac794f8aacda5fcb3c47038c954742b1857b5856519de4d1e54bfa2fa4eac5", "abcd"}, + TestHash{"5d745e26ccb20fe655d39c9e7f69455758fbae541cb892b3581e4869244ab35b4fd6078f5d28b1f1a217452a67d9801033d92724a221255a5e377fe9e9e5f0b2", "abcde"}, + TestHash{"a73e425459567308ba5f9eb2ae23570d0d0575eb1357ecf6ac88d4e0358b0ac3ea2371261f5d4c070211784b525911b9eec0ad968429bb7c7891d341cff4e811", "abcdef"}, + TestHash{"08b388f68fd3eb51906ac3d3c699b8e9c3ac65d7ceb49d2e34f8a482cbc3082bc401cead90e85a97b8647c948bf35e448740b79659f3bee42145f0bd653d1f25", "abcdefg"}, + TestHash{"1f1a84d30612820243afe2022712f9dac6d07c4c8bb41b40eacab0184c8d82275da5bcadbb35c7ca1960ff21c90acbae8c14e48d9309e4819027900e882c7ad9", "abcdefgh"}, + TestHash{"11882bc9a31ac1cf1c41dcd9fd6fdd3ccdb9b017fc7f4582680134f314d7bb49af4c71f5a920bc0a6a3c1ff9a00021bf361d9867fe636b0bc1da1552e4237de4", "abcdefghi"}, + TestHash{"717163de24809ffcf7ff6d5aba72b8d67c2129721953c252a4ddfb107614be857cbd76a9d5927de14633d6bdc9ddf335160b919db5c6f12cb2e6549181912eef", "abcdefghij"}, + TestHash{"b97de512e91e3828b40d2b0fdce9ceb3c4a71f9bea8d88e75c4fa854df36725fd2b52eb6544edcacd6f8beddfea403cb55ae31f03ad62a5ef54e42ee82c3fb35", "The quick brown fox jumps over the lazy dog"}, + TestHash{"c27ba124205f72e6847f3e19834f925cc666d0974167af915bb462420ed40cc50900d85a1f923219d832357750492d5c143011a76988344c2635e69d06f2d38c", "The quick brown fox jumps over the lazy eog"}, + } + for v, _ in test_vectors { + computed := whirlpool.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_gost :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"981e5f3ca30c841487830f84fb433e13ac1101569b9c13584ac483234cd656c0", ""}, - TestHash{"e74c52dd282183bf37af0079c9f78055715a103f17e3133ceff1aacf2f403011", "a"}, - TestHash{"b285056dbf18d7392d7677369524dd14747459ed8143997e163b2986f92fd42c", "abc"}, - TestHash{"bc6041dd2aa401ebfa6e9886734174febdb4729aa972d60f549ac39b29721ba0", "message digest"}, - TestHash{"9004294a361a508c586fe53d1f1b02746765e71b765472786e4770d565830a76", "The quick brown fox jumps over the lazy dog"}, - TestHash{"73b70a39497de53a6e08c67b6d4db853540f03e9389299d9b0156ef7e85d0f61", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - TestHash{"6bc7b38989b28cf93ae8842bf9d752905910a7528a61e5bce0782de43e610c90", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - TestHash{"2cefc2f7b7bdc514e18ea57fa74ff357e7fa17d652c75f69cb1be7893ede48eb", "This is message, length=32 bytes"}, - TestHash{"c3730c5cbccacf915ac292676f21e8bd4ef75331d9405e5f1a61dc3130a65011", "Suppose the original message has length = 50 bytes"}, - } - for v, _ in test_vectors { - computed := gost.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"981e5f3ca30c841487830f84fb433e13ac1101569b9c13584ac483234cd656c0", ""}, + TestHash{"e74c52dd282183bf37af0079c9f78055715a103f17e3133ceff1aacf2f403011", "a"}, + TestHash{"b285056dbf18d7392d7677369524dd14747459ed8143997e163b2986f92fd42c", "abc"}, + TestHash{"bc6041dd2aa401ebfa6e9886734174febdb4729aa972d60f549ac39b29721ba0", "message digest"}, + TestHash{"9004294a361a508c586fe53d1f1b02746765e71b765472786e4770d565830a76", "The quick brown fox jumps over the lazy dog"}, + TestHash{"73b70a39497de53a6e08c67b6d4db853540f03e9389299d9b0156ef7e85d0f61", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + TestHash{"6bc7b38989b28cf93ae8842bf9d752905910a7528a61e5bce0782de43e610c90", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + TestHash{"2cefc2f7b7bdc514e18ea57fa74ff357e7fa17d652c75f69cb1be7893ede48eb", "This is message, length=32 bytes"}, + TestHash{"c3730c5cbccacf915ac292676f21e8bd4ef75331d9405e5f1a61dc3130a65011", "Suppose the original message has length = 50 bytes"}, + } + for v, _ in test_vectors { + computed := gost.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_streebog_256 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb", ""}, - TestHash{"3e7dea7f2384b6c5a3d0e24aaa29c05e89ddd762145030ec22c71a6db8b2c1f4", "The quick brown fox jumps over the lazy dog"}, - TestHash{"36816a824dcbe7d6171aa58500741f2ea2757ae2e1784ab72c5c3c6c198d71da", "The quick brown fox jumps over the lazy dog."}, - } - for v, _ in test_vectors { - computed := streebog.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb", ""}, + TestHash{"3e7dea7f2384b6c5a3d0e24aaa29c05e89ddd762145030ec22c71a6db8b2c1f4", "The quick brown fox jumps over the lazy dog"}, + TestHash{"36816a824dcbe7d6171aa58500741f2ea2757ae2e1784ab72c5c3c6c198d71da", "The quick brown fox jumps over the lazy dog."}, + } + for v, _ in test_vectors { + computed := streebog.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_streebog_512 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"8e945da209aa869f0455928529bcae4679e9873ab707b55315f56ceb98bef0a7362f715528356ee83cda5f2aac4c6ad2ba3a715c1bcd81cb8e9f90bf4c1c1a8a", ""}, - TestHash{"d2b793a0bb6cb5904828b5b6dcfb443bb8f33efc06ad09368878ae4cdc8245b97e60802469bed1e7c21a64ff0b179a6a1e0bb74d92965450a0adab69162c00fe", "The quick brown fox jumps over the lazy dog"}, - TestHash{"fe0c42f267d921f940faa72bd9fcf84f9f1bd7e9d055e9816e4c2ace1ec83be82d2957cd59b86e123d8f5adee80b3ca08a017599a9fc1a14d940cf87c77df070", "The quick brown fox jumps over the lazy dog."}, - } - for v, _ in test_vectors { - computed := streebog.hash_512(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"8e945da209aa869f0455928529bcae4679e9873ab707b55315f56ceb98bef0a7362f715528356ee83cda5f2aac4c6ad2ba3a715c1bcd81cb8e9f90bf4c1c1a8a", ""}, + TestHash{"d2b793a0bb6cb5904828b5b6dcfb443bb8f33efc06ad09368878ae4cdc8245b97e60802469bed1e7c21a64ff0b179a6a1e0bb74d92965450a0adab69162c00fe", "The quick brown fox jumps over the lazy dog"}, + TestHash{"fe0c42f267d921f940faa72bd9fcf84f9f1bd7e9d055e9816e4c2ace1ec83be82d2957cd59b86e123d8f5adee80b3ca08a017599a9fc1a14d940cf87c77df070", "The quick brown fox jumps over the lazy dog."}, + } + for v, _ in test_vectors { + computed := streebog.hash_512(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_blake_224 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"7dc5313b1c04512a174bd6503b89607aecbee0903d40a8a569c94eed", ""}, - TestHash{"304c27fdbf308aea06955e331adc6814223a21fccd24c09fde9eda7b", "ube"}, - TestHash{"cfb6848add73e1cb47994c4765df33b8f973702705a30a71fe4747a3", "BLAKE"}, - } - for v, _ in test_vectors { - computed := blake.hash_224(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"7dc5313b1c04512a174bd6503b89607aecbee0903d40a8a569c94eed", ""}, + TestHash{"304c27fdbf308aea06955e331adc6814223a21fccd24c09fde9eda7b", "ube"}, + TestHash{"cfb6848add73e1cb47994c4765df33b8f973702705a30a71fe4747a3", "BLAKE"}, + } + for v, _ in test_vectors { + computed := blake.hash_224(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_blake_256 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"716f6e863f744b9ac22c97ec7b76ea5f5908bc5b2f67c61510bfc4751384ea7a", ""}, - TestHash{"e802fe2a73fbe5853408f051d040aeb3a76a4d7a0fc5c3415d1af090f76a2c81", "ube"}, - TestHash{"07663e00cf96fbc136cf7b1ee099c95346ba3920893d18cc8851f22ee2e36aa6", "BLAKE"}, - } - for v, _ in test_vectors { - computed := blake.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"716f6e863f744b9ac22c97ec7b76ea5f5908bc5b2f67c61510bfc4751384ea7a", ""}, + TestHash{"e802fe2a73fbe5853408f051d040aeb3a76a4d7a0fc5c3415d1af090f76a2c81", "ube"}, + TestHash{"07663e00cf96fbc136cf7b1ee099c95346ba3920893d18cc8851f22ee2e36aa6", "BLAKE"}, + } + for v, _ in test_vectors { + computed := blake.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_blake_384 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"c6cbd89c926ab525c242e6621f2f5fa73aa4afe3d9e24aed727faaadd6af38b620bdb623dd2b4788b1c8086984af8706", ""}, - TestHash{"8f22f120b2b99dd4fd32b98c8c83bd87abd6413f7317be936b1997511247fc68ae781c6f42113224ccbc1567b0e88593", "ube"}, - TestHash{"f28742f7243990875d07e6afcff962edabdf7e9d19ddea6eae31d094c7fa6d9b00c8213a02ddf1e2d9894f3162345d85", "BLAKE"}, - } - for v, _ in test_vectors { - computed := blake.hash_384(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"c6cbd89c926ab525c242e6621f2f5fa73aa4afe3d9e24aed727faaadd6af38b620bdb623dd2b4788b1c8086984af8706", ""}, + TestHash{"8f22f120b2b99dd4fd32b98c8c83bd87abd6413f7317be936b1997511247fc68ae781c6f42113224ccbc1567b0e88593", "ube"}, + TestHash{"f28742f7243990875d07e6afcff962edabdf7e9d19ddea6eae31d094c7fa6d9b00c8213a02ddf1e2d9894f3162345d85", "BLAKE"}, + } + for v, _ in test_vectors { + computed := blake.hash_384(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_blake_512 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"a8cfbbd73726062df0c6864dda65defe58ef0cc52a5625090fa17601e1eecd1b628e94f396ae402a00acc9eab77b4d4c2e852aaaa25a636d80af3fc7913ef5b8", ""}, - TestHash{"49a24ca8f230936f938c19484d46b58f13ea4448ddadafecdf01419b1e1dd922680be2de84069187973ab61b10574da2ee50cbeaade68ea9391c8ec041b76be0", "ube"}, - TestHash{"7bf805d0d8de36802b882e65d0515aa7682a2be97a9d9ec1399f4be2eff7de07684d7099124c8ac81c1c7c200d24ba68c6222e75062e04feb0e9dd589aa6e3b7", "BLAKE"}, - } - for v, _ in test_vectors { - computed := blake.hash_512(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"a8cfbbd73726062df0c6864dda65defe58ef0cc52a5625090fa17601e1eecd1b628e94f396ae402a00acc9eab77b4d4c2e852aaaa25a636d80af3fc7913ef5b8", ""}, + TestHash{"49a24ca8f230936f938c19484d46b58f13ea4448ddadafecdf01419b1e1dd922680be2de84069187973ab61b10574da2ee50cbeaade68ea9391c8ec041b76be0", "ube"}, + TestHash{"7bf805d0d8de36802b882e65d0515aa7682a2be97a9d9ec1399f4be2eff7de07684d7099124c8ac81c1c7c200d24ba68c6222e75062e04feb0e9dd589aa6e3b7", "BLAKE"}, + } + for v, _ in test_vectors { + computed := blake.hash_512(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_blake2b :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce", ""}, - TestHash{"a8add4bdddfd93e4877d2746e62817b116364a1fa7bc148d95090bc7333b3673f82401cf7aa2e4cb1ecd90296e3f14cb5413f8ed77be73045b13914cdcd6a918", "The quick brown fox jumps over the lazy dog"}, - } - for v, _ in test_vectors { - computed := blake2b.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce", ""}, + TestHash{"a8add4bdddfd93e4877d2746e62817b116364a1fa7bc148d95090bc7333b3673f82401cf7aa2e4cb1ecd90296e3f14cb5413f8ed77be73045b13914cdcd6a918", "The quick brown fox jumps over the lazy dog"}, + } + for v, _ in test_vectors { + computed := blake2b.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_blake2s :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9", ""}, - TestHash{"606beeec743ccbeff6cbcdf5d5302aa855c256c29b88c8ed331ea1a6bf3c8812", "The quick brown fox jumps over the lazy dog"}, - } - for v, _ in test_vectors { - computed := blake2s.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9", ""}, + TestHash{"606beeec743ccbeff6cbcdf5d5302aa855c256c29b88c8ed331ea1a6bf3c8812", "The quick brown fox jumps over the lazy dog"}, + } + for v, _ in test_vectors { + computed := blake2s.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_ripemd_128 :: proc(t: ^testing.T) { - // Test vectors from - // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html - test_vectors := [?]TestHash { - TestHash{"cdf26213a150dc3ecb610f18f6b38b46", ""}, - TestHash{"86be7afa339d0fc7cfc785e72f578d33", "a"}, - TestHash{"c14a12199c66e4ba84636b0f69144c77", "abc"}, - TestHash{"9e327b3d6e523062afc1132d7df9d1b8", "message digest"}, - TestHash{"fd2aa607f71dc8f510714922b371834e", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"a1aa0689d0fafa2ddc22e88b49133a06", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"d1e959eb179c911faea4624c60c5c702", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - } - for v, _ in test_vectors { - computed := ripemd.hash_128(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html + test_vectors := [?]TestHash { + TestHash{"cdf26213a150dc3ecb610f18f6b38b46", ""}, + TestHash{"86be7afa339d0fc7cfc785e72f578d33", "a"}, + TestHash{"c14a12199c66e4ba84636b0f69144c77", "abc"}, + TestHash{"9e327b3d6e523062afc1132d7df9d1b8", "message digest"}, + TestHash{"fd2aa607f71dc8f510714922b371834e", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"a1aa0689d0fafa2ddc22e88b49133a06", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"d1e959eb179c911faea4624c60c5c702", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + } + for v, _ in test_vectors { + computed := ripemd.hash_128(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_ripemd_160 :: proc(t: ^testing.T) { - // Test vectors from - // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html - test_vectors := [?]TestHash { - TestHash{"9c1185a5c5e9fc54612808977ee8f548b2258d31", ""}, - TestHash{"0bdc9d2d256b3ee9daae347be6f4dc835a467ffe", "a"}, - TestHash{"8eb208f7e05d987a9b044a8e98c6b087f15a0bfc", "abc"}, - TestHash{"5d0689ef49d2fae572b881b123a85ffa21595f36", "message digest"}, - TestHash{"f71c27109c692c1b56bbdceb5b9d2865b3708dbc", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"12a053384a9c0c88e405a06c27dcf49ada62eb2b", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"b0e20b6e3116640286ed3a87a5713079b21f5189", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - } - for v, _ in test_vectors { - computed := ripemd.hash_160(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html + test_vectors := [?]TestHash { + TestHash{"9c1185a5c5e9fc54612808977ee8f548b2258d31", ""}, + TestHash{"0bdc9d2d256b3ee9daae347be6f4dc835a467ffe", "a"}, + TestHash{"8eb208f7e05d987a9b044a8e98c6b087f15a0bfc", "abc"}, + TestHash{"5d0689ef49d2fae572b881b123a85ffa21595f36", "message digest"}, + TestHash{"f71c27109c692c1b56bbdceb5b9d2865b3708dbc", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"12a053384a9c0c88e405a06c27dcf49ada62eb2b", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"b0e20b6e3116640286ed3a87a5713079b21f5189", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + } + for v, _ in test_vectors { + computed := ripemd.hash_160(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_ripemd_256 :: proc(t: ^testing.T) { - // Test vectors from - // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html - test_vectors := [?]TestHash { - TestHash{"02ba4c4e5f8ecd1877fc52d64d30e37a2d9774fb1e5d026380ae0168e3c5522d", ""}, - TestHash{"f9333e45d857f5d90a91bab70a1eba0cfb1be4b0783c9acfcd883a9134692925", "a"}, - TestHash{"afbd6e228b9d8cbbcef5ca2d03e6dba10ac0bc7dcbe4680e1e42d2e975459b65", "abc"}, - TestHash{"87e971759a1ce47a514d5c914c392c9018c7c46bc14465554afcdf54a5070c0e", "message digest"}, - TestHash{"649d3034751ea216776bf9a18acc81bc7896118a5197968782dd1fd97d8d5133", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"3843045583aac6c8c8d9128573e7a9809afb2a0f34ccc36ea9e72f16f6368e3f", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"5740a408ac16b720b84424ae931cbb1fe363d1d0bf4017f1a89f7ea6de77a0b8", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - } - for v, _ in test_vectors { - computed := ripemd.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html + test_vectors := [?]TestHash { + TestHash{"02ba4c4e5f8ecd1877fc52d64d30e37a2d9774fb1e5d026380ae0168e3c5522d", ""}, + TestHash{"f9333e45d857f5d90a91bab70a1eba0cfb1be4b0783c9acfcd883a9134692925", "a"}, + TestHash{"afbd6e228b9d8cbbcef5ca2d03e6dba10ac0bc7dcbe4680e1e42d2e975459b65", "abc"}, + TestHash{"87e971759a1ce47a514d5c914c392c9018c7c46bc14465554afcdf54a5070c0e", "message digest"}, + TestHash{"649d3034751ea216776bf9a18acc81bc7896118a5197968782dd1fd97d8d5133", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"3843045583aac6c8c8d9128573e7a9809afb2a0f34ccc36ea9e72f16f6368e3f", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"5740a408ac16b720b84424ae931cbb1fe363d1d0bf4017f1a89f7ea6de77a0b8", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + } + for v, _ in test_vectors { + computed := ripemd.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_ripemd_320 :: proc(t: ^testing.T) { - // Test vectors from - // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html - test_vectors := [?]TestHash { - TestHash{"22d65d5661536cdc75c1fdf5c6de7b41b9f27325ebc61e8557177d705a0ec880151c3a32a00899b8", ""}, - TestHash{"ce78850638f92658a5a585097579926dda667a5716562cfcf6fbe77f63542f99b04705d6970dff5d", "a"}, - TestHash{"de4c01b3054f8930a79d09ae738e92301e5a17085beffdc1b8d116713e74f82fa942d64cdbc4682d", "abc"}, - TestHash{"3a8e28502ed45d422f68844f9dd316e7b98533fa3f2a91d29f84d425c88d6b4eff727df66a7c0197", "message digest"}, - TestHash{"cabdb1810b92470a2093aa6bce05952c28348cf43ff60841975166bb40ed234004b8824463e6b009", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"d034a7950cf722021ba4b84df769a5de2060e259df4c9bb4a4268c0e935bbc7470a969c9d072a1ac", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"ed544940c86d67f250d232c30b7b3e5770e0c60c8cb9a4cafe3b11388af9920e1b99230b843c86a4", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - } - for v, _ in test_vectors { - computed := ripemd.hash_320(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + // Test vectors from + // https://homes.esat.kuleuven.be/~bosselae/ripemd160.html + test_vectors := [?]TestHash { + TestHash{"22d65d5661536cdc75c1fdf5c6de7b41b9f27325ebc61e8557177d705a0ec880151c3a32a00899b8", ""}, + TestHash{"ce78850638f92658a5a585097579926dda667a5716562cfcf6fbe77f63542f99b04705d6970dff5d", "a"}, + TestHash{"de4c01b3054f8930a79d09ae738e92301e5a17085beffdc1b8d116713e74f82fa942d64cdbc4682d", "abc"}, + TestHash{"3a8e28502ed45d422f68844f9dd316e7b98533fa3f2a91d29f84d425c88d6b4eff727df66a7c0197", "message digest"}, + TestHash{"cabdb1810b92470a2093aa6bce05952c28348cf43ff60841975166bb40ed234004b8824463e6b009", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"d034a7950cf722021ba4b84df769a5de2060e259df4c9bb4a4268c0e935bbc7470a969c9d072a1ac", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"ed544940c86d67f250d232c30b7b3e5770e0c60c8cb9a4cafe3b11388af9920e1b99230b843c86a4", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + } + for v, _ in test_vectors { + computed := ripemd.hash_320(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_tiger_128 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"3293ac630c13f0245f92bbb1766e1616", ""}, - TestHash{"77befbef2e7ef8ab2ec8f93bf587a7fc", "a"}, - TestHash{"2aab1484e8c158f2bfb8c5ff41b57a52", "abc"}, - TestHash{"d981f8cb78201a950dcf3048751e441c", "message digest"}, - TestHash{"1714a472eee57d30040412bfcc55032a", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"0f7bf9a19b9c58f2b7610df7e84f0ac3", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"8dcea680a17583ee502ba38a3c368651", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - TestHash{"1c14795529fd9f207a958f84c52f11e8", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - TestHash{"6d12a41e72e644f017b6f0e2f7b44c62", "The quick brown fox jumps over the lazy dog"}, - } - for v, _ in test_vectors { - computed := tiger.hash_128(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"3293ac630c13f0245f92bbb1766e1616", ""}, + TestHash{"77befbef2e7ef8ab2ec8f93bf587a7fc", "a"}, + TestHash{"2aab1484e8c158f2bfb8c5ff41b57a52", "abc"}, + TestHash{"d981f8cb78201a950dcf3048751e441c", "message digest"}, + TestHash{"1714a472eee57d30040412bfcc55032a", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"0f7bf9a19b9c58f2b7610df7e84f0ac3", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"8dcea680a17583ee502ba38a3c368651", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + TestHash{"1c14795529fd9f207a958f84c52f11e8", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + TestHash{"6d12a41e72e644f017b6f0e2f7b44c62", "The quick brown fox jumps over the lazy dog"}, + } + for v, _ in test_vectors { + computed := tiger.hash_128(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_tiger_160 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"3293ac630c13f0245f92bbb1766e16167a4e5849", ""}, - TestHash{"77befbef2e7ef8ab2ec8f93bf587a7fc613e247f", "a"}, - TestHash{"2aab1484e8c158f2bfb8c5ff41b57a525129131c", "abc"}, - TestHash{"d981f8cb78201a950dcf3048751e441c517fca1a", "message digest"}, - TestHash{"1714a472eee57d30040412bfcc55032a0b11602f", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"0f7bf9a19b9c58f2b7610df7e84f0ac3a71c631e", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"8dcea680a17583ee502ba38a3c368651890ffbcc", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - TestHash{"1c14795529fd9f207a958f84c52f11e887fa0cab", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - TestHash{"6d12a41e72e644f017b6f0e2f7b44c6285f06dd5", "The quick brown fox jumps over the lazy dog"}, - } - for v, _ in test_vectors { - computed := tiger.hash_160(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"3293ac630c13f0245f92bbb1766e16167a4e5849", ""}, + TestHash{"77befbef2e7ef8ab2ec8f93bf587a7fc613e247f", "a"}, + TestHash{"2aab1484e8c158f2bfb8c5ff41b57a525129131c", "abc"}, + TestHash{"d981f8cb78201a950dcf3048751e441c517fca1a", "message digest"}, + TestHash{"1714a472eee57d30040412bfcc55032a0b11602f", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"0f7bf9a19b9c58f2b7610df7e84f0ac3a71c631e", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"8dcea680a17583ee502ba38a3c368651890ffbcc", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + TestHash{"1c14795529fd9f207a958f84c52f11e887fa0cab", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + TestHash{"6d12a41e72e644f017b6f0e2f7b44c6285f06dd5", "The quick brown fox jumps over the lazy dog"}, + } + for v, _ in test_vectors { + computed := tiger.hash_160(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_tiger_192 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"3293ac630c13f0245f92bbb1766e16167a4e58492dde73f3", ""}, - TestHash{"77befbef2e7ef8ab2ec8f93bf587a7fc613e247f5f247809", "a"}, - TestHash{"2aab1484e8c158f2bfb8c5ff41b57a525129131c957b5f93", "abc"}, - TestHash{"d981f8cb78201a950dcf3048751e441c517fca1aa55a29f6", "message digest"}, - TestHash{"1714a472eee57d30040412bfcc55032a0b11602ff37beee9", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"0f7bf9a19b9c58f2b7610df7e84f0ac3a71c631e7b53f78e", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"8dcea680a17583ee502ba38a3c368651890ffbccdc49a8cc", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - TestHash{"1c14795529fd9f207a958f84c52f11e887fa0cabdfd91bfd", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - TestHash{"6d12a41e72e644f017b6f0e2f7b44c6285f06dd5d2c5b075", "The quick brown fox jumps over the lazy dog"}, - } - for v, _ in test_vectors { - computed := tiger.hash_192(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"3293ac630c13f0245f92bbb1766e16167a4e58492dde73f3", ""}, + TestHash{"77befbef2e7ef8ab2ec8f93bf587a7fc613e247f5f247809", "a"}, + TestHash{"2aab1484e8c158f2bfb8c5ff41b57a525129131c957b5f93", "abc"}, + TestHash{"d981f8cb78201a950dcf3048751e441c517fca1aa55a29f6", "message digest"}, + TestHash{"1714a472eee57d30040412bfcc55032a0b11602ff37beee9", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"0f7bf9a19b9c58f2b7610df7e84f0ac3a71c631e7b53f78e", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"8dcea680a17583ee502ba38a3c368651890ffbccdc49a8cc", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + TestHash{"1c14795529fd9f207a958f84c52f11e887fa0cabdfd91bfd", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + TestHash{"6d12a41e72e644f017b6f0e2f7b44c6285f06dd5d2c5b075", "The quick brown fox jumps over the lazy dog"}, + } + for v, _ in test_vectors { + computed := tiger.hash_192(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_tiger2_128 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"4441be75f6018773c206c22745374b92", ""}, - TestHash{"976abff8062a2e9dcea3a1ace966ed9c", "The quick brown fox jumps over the lazy dog"}, - TestHash{"09c11330283a27efb51930aa7dc1ec62", "The quick brown fox jumps over the lazy cog"}, - } - for v, _ in test_vectors { - computed := tiger2.hash_128(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"4441be75f6018773c206c22745374b92", ""}, + TestHash{"976abff8062a2e9dcea3a1ace966ed9c", "The quick brown fox jumps over the lazy dog"}, + TestHash{"09c11330283a27efb51930aa7dc1ec62", "The quick brown fox jumps over the lazy cog"}, + } + for v, _ in test_vectors { + computed := tiger2.hash_128(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_tiger2_160 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"4441be75f6018773c206c22745374b924aa8313f", ""}, - TestHash{"976abff8062a2e9dcea3a1ace966ed9c19cb8555", "The quick brown fox jumps over the lazy dog"}, - TestHash{"09c11330283a27efb51930aa7dc1ec624ff738a8", "The quick brown fox jumps over the lazy cog"}, - } - for v, _ in test_vectors { - computed := tiger2.hash_160(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"4441be75f6018773c206c22745374b924aa8313f", ""}, + TestHash{"976abff8062a2e9dcea3a1ace966ed9c19cb8555", "The quick brown fox jumps over the lazy dog"}, + TestHash{"09c11330283a27efb51930aa7dc1ec624ff738a8", "The quick brown fox jumps over the lazy cog"}, + } + for v, _ in test_vectors { + computed := tiger2.hash_160(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_tiger2_192 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"4441be75f6018773c206c22745374b924aa8313fef919f41", ""}, - TestHash{"976abff8062a2e9dcea3a1ace966ed9c19cb85558b4976d8", "The quick brown fox jumps over the lazy dog"}, - TestHash{"09c11330283a27efb51930aa7dc1ec624ff738a8d9bdd3df", "The quick brown fox jumps over the lazy cog"}, - } - for v, _ in test_vectors { - computed := tiger2.hash_192(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"4441be75f6018773c206c22745374b924aa8313fef919f41", ""}, + TestHash{"976abff8062a2e9dcea3a1ace966ed9c19cb85558b4976d8", "The quick brown fox jumps over the lazy dog"}, + TestHash{"09c11330283a27efb51930aa7dc1ec624ff738a8d9bdd3df", "The quick brown fox jumps over the lazy cog"}, + } + for v, _ in test_vectors { + computed := tiger2.hash_192(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_sm3 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"1ab21d8355cfa17f8e61194831e81a8f22bec8c728fefb747ed035eb5082aa2b", ""}, - TestHash{"66c7f0f462eeedd9d1f2d46bdc10e4e24167c4875cf2f7a2297da02b8f4ba8e0", "abc"}, - TestHash{"debe9ff92275b8a138604889c18e5a4d6fdb70e5387e5765293dcba39c0c5732", "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"}, - TestHash{"5fdfe814b8573ca021983970fc79b2218c9570369b4859684e2e4c3fc76cb8ea", "The quick brown fox jumps over the lazy dog"}, - TestHash{"ca27d14a42fc04c1e5ecf574a95a8c2d70ecb5805e9b429026ccac8f28b20098", "The quick brown fox jumps over the lazy cog"}, - } - for v, _ in test_vectors { - computed := sm3.hash(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"1ab21d8355cfa17f8e61194831e81a8f22bec8c728fefb747ed035eb5082aa2b", ""}, + TestHash{"66c7f0f462eeedd9d1f2d46bdc10e4e24167c4875cf2f7a2297da02b8f4ba8e0", "abc"}, + TestHash{"debe9ff92275b8a138604889c18e5a4d6fdb70e5387e5765293dcba39c0c5732", "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"}, + TestHash{"5fdfe814b8573ca021983970fc79b2218c9570369b4859684e2e4c3fc76cb8ea", "The quick brown fox jumps over the lazy dog"}, + TestHash{"ca27d14a42fc04c1e5ecf574a95a8c2d70ecb5805e9b429026ccac8f28b20098", "The quick brown fox jumps over the lazy cog"}, + } + for v, _ in test_vectors { + computed := sm3.hash(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_jh_224 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"2c99df889b019309051c60fecc2bd285a774940e43175b76b2626630", ""}, - TestHash{"e715f969fb61b203a97e494aab92d91a9cec52f0933436b0d63bf722", "a"}, - TestHash{"c2b1967e635bd55b6a4d36f863ac4a877be302251d68692873007281", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := jh.hash_224(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"2c99df889b019309051c60fecc2bd285a774940e43175b76b2626630", ""}, + TestHash{"e715f969fb61b203a97e494aab92d91a9cec52f0933436b0d63bf722", "a"}, + TestHash{"c2b1967e635bd55b6a4d36f863ac4a877be302251d68692873007281", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := jh.hash_224(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_jh_256 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"46e64619c18bb0a92a5e87185a47eef83ca747b8fcc8e1412921357e326df434", ""}, - TestHash{"d52c0c130a1bc0ae5136375637a52773e150c71efe1c968df8956f6745b05386", "a"}, - TestHash{"fc4214867025a8af94c614353b3553b10e561ae749fc18c40e5fd44a7a4ecd1b", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := jh.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"46e64619c18bb0a92a5e87185a47eef83ca747b8fcc8e1412921357e326df434", ""}, + TestHash{"d52c0c130a1bc0ae5136375637a52773e150c71efe1c968df8956f6745b05386", "a"}, + TestHash{"fc4214867025a8af94c614353b3553b10e561ae749fc18c40e5fd44a7a4ecd1b", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := jh.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_jh_384 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"2fe5f71b1b3290d3c017fb3c1a4d02a5cbeb03a0476481e25082434a881994b0ff99e078d2c16b105ad069b569315328", ""}, - TestHash{"77de897ca4fd5dadfbcbd1d8d4ea3c3c1426855e38661325853e92b069f3fe156729f6bbb9a5892c7c18a77f1cb9d0bb", "a"}, - TestHash{"6f73d9b9b8ed362f8180fb26020725b40bd6ca75b3b947405f26c4c37a885ce028876dc42e379d2faf6146fed3ea0e42", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := jh.hash_384(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"2fe5f71b1b3290d3c017fb3c1a4d02a5cbeb03a0476481e25082434a881994b0ff99e078d2c16b105ad069b569315328", ""}, + TestHash{"77de897ca4fd5dadfbcbd1d8d4ea3c3c1426855e38661325853e92b069f3fe156729f6bbb9a5892c7c18a77f1cb9d0bb", "a"}, + TestHash{"6f73d9b9b8ed362f8180fb26020725b40bd6ca75b3b947405f26c4c37a885ce028876dc42e379d2faf6146fed3ea0e42", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := jh.hash_384(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_jh_512 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"90ecf2f76f9d2c8017d979ad5ab96b87d58fc8fc4b83060f3f900774faa2c8fabe69c5f4ff1ec2b61d6b316941cedee117fb04b1f4c5bc1b919ae841c50eec4f", ""}, - TestHash{"f12c87e986daff17c481c81a99a39b603ca6bafcd320c5735523b97cb9a26f7681bad62ffad9aad0e21160a05f773fb0d1434ca4cbcb0483f480a171ada1561b", "a"}, - TestHash{"bafb8e710b35eabeb1a48220c4b0987c2c985b6e73b7b31d164bfb9d67c94d99d7bc43b474a25e647cd6cc36334b6a00a5f2a85fae74907fd2885c6168132fe7", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := jh.hash_512(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"90ecf2f76f9d2c8017d979ad5ab96b87d58fc8fc4b83060f3f900774faa2c8fabe69c5f4ff1ec2b61d6b316941cedee117fb04b1f4c5bc1b919ae841c50eec4f", ""}, + TestHash{"f12c87e986daff17c481c81a99a39b603ca6bafcd320c5735523b97cb9a26f7681bad62ffad9aad0e21160a05f773fb0d1434ca4cbcb0483f480a171ada1561b", "a"}, + TestHash{"bafb8e710b35eabeb1a48220c4b0987c2c985b6e73b7b31d164bfb9d67c94d99d7bc43b474a25e647cd6cc36334b6a00a5f2a85fae74907fd2885c6168132fe7", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := jh.hash_512(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_groestl_224 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"f2e180fb5947be964cd584e22e496242c6a329c577fc4ce8c36d34c3", ""}, - TestHash{"2dfa5bd326c23c451b1202d99e6cee98a98c45927e1a31077f538712", "a"}, - TestHash{"c8a3e7274d599900ae673419683c3626a2e49ed57308ed2687508bef", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := groestl.hash_224(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"f2e180fb5947be964cd584e22e496242c6a329c577fc4ce8c36d34c3", ""}, + TestHash{"2dfa5bd326c23c451b1202d99e6cee98a98c45927e1a31077f538712", "a"}, + TestHash{"c8a3e7274d599900ae673419683c3626a2e49ed57308ed2687508bef", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := groestl.hash_224(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_groestl_256 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"1a52d11d550039be16107f9c58db9ebcc417f16f736adb2502567119f0083467", ""}, - TestHash{"3645c245bb31223ad93c80885b719aa40b4bed0a9d9d6e7c11fe99e59ca350b5", "a"}, - TestHash{"2679d98913bee62e57fdbdde97ddb328373548c6b24fc587cc3d08f2a02a529c", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := groestl.hash_256(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"1a52d11d550039be16107f9c58db9ebcc417f16f736adb2502567119f0083467", ""}, + TestHash{"3645c245bb31223ad93c80885b719aa40b4bed0a9d9d6e7c11fe99e59ca350b5", "a"}, + TestHash{"2679d98913bee62e57fdbdde97ddb328373548c6b24fc587cc3d08f2a02a529c", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := groestl.hash_256(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_groestl_384 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"ac353c1095ace21439251007862d6c62f829ddbe6de4f78e68d310a9205a736d8b11d99bffe448f57a1cfa2934f044a5", ""}, - TestHash{"13fce7bd9fc69b67cc12c77e765a0a97794c585f89df39fbff32408e060d7d9225c7e80fd87da647686888bda896c342", "a"}, - TestHash{"1c446cd70a6de52c9db386f5305aae029fe5a4120bc6230b7cd3a5e1ef1949cc8e6d2548c24cd7347b5ba512628a62f6", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := groestl.hash_384(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"ac353c1095ace21439251007862d6c62f829ddbe6de4f78e68d310a9205a736d8b11d99bffe448f57a1cfa2934f044a5", ""}, + TestHash{"13fce7bd9fc69b67cc12c77e765a0a97794c585f89df39fbff32408e060d7d9225c7e80fd87da647686888bda896c342", "a"}, + TestHash{"1c446cd70a6de52c9db386f5305aae029fe5a4120bc6230b7cd3a5e1ef1949cc8e6d2548c24cd7347b5ba512628a62f6", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := groestl.hash_384(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_groestl_512 :: proc(t: ^testing.T) { - test_vectors := [?]TestHash { - TestHash{"6d3ad29d279110eef3adbd66de2a0345a77baede1557f5d099fce0c03d6dc2ba8e6d4a6633dfbd66053c20faa87d1a11f39a7fbe4a6c2f009801370308fc4ad8", ""}, - TestHash{"9ef345a835ee35d6d0d462ce45f722d84b5ca41fde9c81a98a22cfb4f7425720511b03a258cdc055bf8e9179dc9bdb5d88bed906c71125d4cf0cd39d3d7bebc7", "a"}, - TestHash{"862849fd911852cd54beefa88759db4cead0ef8e36aaf15398303c5c4cbc016d9b4c42b32081cbdcba710d2693e7663d244fae116ec29ffb40168baf44f944e7", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, - } - for v, _ in test_vectors { - computed := groestl.hash_512(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors := [?]TestHash { + TestHash{"6d3ad29d279110eef3adbd66de2a0345a77baede1557f5d099fce0c03d6dc2ba8e6d4a6633dfbd66053c20faa87d1a11f39a7fbe4a6c2f009801370308fc4ad8", ""}, + TestHash{"9ef345a835ee35d6d0d462ce45f722d84b5ca41fde9c81a98a22cfb4f7425720511b03a258cdc055bf8e9179dc9bdb5d88bed906c71125d4cf0cd39d3d7bebc7", "a"}, + TestHash{"862849fd911852cd54beefa88759db4cead0ef8e36aaf15398303c5c4cbc016d9b4c42b32081cbdcba710d2693e7663d244fae116ec29ffb40168baf44f944e7", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}, + } + for v, _ in test_vectors { + computed := groestl.hash_512(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_haval_128 :: proc(t: ^testing.T) { - test_vectors_3 := [?]TestHash { - TestHash{"c68f39913f901f3ddf44c707357a7d70", ""}, - TestHash{"0cd40739683e15f01ca5dbceef4059f1", "a"}, - TestHash{"9e40ed883fb63e985d299b40cda2b8f2", "abc"}, - TestHash{"3caf4a79e81adcd6d1716bcc1cef4573", "message digest"}, - TestHash{"dc502247fb3eb8376109eda32d361d82", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"44068770868768964d1f2c3bff4aa3d8", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"de5eb3f7d9eb08fae7a07d68e3047ec6", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - } - for v, _ in test_vectors_3 { - computed := haval.hash_128_3(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_4 := [?]TestHash { - TestHash{"ee6bbf4d6a46a679b3a856c88538bb98", ""}, - TestHash{"5cd07f03330c3b5020b29ba75911e17d", "a"}, - } - for v, _ in test_vectors_4 { - computed := haval.hash_128_4(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_5 := [?]TestHash { - TestHash{"184b8482a0c050dca54b59c7f05bf5dd", ""}, - TestHash{"f23fbe704be8494bfa7a7fb4f8ab09e5", "a"}, - } - for v, _ in test_vectors_5 { - computed := haval.hash_128_5(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors_3 := [?]TestHash { + TestHash{"c68f39913f901f3ddf44c707357a7d70", ""}, + TestHash{"0cd40739683e15f01ca5dbceef4059f1", "a"}, + TestHash{"9e40ed883fb63e985d299b40cda2b8f2", "abc"}, + TestHash{"3caf4a79e81adcd6d1716bcc1cef4573", "message digest"}, + TestHash{"dc502247fb3eb8376109eda32d361d82", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"44068770868768964d1f2c3bff4aa3d8", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"de5eb3f7d9eb08fae7a07d68e3047ec6", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + } + for v, _ in test_vectors_3 { + computed := haval.hash_128_3(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_4 := [?]TestHash { + TestHash{"ee6bbf4d6a46a679b3a856c88538bb98", ""}, + TestHash{"5cd07f03330c3b5020b29ba75911e17d", "a"}, + } + for v, _ in test_vectors_4 { + computed := haval.hash_128_4(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_5 := [?]TestHash { + TestHash{"184b8482a0c050dca54b59c7f05bf5dd", ""}, + TestHash{"f23fbe704be8494bfa7a7fb4f8ab09e5", "a"}, + } + for v, _ in test_vectors_5 { + computed := haval.hash_128_5(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_haval_160 :: proc(t: ^testing.T) { - test_vectors_3 := [?]TestHash { - TestHash{"d353c3ae22a25401d257643836d7231a9a95f953", ""}, - TestHash{"4da08f514a7275dbc4cece4a347385983983a830", "a"}, - TestHash{"b21e876c4d391e2a897661149d83576b5530a089", "abc"}, - TestHash{"43a47f6f1c016207f08be8115c0977bf155346da", "message digest"}, - TestHash{"eba9fa6050f24c07c29d1834a60900ea4e32e61b", "abcdefghijklmnopqrstuvwxyz"}, - TestHash{"c30bce448cf8cfe957c141e90c0a063497cdfeeb", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, - TestHash{"97dc988d97caae757be7523c4e8d4ea63007a4b9", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, - } - for v, _ in test_vectors_3 { - computed := haval.hash_160_3(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_4 := [?]TestHash { - TestHash{"1d33aae1be4146dbaaca0b6e70d7a11f10801525", ""}, - TestHash{"e0a5be29627332034d4dd8a910a1a0e6fe04084d", "a"}, - } - for v, _ in test_vectors_4 { - computed := haval.hash_160_4(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_5 := [?]TestHash { - TestHash{"255158cfc1eed1a7be7c55ddd64d9790415b933b", ""}, - TestHash{"f5147df7abc5e3c81b031268927c2b5761b5a2b5", "a"}, - } - for v, _ in test_vectors_5 { - computed := haval.hash_160_5(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors_3 := [?]TestHash { + TestHash{"d353c3ae22a25401d257643836d7231a9a95f953", ""}, + TestHash{"4da08f514a7275dbc4cece4a347385983983a830", "a"}, + TestHash{"b21e876c4d391e2a897661149d83576b5530a089", "abc"}, + TestHash{"43a47f6f1c016207f08be8115c0977bf155346da", "message digest"}, + TestHash{"eba9fa6050f24c07c29d1834a60900ea4e32e61b", "abcdefghijklmnopqrstuvwxyz"}, + TestHash{"c30bce448cf8cfe957c141e90c0a063497cdfeeb", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"}, + TestHash{"97dc988d97caae757be7523c4e8d4ea63007a4b9", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"}, + } + for v, _ in test_vectors_3 { + computed := haval.hash_160_3(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_4 := [?]TestHash { + TestHash{"1d33aae1be4146dbaaca0b6e70d7a11f10801525", ""}, + TestHash{"e0a5be29627332034d4dd8a910a1a0e6fe04084d", "a"}, + } + for v, _ in test_vectors_4 { + computed := haval.hash_160_4(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_5 := [?]TestHash { + TestHash{"255158cfc1eed1a7be7c55ddd64d9790415b933b", ""}, + TestHash{"f5147df7abc5e3c81b031268927c2b5761b5a2b5", "a"}, + } + for v, _ in test_vectors_5 { + computed := haval.hash_160_5(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_haval_192 :: proc(t: ^testing.T) { - test_vectors_3 := [?]TestHash { - TestHash{"e9c48d7903eaf2a91c5b350151efcb175c0fc82de2289a4e", ""}, - TestHash{"b359c8835647f5697472431c142731ff6e2cddcacc4f6e08", "a"}, - } - for v, _ in test_vectors_3 { - computed := haval.hash_192_3(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_4 := [?]TestHash { - TestHash{"4a8372945afa55c7dead800311272523ca19d42ea47b72da", ""}, - TestHash{"856c19f86214ea9a8a2f0c4b758b973cce72a2d8ff55505c", "a"}, - } - for v, _ in test_vectors_4 { - computed := haval.hash_192_4(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_5 := [?]TestHash { - TestHash{"4839d0626f95935e17ee2fc4509387bbe2cc46cb382ffe85", ""}, - TestHash{"5ffa3b3548a6e2cfc06b7908ceb5263595df67cf9c4b9341", "a"}, - } - for v, _ in test_vectors_5 { - computed := haval.hash_192_5(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors_3 := [?]TestHash { + TestHash{"e9c48d7903eaf2a91c5b350151efcb175c0fc82de2289a4e", ""}, + TestHash{"b359c8835647f5697472431c142731ff6e2cddcacc4f6e08", "a"}, + } + for v, _ in test_vectors_3 { + computed := haval.hash_192_3(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_4 := [?]TestHash { + TestHash{"4a8372945afa55c7dead800311272523ca19d42ea47b72da", ""}, + TestHash{"856c19f86214ea9a8a2f0c4b758b973cce72a2d8ff55505c", "a"}, + } + for v, _ in test_vectors_4 { + computed := haval.hash_192_4(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_5 := [?]TestHash { + TestHash{"4839d0626f95935e17ee2fc4509387bbe2cc46cb382ffe85", ""}, + TestHash{"5ffa3b3548a6e2cfc06b7908ceb5263595df67cf9c4b9341", "a"}, + } + for v, _ in test_vectors_5 { + computed := haval.hash_192_5(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_haval_224 :: proc(t: ^testing.T) { - test_vectors_3 := [?]TestHash { - TestHash{"c5aae9d47bffcaaf84a8c6e7ccacd60a0dd1932be7b1a192b9214b6d", ""}, - TestHash{"731814ba5605c59b673e4caae4ad28eeb515b3abc2b198336794e17b", "a"}, - } - for v, _ in test_vectors_3 { - computed := haval.hash_224_3(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_4 := [?]TestHash { - TestHash{"3e56243275b3b81561750550e36fcd676ad2f5dd9e15f2e89e6ed78e", ""}, - TestHash{"742f1dbeeaf17f74960558b44f08aa98bdc7d967e6c0ab8f799b3ac1", "a"}, - } - for v, _ in test_vectors_4 { - computed := haval.hash_224_4(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_5 := [?]TestHash { - TestHash{"4a0513c032754f5582a758d35917ac9adf3854219b39e3ac77d1837e", ""}, - TestHash{"67b3cb8d4068e3641fa4f156e03b52978b421947328bfb9168c7655d", "a"}, - } - for v, _ in test_vectors_5 { - computed := haval.hash_224_5(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors_3 := [?]TestHash { + TestHash{"c5aae9d47bffcaaf84a8c6e7ccacd60a0dd1932be7b1a192b9214b6d", ""}, + TestHash{"731814ba5605c59b673e4caae4ad28eeb515b3abc2b198336794e17b", "a"}, + } + for v, _ in test_vectors_3 { + computed := haval.hash_224_3(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_4 := [?]TestHash { + TestHash{"3e56243275b3b81561750550e36fcd676ad2f5dd9e15f2e89e6ed78e", ""}, + TestHash{"742f1dbeeaf17f74960558b44f08aa98bdc7d967e6c0ab8f799b3ac1", "a"}, + } + for v, _ in test_vectors_4 { + computed := haval.hash_224_4(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_5 := [?]TestHash { + TestHash{"4a0513c032754f5582a758d35917ac9adf3854219b39e3ac77d1837e", ""}, + TestHash{"67b3cb8d4068e3641fa4f156e03b52978b421947328bfb9168c7655d", "a"}, + } + for v, _ in test_vectors_5 { + computed := haval.hash_224_5(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } @(test) test_haval_256 :: proc(t: ^testing.T) { - test_vectors_3 := [?]TestHash { - TestHash{"4f6938531f0bc8991f62da7bbd6f7de3fad44562b8c6f4ebf146d5b4e46f7c17", ""}, - TestHash{"47c838fbb4081d9525a0ff9b1e2c05a98f625714e72db289010374e27db021d8", "a"}, - } - for v, _ in test_vectors_3 { - computed := haval.hash_256_3(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_4 := [?]TestHash { - TestHash{"c92b2e23091e80e375dadce26982482d197b1a2521be82da819f8ca2c579b99b", ""}, - TestHash{"e686d2394a49b44d306ece295cf9021553221db132b36cc0ff5b593d39295899", "a"}, - } - for v, _ in test_vectors_4 { - computed := haval.hash_256_4(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } - test_vectors_5 := [?]TestHash { - TestHash{"be417bb4dd5cfb76c7126f4f8eeb1553a449039307b1a3cd451dbfdc0fbbe330", ""}, - TestHash{"de8fd5ee72a5e4265af0a756f4e1a1f65c9b2b2f47cf17ecf0d1b88679a3e22f", "a"}, - } - for v, _ in test_vectors_5 { - computed := haval.hash_256_5(v.str) - computed_str := hex_string(computed[:]) - expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) - } + test_vectors_3 := [?]TestHash { + TestHash{"4f6938531f0bc8991f62da7bbd6f7de3fad44562b8c6f4ebf146d5b4e46f7c17", ""}, + TestHash{"47c838fbb4081d9525a0ff9b1e2c05a98f625714e72db289010374e27db021d8", "a"}, + } + for v, _ in test_vectors_3 { + computed := haval.hash_256_3(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_4 := [?]TestHash { + TestHash{"c92b2e23091e80e375dadce26982482d197b1a2521be82da819f8ca2c579b99b", ""}, + TestHash{"e686d2394a49b44d306ece295cf9021553221db132b36cc0ff5b593d39295899", "a"}, + } + for v, _ in test_vectors_4 { + computed := haval.hash_256_4(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } + test_vectors_5 := [?]TestHash { + TestHash{"be417bb4dd5cfb76c7126f4f8eeb1553a449039307b1a3cd451dbfdc0fbbe330", ""}, + TestHash{"de8fd5ee72a5e4265af0a756f4e1a1f65c9b2b2f47cf17ecf0d1b88679a3e22f", "a"}, + } + for v, _ in test_vectors_5 { + computed := haval.hash_256_5(v.str) + computed_str := hex_string(computed[:]) + expect(t, computed_str == v.hash, fmt.tprintf("Expected: %s for input of %s, but got %s instead", v.hash, v.str, computed_str)) + } } diff --git a/tests/core/encoding/json/test_core_json.odin b/tests/core/encoding/json/test_core_json.odin index 4f415c008..6f2e8c35a 100644 --- a/tests/core/encoding/json/test_core_json.odin +++ b/tests/core/encoding/json/test_core_json.odin @@ -12,18 +12,15 @@ when ODIN_TEST { log :: testing.log } else { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) TEST_count += 1 if !condition { TEST_fail += 1 - fmt.println(message) + fmt.printf("[%v] %v\n", loc, message) return } - fmt.println(" PASS") } log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) } } @@ -33,7 +30,7 @@ main :: proc() { parse_json(&t) marshal_json(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } @test diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index 5cb59e001..f9f7a2992 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -173,23 +173,20 @@ TESTS :: []TEST{ } when ODIN_TEST { - expect :: testing.expect - log :: testing.log + expect :: testing.expect + log :: testing.log } else { - expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) - TEST_count += 1 - if !condition { - TEST_fail += 1 - fmt.println(message) - return - } - fmt.println(" PASS") - } - log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) - } + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.printf("[%v] %v\n", loc, message) + return + } + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) + } } test_file_path :: proc(filename: string) -> (path: string) { @@ -229,7 +226,7 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) { written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident) if len(doc.doctype.rest) > 0 { - wprintf(writer, "\t%v\n", doc.doctype.rest) + wprintf(writer, "\t%v\n", doc.doctype.rest) } } @@ -238,9 +235,9 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) { } if doc.root != nil { - wprintln(writer, " --- ") - print_element(writer, doc.root) - wprintln(writer, " --- ") + wprintln(writer, " --- ") + print_element(writer, doc.root) + wprintln(writer, " --- ") } return written, .None @@ -293,7 +290,7 @@ run_tests :: proc(t: ^testing.T) { for test in TESTS { path := test_file_path(test.filename) - printf("\nTrying to parse %v\n\n", path) + log(t, fmt.tprintf("Trying to parse %v", path)) doc, err := xml.parse(path, test.options, Silent) defer xml.destroy(doc) @@ -323,7 +320,7 @@ run_tests :: proc(t: ^testing.T) { } main :: proc() { - t := testing.T{} + t := testing.T{} track: mem.Tracking_Allocator mem.tracking_allocator_init(&track, context.allocator) @@ -338,5 +335,5 @@ main :: proc() { } } - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } \ No newline at end of file diff --git a/tests/core/hash/test_core_hash.odin b/tests/core/hash/test_core_hash.odin index 8baa604b6..b81af01a5 100644 --- a/tests/core/hash/test_core_hash.odin +++ b/tests/core/hash/test_core_hash.odin @@ -14,18 +14,15 @@ when ODIN_TEST { log :: testing.log } else { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) TEST_count += 1 if !condition { TEST_fail += 1 - fmt.println(" FAIL:", message) + fmt.printf("[%v] %v", loc, message) return } - fmt.println(" PASS") } log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) } } @@ -34,7 +31,7 @@ main :: proc() { test_benchmark_runner(&t) test_xxhash_vectors(&t) test_crc64_vectors(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } /* diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index 155b69298..48d9ca1d2 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -25,38 +25,49 @@ import "core:time" import "core:runtime" -WRITE_PPM_ON_FAIL :: #config(WRITE_PPM_ON_FAIL, false) -TEST_SUITE_PATH :: "assets/PNG" +WRITE_PPM_ON_FAIL :: #config(WRITE_PPM_ON_FAIL, false) +TEST_FILE_PATH_PREFIX :: "tests/core/assets/PNG" TEST_count := 0 TEST_fail := 0 when ODIN_TEST { - expect :: testing.expect - log :: testing.log + expect :: testing.expect + log :: testing.log } else { - expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) - TEST_count += 1 - if !condition { - TEST_fail += 1 - fmt.println(message) - return - } - fmt.println(" PASS") - } - log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) - } + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.printf("[%v] %v\n", loc, message) + return + } + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) + } } + I_Error :: image.Error main :: proc() { t := testing.T{} png_test(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) +} + +test_file_path :: proc(filename: string, extension := "png") -> (path: string) { + + path = fmt.tprintf("%v%v/%v.%v", ODIN_ROOT, TEST_FILE_PATH_PREFIX, filename, extension) + temp := transmute([]u8)path + + for r, i in path { + if r == '\\' { + temp[i] = '/' + } + } + return path } PNG_Test :: struct { @@ -1461,7 +1472,7 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { context = runtime.default_context() for file in suite { - test_file := fmt.tprintf("%v/%v.png", TEST_SUITE_PATH, file.file) + test_file := test_file_path(file.file) img: ^png.Image err: png.Error diff --git a/tests/core/odin/test_parser.odin b/tests/core/odin/test_parser.odin index 90d913d10..53711d3ec 100644 --- a/tests/core/odin/test_parser.odin +++ b/tests/core/odin/test_parser.odin @@ -10,34 +10,29 @@ TEST_count := 0 TEST_fail := 0 when ODIN_TEST { - expect :: testing.expect - log :: testing.log + expect :: testing.expect + log :: testing.log } else { - expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) - TEST_count += 1 - if !condition { - TEST_fail += 1 - fmt.println(message) - return - } - fmt.println(" PASS") - } - log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) - } + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.printf("[%v] %v\n", loc, message) + return + } + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) + } } - main :: proc() { - t := testing.T{} - test_parse_demo(&t) + t := testing.T{} + test_parse_demo(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } - @test test_parse_demo :: proc(t: ^testing.T) { pkg, ok := parser.parse_package_from_path("examples/demo") diff --git a/tests/core/strings/test_core_strings.odin b/tests/core/strings/test_core_strings.odin index fc1518349..c5436f5c1 100644 --- a/tests/core/strings/test_core_strings.odin +++ b/tests/core/strings/test_core_strings.odin @@ -8,56 +8,53 @@ TEST_count := 0 TEST_fail := 0 when ODIN_TEST { - expect :: testing.expect - log :: testing.log + expect :: testing.expect + log :: testing.log } else { - expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { - fmt.printf("[%v] ", loc) - TEST_count += 1 - if !condition { - TEST_fail += 1 - fmt.println(message) - return - } - fmt.println(" PASS") - } - log :: proc(t: ^testing.T, v: any, loc := #caller_location) { - fmt.printf("[%v] ", loc) - fmt.printf("log: %v\n", v) - } + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.printf("[%v] %v\n", loc, message) + return + } + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] LOG:\n\t%v\n", loc, v) + } } main :: proc() { - t := testing.T{} - test_index_any_small_string_not_found(&t) - test_index_any_larger_string_not_found(&t) - test_index_any_small_string_found(&t) - test_index_any_larger_string_found(&t) + t := testing.T{} + test_index_any_small_string_not_found(&t) + test_index_any_larger_string_not_found(&t) + test_index_any_small_string_found(&t) + test_index_any_larger_string_found(&t) - fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) } @test test_index_any_small_string_not_found :: proc(t: ^testing.T) { - index := strings.index_any(".", "/:\"") - log(t, index) - expect(t, index == -1, "index_any should be negative") + index := strings.index_any(".", "/:\"") + log(t, index) + expect(t, index == -1, "index_any should be negative") } @test test_index_any_larger_string_not_found :: proc(t: ^testing.T) { - index := strings.index_any("aaaaaaaa.aaaaaaaa", "/:\"") - expect(t, index == -1, "index_any should be negative") + index := strings.index_any("aaaaaaaa.aaaaaaaa", "/:\"") + expect(t, index == -1, "index_any should be negative") } @test test_index_any_small_string_found :: proc(t: ^testing.T) { - index := strings.index_any(".", "/:.\"") - expect(t, index == 0, "index_any should be 0") + index := strings.index_any(".", "/:.\"") + expect(t, index == 0, "index_any should be 0") } @test test_index_any_larger_string_found :: proc(t: ^testing.T) { - index := strings.index_any("aaaaaaaa:aaaaaaaa", "/:\"") - expect(t, index == 8, "index_any should be 8") + index := strings.index_any("aaaaaaaa:aaaaaaaa", "/:\"") + expect(t, index == 8, "index_any should be 8") } From 7ec88d24302dcdea38ac09996a2279f4de4f6a25 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 5 Dec 2021 21:06:33 +0100 Subject: [PATCH 014/245] [xml] Add option. --- .../entity/example/entity_example.odin | 4 +- core/encoding/xml/example/xml_example.odin | 53 +++++++++++-------- core/encoding/xml/xml_reader.odin | 26 +++++++-- tests/core/encoding/xml/test_core_xml.odin | 10 ++-- 4 files changed, 59 insertions(+), 34 deletions(-) diff --git a/core/encoding/entity/example/entity_example.odin b/core/encoding/entity/example/entity_example.odin index 882203f48..6fc377f9d 100644 --- a/core/encoding/entity/example/entity_example.odin +++ b/core/encoding/entity/example/entity_example.odin @@ -64,8 +64,8 @@ main :: proc() { mem.tracking_allocator_init(&track, context.allocator) context.allocator = mem.tracking_allocator(&track) - _main() - //_entities() + // _main() + _entities() if len(track.allocation_map) > 0 { println() diff --git a/core/encoding/xml/example/xml_example.odin b/core/encoding/xml/example/xml_example.odin index 085252e92..daa3c5dab 100644 --- a/core/encoding/xml/example/xml_example.odin +++ b/core/encoding/xml/example/xml_example.odin @@ -2,35 +2,40 @@ package xml_example import "core:encoding/xml" import "core:os" -import "core:path" import "core:mem" import "core:fmt" - -/* - Silent error handler for the parser. -*/ -Error_Handler :: proc(pos: xml.Pos, fmt: string, args: ..any) {} - -OPTIONS :: xml.Options{ flags = { .Ignore_Unsupported, }, expected_doctype = "unicode", } +import "core:time" +import "core:strings" +import "core:hash" example :: proc() { using fmt - filename := path.join(ODIN_ROOT, "tests", "core", "assets", "XML", "unicode.xml") - defer delete(filename) + doc: ^xml.Document + err: xml.Error - doc, err := xml.parse(filename, OPTIONS, Error_Handler) + DOC :: #load("../../../../tests/core/assets/XML/unicode.xml") + + parse_duration: time.Duration + { + time.SCOPED_TICK_DURATION(&parse_duration) + doc, err = xml.parse(DOC, xml.Options{flags={.Ignore_Unsupported}}) + } defer xml.destroy(doc) + ms := time.duration_milliseconds(parse_duration) + speed := (f64(1000.0) / ms) * f64(len(DOC)) / 1_024.0 / 1_024.0 + fmt.printf("Parse time: %v bytes in %.2f ms (%.2f MiB/s).\n", len(DOC), ms, speed) + if err != .None { printf("Load/Parse error: %v\n", err) if err == .File_Error { - printf("\"%v\" not found. Did you run \"tests\\download_assets.py\"?", filename) + println("\"unicode.xml\" not found. Did you run \"tests\\download_assets.py\"?") } os.exit(1) } - printf("\"%v\" loaded and parsed.\n", filename) + println("\"unicode.xml\" loaded and parsed.") charlist, charlist_ok := xml.find_child_by_ident(doc.root, "charlist") if !charlist_ok { @@ -40,17 +45,19 @@ example :: proc() { printf("Found `` with %v children.\n", len(charlist.children)) - for char in charlist.children { - if char.ident != "character" { - eprintf("Expected ``, got `<%v>`\n", char.ident) - os.exit(1) - } + crc32 := doc_hash(doc) + printf("[%v] CRC32: 0x%08x\n", "🎉" if crc32 == 0xcaa042b9 else "🤬", crc32) +} - if _, ok := xml.find_attribute_val_by_key(char, "dec"); !ok { - eprintln("`` attribute not found.") - os.exit(1) - } - } +doc_hash :: proc(doc: ^xml.Document, print := false) -> (crc32: u32) { + buf: strings.Builder + defer strings.destroy_builder(&buf) + w := strings.to_writer(&buf) + + xml.print(w, doc) + tree := strings.to_string(buf) + if print { fmt.println(tree) } + return hash.crc32(transmute([]u8)tree) } main :: proc() { diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 6f49b8e08..b169bd57a 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -71,6 +71,12 @@ Option_Flag :: enum { This option decodes them when encountered. */ Decode_SGML_Entities, + + /* + If a tag body has a comment, it will be stripped unless this option is given. + */ + Keep_Tag_Body_Comments, + } Option_Flags :: bit_set[Option_Flag; u8] @@ -413,15 +419,29 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err /* This should be a tag's body text. */ - body_text := scan_string(t, t.offset) or_return + body_text := scan_string(t, t.offset) or_return + needs_processing := .Unbox_CDATA in opts.flags + needs_processing |= .Decode_SGML_Entities in opts.flags - decode_opts := entity.XML_Decode_Options{ .Comment_Strip } + if !needs_processing { + element.value = strings.intern_get(&doc.intern, body_text) + continue + } + + decode_opts := entity.XML_Decode_Options{} + if .Keep_Tag_Body_Comments not_in opts.flags { + decode_opts += { .Comment_Strip } + } if .Decode_SGML_Entities not_in opts.flags { decode_opts += { .No_Entity_Decode } } + if .Unbox_CDATA in opts.flags { - decode_opts += { .Unbox_CDATA, .Decode_CDATA } + decode_opts += { .Unbox_CDATA } + if .Decode_SGML_Entities in opts.flags { + decode_opts += { .Decode_CDATA } + } } decoded, decode_err := entity.decode_xml(body_text, decode_opts) diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index f9f7a2992..7669afe97 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -8,9 +8,7 @@ import "core:io" import "core:fmt" import "core:hash" -Silent :: proc(pos: xml.Pos, fmt: string, args: ..any) { - // Custom (silent) error handler. -} +Silent :: proc(pos: xml.Pos, format: string, args: ..any) {} OPTIONS :: xml.Options{ flags = { .Ignore_Unsupported, .Intern_Comments, }, expected_doctype = "", @@ -75,7 +73,7 @@ TESTS :: []TEST{ }, expected_doctype = "恥ずべきフクロウ", }, - crc32 = 0x6d38ac58, + crc32 = 0xad31d8e8, }, { @@ -131,7 +129,7 @@ TESTS :: []TEST{ }, expected_doctype = "html", }, - crc32 = 0xdb4a1e79, + crc32 = 0x573c1033, }, { @@ -306,7 +304,7 @@ run_tests :: proc(t: ^testing.T) { expect(t, err == test.err, err_msg) failed |= crc32 != test.crc32 - err_msg = tprintf("Expected CRC 0x%08x, got 0x%08x", test.crc32, crc32) + err_msg = tprintf("Expected CRC 0x%08x, got 0x%08x, with options %v", test.crc32, crc32, test.options) expect(t, crc32 == test.crc32, err_msg) if failed { From 6e61abc7d06f22129f93110a9f652c3eec21f0c6 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Mon, 6 Dec 2021 12:04:59 +0100 Subject: [PATCH 015/245] [xml] Initial optimization. --- core/encoding/xml/xml_reader.odin | 68 +++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index b169bd57a..0315b0e05 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -26,6 +26,7 @@ package xml Jeroen van Rijn: Initial implementation. */ +import "core:bytes" import "core:strings" import "core:encoding/entity" import "core:mem" @@ -39,6 +40,12 @@ DEFAULT_Options :: Options{ } Option_Flag :: enum { + /* + If the caller says that input may be modified, we can perform in-situ parsing. + If this flag isn't provided, the XML parser first duplicates the input so that it can. + */ + Input_May_Be_Modified, + /* Document MUST start with ` (doc: ^Document, err: Error) { + data := data context.allocator = allocator opts := validate_options(options) or_return + /* + If `.Input_May_Be_Modified` is not specified, we duplicate the input so that we can modify it in-place. + */ + if .Input_May_Be_Modified not_in opts.flags { + data = bytes.clone(data) + } + t := &Tokenizer{} init(t, string(data), path, error_handler) doc = new(Document) doc.allocator = allocator doc.tokenizer = t + doc.input = data - strings.intern_init(&doc.intern, allocator, allocator) + // strings.intern_init(&doc.intern, allocator, allocator) - err = .Unexpected_Token - element, parent: ^Element + err = .Unexpected_Token + element, parent: ^Element tag_is_open := false @@ -292,8 +313,7 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err case: if .Error_on_Unsupported in opts.flags { error(t, t.offset, "Unhandled: (doc: ^Document, err: Error) { context.allocator = allocator + options := options data, data_ok := os.read_entire_file(filename) - defer delete(data) - if !data_ok { return {}, .File_Error } + options.flags += { .Input_May_Be_Modified } + return parse_from_slice(data, options, filename, error_handler, allocator) } @@ -499,10 +517,16 @@ destroy :: proc(doc: ^Document) { if doc == nil { return } free_element(doc.root) - strings.intern_destroy(&doc.intern) delete(doc.prolog) delete(doc.comments) + delete(doc.input) + + for s in doc.strings_to_free { + delete(s) + } + delete(doc.strings_to_free) + free(doc) } @@ -538,8 +562,8 @@ parse_attribute :: proc(doc: ^Document) -> (attr: Attr, offset: int, err: Error) _ = expect(t, .Eq) or_return value := expect(t, .String) or_return - attr.key = strings.intern_get(&doc.intern, key.text) - attr.val = strings.intern_get(&doc.intern, value.text) + attr.key = key.text + attr.val = value.text err = .None return @@ -651,7 +675,7 @@ parse_doctype :: proc(doc: ^Document) -> (err: Error) { t := doc.tokenizer tok := expect(t, .Ident) or_return - doc.doctype.ident = strings.intern_get(&doc.intern, tok.text) + doc.doctype.ident = tok.text skip_whitespace(t) offset := t.offset @@ -660,6 +684,6 @@ parse_doctype :: proc(doc: ^Document) -> (err: Error) { /* -1 because the current offset is that of the closing tag, so the rest of the DOCTYPE tag ends just before it. */ - doc.doctype.rest = strings.intern_get(&doc.intern, string(t.src[offset : t.offset - 1])) + doc.doctype.rest = string(t.src[offset : t.offset - 1]) return .None } \ No newline at end of file From 7f6c6945aef7b26632093fa36b56b2951cb27165 Mon Sep 17 00:00:00 2001 From: Despacito696969 <56641258+Despacito696969@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:17:47 +0200 Subject: [PATCH 016/245] Fix for `slice_to_components` Using `slice_to_components` wouldn't compile because `s.data` is type of `rawptr` and return type is `^T` --- core/mem/mem.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mem/mem.odin b/core/mem/mem.odin index 817c0ea5f..d3dcf3a3d 100644 --- a/core/mem/mem.odin +++ b/core/mem/mem.odin @@ -166,7 +166,7 @@ slice_data_cast :: proc "contextless" ($T: typeid/[]$A, slice: $S/[]$B) -> T { slice_to_components :: proc "contextless" (slice: $E/[]$T) -> (data: ^T, len: int) { s := transmute(Raw_Slice)slice - return s.data, s.len + return (^T)(s.data), s.len } buffer_from_slice :: proc "contextless" (backing: $T/[]$E) -> [dynamic]E { From 698fcb7813dd391de76a5663ee64c48ce4f7d067 Mon Sep 17 00:00:00 2001 From: hikari Date: Wed, 6 Apr 2022 18:44:43 +0300 Subject: [PATCH 017/245] mem: replace size procedures with constants --- core/mem/mem.odin | 11 ++++++----- core/odin/printer/printer.odin | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/mem/mem.odin b/core/mem/mem.odin index 817c0ea5f..a5252d950 100644 --- a/core/mem/mem.odin +++ b/core/mem/mem.odin @@ -3,6 +3,12 @@ package mem import "core:runtime" import "core:intrinsics" +Byte :: 1 +Kilobyte :: 1024 * Byte +Megabyte :: 1024 * Kilobyte +Gigabyte :: 1024 * Megabyte +Terabyte :: 1024 * Gigabyte + set :: proc "contextless" (data: rawptr, value: byte, len: int) -> rawptr { return runtime.memset(data, i32(value), len) } @@ -192,11 +198,6 @@ any_to_bytes :: proc "contextless" (val: any) -> []byte { } -kilobytes :: proc "contextless" (x: int) -> int { return (x) * 1024 } -megabytes :: proc "contextless" (x: int) -> int { return kilobytes(x) * 1024 } -gigabytes :: proc "contextless" (x: int) -> int { return megabytes(x) * 1024 } -terabytes :: proc "contextless" (x: int) -> int { return gigabytes(x) * 1024 } - is_power_of_two :: proc "contextless" (x: uintptr) -> bool { if x <= 0 { return false diff --git a/core/odin/printer/printer.odin b/core/odin/printer/printer.odin index abda44fa2..807cc99bd 100644 --- a/core/odin/printer/printer.odin +++ b/core/odin/printer/printer.odin @@ -151,7 +151,7 @@ print :: proc(p: ^Printer, file: ^ast.File) -> string { fix_lines(p) - builder := strings.make_builder(0, mem.megabytes(5), p.allocator) + builder := strings.make_builder(0, 5 * mem.Megabyte, p.allocator) last_line := 0 From ad90f416a59be22dbf8fca89890a70407dc5826c Mon Sep 17 00:00:00 2001 From: hikari Date: Thu, 7 Apr 2022 12:24:53 +0300 Subject: [PATCH 018/245] runtime: fix typo --- core/runtime/core.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/runtime/core.odin b/core/runtime/core.odin index a5a190a9c..4ab21d8cf 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -565,7 +565,7 @@ __init_context :: proc "contextless" (c: ^Context) { return } - // NOTE(bill): Do not initialize these procedures with a call as they are not defined with the "contexless" calling convention + // NOTE(bill): Do not initialize these procedures with a call as they are not defined with the "contextless" calling convention c.allocator.procedure = default_allocator_proc c.allocator.data = nil From c4a7739d13d386743a53ebe3371e8061310ea2cb Mon Sep 17 00:00:00 2001 From: hikari Date: Thu, 7 Apr 2022 19:28:24 +0300 Subject: [PATCH 019/245] sys/windows: add a couple macros --- core/sys/windows/util.odin | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/sys/windows/util.odin b/core/sys/windows/util.odin index d464007d3..f448f6bc5 100644 --- a/core/sys/windows/util.odin +++ b/core/sys/windows/util.odin @@ -15,6 +15,14 @@ HIWORD :: #force_inline proc "contextless" (x: DWORD) -> WORD { return WORD(x >> 16) } +GET_X_LPARAM :: #force_inline proc "contextless" (lp: LPARAM) -> c_int { + return cast(c_int)cast(c_short)LOWORD(cast(DWORD)lp) +} + +GET_Y_LPARAM :: #force_inline proc "contextless" (lp: LPARAM) -> c_int { + return cast(c_int)cast(c_short)HIWORD(cast(DWORD)lp) +} + utf8_to_utf16 :: proc(s: string, allocator := context.temp_allocator) -> []u16 { if len(s) < 1 { return nil From 15b440c4f1878a27f6cc2f2bf1249022f237fe7d Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Mon, 4 Apr 2022 15:39:42 +0200 Subject: [PATCH 020/245] [image] Add QOI load/save. Additionally: - Firm up PNG loader with some additional checks. - Add helper functions to `core:image` to expand grayscale to RGB(A), and so on. TODO: Possibly replace PNG's post-processing steps with calls to the new helper functions. --- core/compress/common.odin | 4 - core/image/common.odin | 830 +++++++++++++++++++++++++- core/image/png/helpers.odin | 13 +- core/image/png/png.odin | 75 ++- core/image/qoi/qoi.odin | 407 +++++++++++++ tests/core/image/test_core_image.odin | 2 +- 6 files changed, 1270 insertions(+), 61 deletions(-) create mode 100644 core/image/qoi/qoi.odin diff --git a/core/compress/common.odin b/core/compress/common.odin index 58aeac25b..f4e378269 100644 --- a/core/compress/common.odin +++ b/core/compress/common.odin @@ -128,7 +128,6 @@ Deflate_Error :: enum { BType_3, } - // General I/O context for ZLIB, LZW, etc. Context_Memory_Input :: struct #packed { input_data: []u8, @@ -151,7 +150,6 @@ when size_of(rawptr) == 8 { #assert(size_of(Context_Memory_Input) == 52) } - Context_Stream_Input :: struct #packed { input_data: []u8, input: io.Stream, @@ -185,8 +183,6 @@ Context_Stream_Input :: struct #packed { This simplifies end-of-stream handling where bits may be left in the bit buffer. */ -// TODO: Make these return compress.Error errors. - input_size_from_memory :: proc(z: ^Context_Memory_Input) -> (res: i64, err: Error) { return i64(len(z.input_data)), nil } diff --git a/core/image/common.odin b/core/image/common.odin index adaa094d8..2e7bca17e 100644 --- a/core/image/common.odin +++ b/core/image/common.odin @@ -15,6 +15,32 @@ import "core:mem" import "core:compress" import "core:runtime" +/* + 67_108_864 pixels max by default. + + For QOI, the Worst case scenario means all pixels will be encoded as RGBA literals, costing 5 bytes each. + This caps memory usage at 320 MiB. + + The tunable is limited to 4_294_836_225 pixels maximum, or 4 GiB per 8-bit channel. + It is not advised to tune it this large. + + The 64 Megapixel default is considered to be a decent upper bound you won't run into in practice, + except in very specific circumstances. + +*/ +MAX_DIMENSIONS :: min(#config(MAX_DIMENSIONS, 8192 * 8192), 65535 * 65535) + +// Color +RGB_Pixel :: [3]u8 +RGBA_Pixel :: [4]u8 +RGB_Pixel_16 :: [3]u16 +RGBA_Pixel_16 :: [4]u16 +// Grayscale +G_Pixel :: [1]u8 +GA_Pixel :: [2]u8 +G_Pixel_16 :: [1]u16 +GA_Pixel_16 :: [2]u16 + Image :: struct { width: int, height: int, @@ -26,15 +52,17 @@ Image :: struct { For convenience, we return them as u16 so we don't need to switch on the type in our viewer, and can just test against nil. */ - background: Maybe([3]u16), - + background: Maybe(RGB_Pixel_16), metadata: Image_Metadata, } Image_Metadata :: union { ^PNG_Info, + ^QOI_Info, } + + /* IMPORTANT: `.do_not_expand_*` options currently skip handling of the `alpha_*` options, therefore Gray+Alpha will be returned as such even if you add `.alpha_drop_if_present`, @@ -46,13 +74,13 @@ Image_Metadata :: union { /* Image_Option: `.info` - This option behaves as `.return_ihdr` and `.do_not_decompress_image` and can be used + This option behaves as `.return_metadata` and `.do_not_decompress_image` and can be used to gather an image's dimensions and color information. `.return_header` - Fill out img.sidecar.header with the image's format-specific header struct. + Fill out img.metadata.header with the image's format-specific header struct. If we only care about the image specs, we can set `.return_header` + - `.do_not_decompress_image`, or `.info`, which works as if both of these were set. + `.do_not_decompress_image`, or `.info`. `.return_metadata` Returns all chunks not needed to decode the data. @@ -88,7 +116,7 @@ Image_Option: `.alpha_premultiply` If the image has an alpha channel, returns image data as follows: - RGB *= A, Gray = Gray *= A + RGB *= A, Gray = Gray *= A `.blend_background` If a bKGD chunk is present in a PNG, we normally just set `img.background` @@ -103,24 +131,29 @@ Image_Option: */ Option :: enum { + // LOAD OPTIONS info = 0, do_not_decompress_image, return_header, return_metadata, - alpha_add_if_missing, - alpha_drop_if_present, - alpha_premultiply, - blend_background, + alpha_add_if_missing, // Ignored for QOI. Always returns RGBA8. + alpha_drop_if_present, // Unimplemented for QOI. Returns error. + alpha_premultiply, // Unimplemented for QOI. Returns error. + blend_background, // Ignored for non-PNG formats // Unimplemented do_not_expand_grayscale, do_not_expand_indexed, do_not_expand_channels, + + // SAVE OPTIONS + qoi_all_channels_linear, // QOI, informative info. If not set, defaults to sRGB with linear alpha. } Options :: distinct bit_set[Option] Error :: union #shared_nil { General_Image_Error, PNG_Error, + QOI_Error, compress.Error, compress.General_Error, @@ -134,8 +167,13 @@ General_Image_Error :: enum { Invalid_Image_Dimensions, Image_Dimensions_Too_Large, Image_Does_Not_Adhere_to_Spec, + Invalid_Input_Image, + Invalid_Output, } +/* + PNG-specific definitions +*/ PNG_Error :: enum { None = 0, Invalid_PNG_Signature, @@ -147,7 +185,9 @@ PNG_Error :: enum { IDAT_Size_Too_Large, PLTE_Encountered_Unexpectedly, PLTE_Invalid_Length, + PLTE_Missing, TRNS_Encountered_Unexpectedly, + TNRS_Invalid_Length, BKGD_Invalid_Length, Unknown_Color_Type, Invalid_Color_Bit_Depth_Combo, @@ -158,9 +198,6 @@ PNG_Error :: enum { Invalid_Chunk_Length, } -/* - PNG-specific structs -*/ PNG_Info :: struct { header: PNG_IHDR, chunks: [dynamic]PNG_Chunk, @@ -223,7 +260,7 @@ PNG_Chunk_Type :: enum u32be { */ iDOT = 'i' << 24 | 'D' << 16 | 'O' << 8 | 'T', - CbGI = 'C' << 24 | 'b' << 16 | 'H' << 8 | 'I', + CgBI = 'C' << 24 | 'g' << 16 | 'B' << 8 | 'I', } PNG_IHDR :: struct #packed { @@ -251,16 +288,44 @@ PNG_Interlace_Method :: enum u8 { } /* - Functions to help with image buffer calculations + QOI-specific definitions */ +QOI_Error :: enum { + None = 0, + Invalid_QOI_Signature, + Invalid_Number_Of_Channels, // QOI allows 3 or 4 channel data. + Invalid_Bit_Depth, // QOI supports only 8-bit images, error only returned from writer. + Invalid_Color_Space, // QOI allows 0 = sRGB or 1 = linear. + Corrupt, // More data than pixels to decode into, for example. + Missing_Or_Corrupt_Trailer, // Image seemed to have decoded okay, but trailer is missing or corrupt. +} + +QOI_Magic :: u32be(0x716f6966) // "qoif" + +QOI_Color_Space :: enum u8 { + sRGB = 0, + Linear = 1, +} + +QOI_Header :: struct #packed { + magic: u32be, + width: u32be, + height: u32be, + channels: u8, + color_space: QOI_Color_Space, +} +#assert(size_of(QOI_Header) == 14) + +QOI_Info :: struct { + header: QOI_Header, +} + +// Function to help with image buffer calculations compute_buffer_size :: proc(width, height, channels, depth: int, extra_row_bytes := int(0)) -> (size: int) { size = ((((channels * width * depth) + 7) >> 3) + extra_row_bytes) * height return } -/* - For when you have an RGB(A) image, but want a particular channel. -*/ Channel :: enum u8 { R = 1, G = 2, @@ -268,7 +333,13 @@ Channel :: enum u8 { A = 4, } +// When you have an RGB(A) image, but want a particular channel. return_single_channel :: proc(img: ^Image, channel: Channel) -> (res: ^Image, ok: bool) { + // Were we actually given a valid image? + if img == nil { + return nil, false + } + ok = false t: bytes.Buffer @@ -298,7 +369,7 @@ return_single_channel :: proc(img: ^Image, channel: Channel) -> (res: ^Image, ok o = o[1:] } case 16: - buffer_size := compute_buffer_size(img.width, img.height, 2, 8) + buffer_size := compute_buffer_size(img.width, img.height, 1, 16) t = bytes.Buffer{} resize(&t.buf, buffer_size) @@ -326,3 +397,724 @@ return_single_channel :: proc(img: ^Image, channel: Channel) -> (res: ^Image, ok return res, true } + +// Does the image have 1 or 2 channels, a valid bit depth (8 or 16), +// Is the pointer valid, are the dimenions valid? +is_valid_grayscale_image :: proc(img: ^Image) -> (ok: bool) { + // Were we actually given a valid image? + if img == nil { + return false + } + + // Are we a Gray or Gray + Alpha image? + if img.channels != 1 && img.channels != 2 { + return false + } + + // Do we have an acceptable bit depth? + if img.depth != 8 && img.depth != 16 { + return false + } + + // This returns 0 if any of the inputs is zero. + bytes_expected := compute_buffer_size(img.width, img.height, img.channels, img.depth) + + // If the dimenions are invalid or the buffer size doesn't match the image characteristics, bail. + if bytes_expected == 0 || bytes_expected != len(img.pixels.buf) || img.width * img.height > MAX_DIMENSIONS { + return false + } + + return true +} + +// Does the image have 3 or 4 channels, a valid bit depth (8 or 16), +// Is the pointer valid, are the dimenions valid? +is_valid_color_image :: proc(img: ^Image) -> (ok: bool) { + // Were we actually given a valid image? + if img == nil { + return false + } + + // Are we an RGB or RGBA image? + if img.channels != 3 && img.channels != 4 { + return false + } + + // Do we have an acceptable bit depth? + if img.depth != 8 && img.depth != 16 { + return false + } + + // This returns 0 if any of the inputs is zero. + bytes_expected := compute_buffer_size(img.width, img.height, img.channels, img.depth) + + // If the dimenions are invalid or the buffer size doesn't match the image characteristics, bail. + if bytes_expected == 0 || bytes_expected != len(img.pixels.buf) || img.width * img.height > MAX_DIMENSIONS { + return false + } + + return true +} + +// Does the image have 1..4 channels, a valid bit depth (8 or 16), +// Is the pointer valid, are the dimenions valid? +is_valid_image :: proc(img: ^Image) -> (ok: bool) { + // Were we actually given a valid image? + if img == nil { + return false + } + + return is_valid_color_image(img) || is_valid_grayscale_image(img) +} + +Alpha_Key :: union { + GA_Pixel, + RGBA_Pixel, + GA_Pixel_16, + RGBA_Pixel_16, +} + +/* + Add alpha channel if missing, in-place. + + Expects 1..4 channels (Gray, Gray + Alpha, RGB, RGBA). + Any other number of channels will be considered an error, returning `false` without modifying the image. + If the input image already has an alpha channel, it'll return `true` early (without considering optional keyed alpha). + + If an image doesn't already have an alpha channel: + If the optional `alpha_key` is provided, it will be resolved as follows: + - For RGB, if pix = key.rgb -> pix = {0, 0, 0, key.a} + - For Gray, if pix = key.r -> pix = {0, key.g} + Otherwise, an opaque alpha channel will be added. +*/ +alpha_add_if_missing :: proc(img: ^Image, alpha_key := Alpha_Key{}, allocator := context.allocator) -> (ok: bool) { + context.allocator = allocator + + if !is_valid_image(img) { + return false + } + + // We should now have a valid Image with 1..4 channels. Do we already have alpha? + if img.channels == 2 || img.channels == 4 { + // We're done. + return true + } + + channels := img.channels + 1 + bytes_wanted := compute_buffer_size(img.width, img.height, channels, img.depth) + + buf := bytes.Buffer{} + + // Can we allocate the return buffer? + if !resize(&buf.buf, bytes_wanted) { + delete(buf.buf) + return false + } + + switch img.depth { + case 8: + switch channels { + case 2: + // Turn Gray into Gray + Alpha + inp := mem.slice_data_cast([]G_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]GA_Pixel, buf.buf[:]) + + if key, key_ok := alpha_key.(GA_Pixel); key_ok { + // We have keyed alpha. + o: GA_Pixel + for p in inp { + if p == key.r { + o = GA_Pixel{0, key.g} + } else { + o = GA_Pixel{p.r, 255} + } + out[0] = o + out = out[1:] + } + } else { + // No keyed alpha, just make all pixels opaque. + o := GA_Pixel{0, 255} + for p in inp { + o.r = p.r + out[0] = o + out = out[1:] + } + } + + case 4: + // Turn RGB into RGBA + inp := mem.slice_data_cast([]RGB_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGBA_Pixel, buf.buf[:]) + + if key, key_ok := alpha_key.(RGBA_Pixel); key_ok { + // We have keyed alpha. + o: RGBA_Pixel + for p in inp { + if p == key.rgb { + o = RGBA_Pixel{0, 0, 0, key.a} + } else { + o = RGBA_Pixel{p.r, p.g, p.b, 255} + } + out[0] = o + out = out[1:] + } + } else { + // No keyed alpha, just make all pixels opaque. + o := RGBA_Pixel{0, 0, 0, 255} + for p in inp { + o.rgb = p + out[0] = o + out = out[1:] + } + } + case: + // We shouldn't get here. + unreachable() + } + case 16: + switch channels { + case 2: + // Turn Gray into Gray + Alpha + inp := mem.slice_data_cast([]G_Pixel_16, img.pixels.buf[:]) + out := mem.slice_data_cast([]GA_Pixel_16, buf.buf[:]) + + if key, key_ok := alpha_key.(GA_Pixel_16); key_ok { + // We have keyed alpha. + o: GA_Pixel_16 + for p in inp { + if p == key.r { + o = GA_Pixel_16{0, key.g} + } else { + o = GA_Pixel_16{p.r, 65535} + } + out[0] = o + out = out[1:] + } + } else { + // No keyed alpha, just make all pixels opaque. + o := GA_Pixel_16{0, 65535} + for p in inp { + o.r = p.r + out[0] = o + out = out[1:] + } + } + + case 4: + // Turn RGB into RGBA + inp := mem.slice_data_cast([]RGB_Pixel_16, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGBA_Pixel_16, buf.buf[:]) + + if key, key_ok := alpha_key.(RGBA_Pixel_16); key_ok { + // We have keyed alpha. + o: RGBA_Pixel_16 + for p in inp { + if p == key.rgb { + o = RGBA_Pixel_16{0, 0, 0, key.a} + } else { + o = RGBA_Pixel_16{p.r, p.g, p.b, 65535} + } + out[0] = o + out = out[1:] + } + } else { + // No keyed alpha, just make all pixels opaque. + o := RGBA_Pixel_16{0, 0, 0, 65535} + for p in inp { + o.rgb = p + out[0] = o + out = out[1:] + } + } + case: + // We shouldn't get here. + unreachable() + } + } + + // If we got here, that means we've now got a buffer with the alpha channel added. + // Destroy the old pixel buffer and replace it with the new one, and update the channel count. + bytes.buffer_destroy(&img.pixels) + img.pixels = buf + img.channels = channels + return true +} +alpha_apply_keyed_alpha :: alpha_add_if_missing + +/* + Drop alpha channel if present, in-place. + + Expects 1..4 channels (Gray, Gray + Alpha, RGB, RGBA). + Any other number of channels will be considered an error, returning `false` without modifying the image. + + Of the `options`, the following are considered: + `.alpha_premultiply` + If the image has an alpha channel, returns image data as follows: + RGB *= A, Gray = Gray *= A + + `.blend_background` + If `img.background` is set, it'll be blended in like this: + RGB = (1 - A) * Background + A * RGB + + If an image has 1 (Gray) or 3 (RGB) channels, it'll return early without modifying the image, + with one exception: `alpha_key` and `img.background` are present, and `.blend_background` is set. + + In this case a keyed alpha pixel will be replaced with the background color. +*/ +alpha_drop_if_present :: proc(img: ^Image, options := Options{}, alpha_key := Alpha_Key{}, allocator := context.allocator) -> (ok: bool) { + context.allocator = allocator + + if !is_valid_image(img) { + return false + } + + // Do we have a background to blend? + will_it_blend := false + switch v in img.background { + case RGB_Pixel_16: will_it_blend = true if .blend_background in options else false + } + + // Do we have keyed alpha? + keyed := false + switch v in alpha_key { + case GA_Pixel: keyed = true if img.channels == 1 && img.depth == 8 else false + case RGBA_Pixel: keyed = true if img.channels == 3 && img.depth == 8 else false + case GA_Pixel_16: keyed = true if img.channels == 1 && img.depth == 16 else false + case RGBA_Pixel_16: keyed = true if img.channels == 3 && img.depth == 16 else false + } + + // We should now have a valid Image with 1..4 channels. Do we have alpha? + if img.channels == 1 || img.channels == 3 { + if !(will_it_blend && keyed) { + // We're done + return true + } + } + + // # of destination channels + channels := 1 if img.channels < 3 else 3 + + bytes_wanted := compute_buffer_size(img.width, img.height, channels, img.depth) + buf := bytes.Buffer{} + + // Can we allocate the return buffer? + if !resize(&buf.buf, bytes_wanted) { + delete(buf.buf) + return false + } + + switch img.depth { + case 8: + switch img.channels { + case 1: // Gray to Gray, but we should have keyed alpha + background. + inp := mem.slice_data_cast([]G_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]G_Pixel, buf.buf[:]) + + key := alpha_key.(GA_Pixel).r + bg := G_Pixel{} + if temp_bg, temp_bg_ok := img.background.(RGB_Pixel_16); temp_bg_ok { + // Background is RGB 16-bit, take just the red channel's topmost byte. + bg = u8(temp_bg.r >> 8) + } + + for p in inp { + out[0] = bg if p == key else p + out = out[1:] + } + + case 2: // Gray + Alpha to Gray, no keyed alpha but we can have a background. + inp := mem.slice_data_cast([]GA_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]G_Pixel, buf.buf[:]) + + if will_it_blend { + // Blend with background "color", then drop alpha. + bg := f32(0.0) + if temp_bg, temp_bg_ok := img.background.(RGB_Pixel_16); temp_bg_ok { + // Background is RGB 16-bit, take just the red channel's topmost byte. + bg = f32(temp_bg.r >> 8) + } + + for p in inp { + a := f32(p.g) / 255.0 + c := ((1.0 - a) * bg + a * f32(p.r)) + out[0] = u8(c) + out = out[1:] + } + + } else if .alpha_premultiply in options { + // Premultiply component with alpha, then drop alpha. + for p in inp { + a := f32(p.g) / 255.0 + c := f32(p.r) * a + out[0] = u8(c) + out = out[1:] + } + } else { + // Just drop alpha on the floor. + for p in inp { + out[0] = p.r + out = out[1:] + } + } + + case 3: // RGB to RGB, but we should have keyed alpha + background. + inp := mem.slice_data_cast([]RGB_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGB_Pixel, buf.buf[:]) + + key := alpha_key.(RGBA_Pixel) + bg := RGB_Pixel{} + if temp_bg, temp_bg_ok := img.background.(RGB_Pixel_16); temp_bg_ok { + // Background is RGB 16-bit, squash down to 8 bits. + bg = {u8(temp_bg.r >> 8), u8(temp_bg.g >> 8), u8(temp_bg.b >> 8)} + } + + for p in inp { + out[0] = bg if p == key.rgb else p + out = out[1:] + } + + case 4: // RGBA to RGB, no keyed alpha but we can have a background or need to premultiply. + inp := mem.slice_data_cast([]RGBA_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGB_Pixel, buf.buf[:]) + + if will_it_blend { + // Blend with background "color", then drop alpha. + bg := [3]f32{} + if temp_bg, temp_bg_ok := img.background.(RGB_Pixel_16); temp_bg_ok { + // Background is RGB 16-bit, take just the red channel's topmost byte. + bg = {f32(temp_bg.r >> 8), f32(temp_bg.g >> 8), f32(temp_bg.b >> 8)} + } + + for p in inp { + a := f32(p.a) / 255.0 + rgb := [3]f32{f32(p.r), f32(p.g), f32(p.b)} + c := ((1.0 - a) * bg + a * rgb) + + out[0] = {u8(c.r), u8(c.g), u8(c.b)} + out = out[1:] + } + + } else if .alpha_premultiply in options { + // Premultiply component with alpha, then drop alpha. + for p in inp { + a := f32(p.a) / 255.0 + rgb := [3]f32{f32(p.r), f32(p.g), f32(p.b)} + c := rgb * a + + out[0] = {u8(c.r), u8(c.g), u8(c.b)} + out = out[1:] + } + } else { + // Just drop alpha on the floor. + for p in inp { + out[0] = p.rgb + out = out[1:] + } + } + } + + case 16: + switch img.channels { + case 1: // Gray to Gray, but we should have keyed alpha + background. + inp := mem.slice_data_cast([]G_Pixel_16, img.pixels.buf[:]) + out := mem.slice_data_cast([]G_Pixel_16, buf.buf[:]) + + key := alpha_key.(GA_Pixel_16).r + bg := G_Pixel_16{} + if temp_bg, temp_bg_ok := img.background.(RGB_Pixel_16); temp_bg_ok { + // Background is RGB 16-bit, take just the red channel. + bg = temp_bg.r + } + + for p in inp { + out[0] = bg if p == key else p + out = out[1:] + } + + case 2: // Gray + Alpha to Gray, no keyed alpha but we can have a background. + inp := mem.slice_data_cast([]GA_Pixel_16, img.pixels.buf[:]) + out := mem.slice_data_cast([]G_Pixel_16, buf.buf[:]) + + if will_it_blend { + // Blend with background "color", then drop alpha. + bg := f32(0.0) + if temp_bg, temp_bg_ok := img.background.(RGB_Pixel_16); temp_bg_ok { + // Background is RGB 16-bit, take just the red channel. + bg = f32(temp_bg.r) + } + + for p in inp { + a := f32(p.g) / 65535.0 + c := ((1.0 - a) * bg + a * f32(p.r)) + out[0] = u16(c) + out = out[1:] + } + + } else if .alpha_premultiply in options { + // Premultiply component with alpha, then drop alpha. + for p in inp { + a := f32(p.g) / 65535.0 + c := f32(p.r) * a + out[0] = u16(c) + out = out[1:] + } + } else { + // Just drop alpha on the floor. + for p in inp { + out[0] = p.r + out = out[1:] + } + } + + case 3: // RGB to RGB, but we should have keyed alpha + background. + inp := mem.slice_data_cast([]RGB_Pixel_16, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGB_Pixel_16, buf.buf[:]) + + key := alpha_key.(RGBA_Pixel_16) + bg := img.background.(RGB_Pixel_16) + + for p in inp { + out[0] = bg if p == key.rgb else p + out = out[1:] + } + + case 4: // RGBA to RGB, no keyed alpha but we can have a background or need to premultiply. + inp := mem.slice_data_cast([]RGBA_Pixel_16, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGB_Pixel_16, buf.buf[:]) + + if will_it_blend { + // Blend with background "color", then drop alpha. + bg := [3]f32{} + if temp_bg, temp_bg_ok := img.background.(RGB_Pixel_16); temp_bg_ok { + // Background is RGB 16-bit, convert to [3]f32 to blend. + bg = {f32(temp_bg.r), f32(temp_bg.g), f32(temp_bg.b)} + } + + for p in inp { + a := f32(p.a) / 65535.0 + rgb := [3]f32{f32(p.r), f32(p.g), f32(p.b)} + c := ((1.0 - a) * bg + a * rgb) + + out[0] = {u16(c.r), u16(c.g), u16(c.b)} + out = out[1:] + } + + } else if .alpha_premultiply in options { + // Premultiply component with alpha, then drop alpha. + for p in inp { + a := f32(p.a) / 65535.0 + rgb := [3]f32{f32(p.r), f32(p.g), f32(p.b)} + c := rgb * a + + out[0] = {u16(c.r), u16(c.g), u16(c.b)} + out = out[1:] + } + } else { + // Just drop alpha on the floor. + for p in inp { + out[0] = p.rgb + out = out[1:] + } + } + } + + case: + unreachable() + } + + // If we got here, that means we've now got a buffer with the alpha channel dropped. + // Destroy the old pixel buffer and replace it with the new one, and update the channel count. + bytes.buffer_destroy(&img.pixels) + img.pixels = buf + img.channels = channels + return true +} + +// Apply palette to 8-bit single-channel image and return an 8-bit RGB image, in-place. +// If the image given is not a valid 8-bit single channel image, the procedure will return `false` early. +apply_palette_rgb :: proc(img: ^Image, palette: [256]RGB_Pixel, allocator := context.allocator) -> (ok: bool) { + context.allocator = allocator + + if img == nil || img.channels != 1 || img.depth != 8 { + return false + } + + bytes_expected := compute_buffer_size(img.width, img.height, 1, 8) + if bytes_expected == 0 || bytes_expected != len(img.pixels.buf) || img.width * img.height > MAX_DIMENSIONS { + return false + } + + // Can we allocate the return buffer? + buf := bytes.Buffer{} + bytes_wanted := compute_buffer_size(img.width, img.height, 3, 8) + if !resize(&buf.buf, bytes_wanted) { + delete(buf.buf) + return false + } + + out := mem.slice_data_cast([]RGB_Pixel, buf.buf[:]) + + // Apply the palette + for p, i in img.pixels.buf { + out[i] = palette[p] + } + + // If we got here, that means we've now got a buffer with the alpha channel dropped. + // Destroy the old pixel buffer and replace it with the new one, and update the channel count. + bytes.buffer_destroy(&img.pixels) + img.pixels = buf + img.channels = 3 + return true +} + +// Apply palette to 8-bit single-channel image and return an 8-bit RGBA image, in-place. +// If the image given is not a valid 8-bit single channel image, the procedure will return `false` early. +apply_palette_rgba :: proc(img: ^Image, palette: [256]RGBA_Pixel, allocator := context.allocator) -> (ok: bool) { + context.allocator = allocator + + if img == nil || img.channels != 1 || img.depth != 8 { + return false + } + + bytes_expected := compute_buffer_size(img.width, img.height, 1, 8) + if bytes_expected == 0 || bytes_expected != len(img.pixels.buf) || img.width * img.height > MAX_DIMENSIONS { + return false + } + + // Can we allocate the return buffer? + buf := bytes.Buffer{} + bytes_wanted := compute_buffer_size(img.width, img.height, 4, 8) + if !resize(&buf.buf, bytes_wanted) { + delete(buf.buf) + return false + } + + out := mem.slice_data_cast([]RGBA_Pixel, buf.buf[:]) + + // Apply the palette + for p, i in img.pixels.buf { + out[i] = palette[p] + } + + // If we got here, that means we've now got a buffer with the alpha channel dropped. + // Destroy the old pixel buffer and replace it with the new one, and update the channel count. + bytes.buffer_destroy(&img.pixels) + img.pixels = buf + img.channels = 4 + return true +} +apply_palette :: proc{apply_palette_rgb, apply_palette_rgba} + + +// Replicates grayscale values into RGB(A) 8- or 16-bit images as appropriate. +// Returns early with `false` if already an RGB(A) image. +expand_grayscale :: proc(img: ^Image, allocator := context.allocator) -> (ok: bool) { + context.allocator = allocator + + if !is_valid_grayscale_image(img) { + return false + } + + // We should have 1 or 2 channels of 8- or 16 bits now. We need to turn that into 3 or 4. + // Can we allocate the return buffer? + buf := bytes.Buffer{} + bytes_wanted := compute_buffer_size(img.width, img.height, img.channels + 2, img.depth) + if !resize(&buf.buf, bytes_wanted) { + delete(buf.buf) + return false + } + + switch img.depth { + case 8: + switch img.channels { + case 1: // Turn Gray into RGB + out := mem.slice_data_cast([]RGB_Pixel, buf.buf[:]) + + for p in img.pixels.buf { + out[0] = p // Broadcast gray value into RGB components. + out = out[1:] + } + + case 2: // Turn Gray + Alpha into RGBA + inp := mem.slice_data_cast([]GA_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGBA_Pixel, buf.buf[:]) + + for p in inp { + out[0].rgb = p.r // Gray component. + out[0].a = p.g // Alpha component. + } + + case: + unreachable() + } + + case 16: + switch img.channels { + case 1: // Turn Gray into RGB + inp := mem.slice_data_cast([]u16, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGB_Pixel_16, buf.buf[:]) + + for p in inp { + out[0] = p // Broadcast gray value into RGB components. + out = out[1:] + } + + case 2: // Turn Gray + Alpha into RGBA + inp := mem.slice_data_cast([]GA_Pixel_16, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGBA_Pixel_16, buf.buf[:]) + + for p in inp { + out[0].rgb = p.r // Gray component. + out[0].a = p.g // Alpha component. + } + + case: + unreachable() + } + + case: + unreachable() + } + + + // If we got here, that means we've now got a buffer with the extra alpha channel. + // Destroy the old pixel buffer and replace it with the new one, and update the channel count. + bytes.buffer_destroy(&img.pixels) + img.pixels = buf + img.channels += 2 + return true +} + +/* + Helper functions to read and write data from/to a Context, etc. +*/ +@(optimization_mode="speed") +read_data :: proc(z: $C, $T: typeid) -> (res: T, err: compress.General_Error) { + if r, e := compress.read_data(z, T); e != .None { + return {}, .Stream_Too_Short + } else { + return r, nil + } +} + +@(optimization_mode="speed") +read_u8 :: proc(z: $C) -> (res: u8, err: compress.General_Error) { + if r, e := compress.read_u8(z); e != .None { + return {}, .Stream_Too_Short + } else { + return r, nil + } +} + +write_bytes :: proc(buf: ^bytes.Buffer, data: []u8) -> (err: compress.General_Error) { + if len(data) == 0 { + return nil + } else if len(data) == 1 { + if bytes.buffer_write_byte(buf, data[0]) != nil { + return compress.General_Error.Resize_Failed + } + } else if n, _ := bytes.buffer_write(buf, data); n != len(data) { + return compress.General_Error.Resize_Failed + } + return nil +} \ No newline at end of file diff --git a/core/image/png/helpers.odin b/core/image/png/helpers.odin index c64e6f471..0ebf0b20b 100644 --- a/core/image/png/helpers.odin +++ b/core/image/png/helpers.odin @@ -242,17 +242,16 @@ srgb :: proc(c: image.PNG_Chunk) -> (res: sRGB, ok: bool) { } plte :: proc(c: image.PNG_Chunk) -> (res: PLTE, ok: bool) { - if c.header.type != .PLTE { + if c.header.type != .PLTE || c.header.length % 3 != 0 || c.header.length > 768 { return {}, false } - i := 0; j := 0; ok = true - for j < int(c.header.length) { - res.entries[i] = {c.data[j], c.data[j+1], c.data[j+2]} - i += 1; j += 3 + plte := mem.slice_data_cast([]image.RGB_Pixel, c.data[:]) + for color, i in plte { + res.entries[i] = color } - res.used = u16(i) - return + res.used = u16(len(plte)) + return res, true } splt :: proc(c: image.PNG_Chunk) -> (res: sPLT, ok: bool) { diff --git a/core/image/png/png.odin b/core/image/png/png.odin index bff0afde3..55d69e7c7 100644 --- a/core/image/png/png.odin +++ b/core/image/png/png.odin @@ -25,16 +25,13 @@ import "core:io" import "core:mem" import "core:intrinsics" -/* - 67_108_864 pixels max by default. - Maximum allowed dimensions are capped at 65535 * 65535. -*/ -MAX_DIMENSIONS :: min(#config(PNG_MAX_DIMENSIONS, 8192 * 8192), 65535 * 65535) +import "core:fmt" + + +// Limit chunk sizes. +// By default: IDAT = 8k x 8k x 16-bits + 8k filter bytes. +// The total number of pixels defaults to 64 Megapixel and can be tuned in image/common.odin. -/* - Limit chunk sizes. - By default: IDAT = 8k x 8k x 16-bits + 8k filter bytes. -*/ _MAX_IDAT_DEFAULT :: ( 8192 /* Width */ * 8192 /* Height */ * 2 /* 16-bit */) + 8192 /* Filter bytes */ _MAX_IDAT :: (65535 /* Width */ * 65535 /* Height */ * 2 /* 16-bit */) + 65535 /* Filter bytes */ @@ -64,7 +61,7 @@ Row_Filter :: enum u8 { Paeth = 4, } -PLTE_Entry :: [3]u8 +PLTE_Entry :: image.RGB_Pixel PLTE :: struct #packed { entries: [256]PLTE_Entry, @@ -259,7 +256,7 @@ read_header :: proc(ctx: ^$C) -> (image.PNG_IHDR, Error) { header := (^image.PNG_IHDR)(raw_data(c.data))^ // Validate IHDR using header - if width == 0 || height == 0 || u128(width) * u128(height) > MAX_DIMENSIONS { + if width == 0 || height == 0 || u128(width) * u128(height) > image.MAX_DIMENSIONS { return {}, .Invalid_Image_Dimensions } @@ -366,6 +363,10 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a options -= {.info} } + if .return_header in options && .return_metadata in options { + options -= {.return_header} + } + if .alpha_drop_if_present in options && .alpha_add_if_missing in options { return {}, compress.General_Error.Incompatible_Options } @@ -392,7 +393,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a idat_length := u64(0) - c: image.PNG_Chunk + c: image.PNG_Chunk ch: image.PNG_Chunk_Header e: io.Error @@ -473,6 +474,10 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a } info.header = h + if .return_header in options && .return_metadata not_in options && .do_not_decompress_image not_in options { + return img, nil + } + case .PLTE: seen_plte = true // PLTE must appear before IDAT and can't appear for color types 0, 4. @@ -540,9 +545,6 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a seen_iend = true case .bKGD: - - // TODO: Make sure that 16-bit bKGD + tRNS chunks return u16 instead of u16be - c = read_chunk(ctx) or_return seen_bkgd = true if .return_metadata in options { @@ -594,23 +596,39 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a */ final_image_channels += 1 - seen_trns = true + + if .Paletted in header.color_type { + if len(c.data) > 256 { + fmt.printf("[PLTE] tRNS length: %v\n", len(c.data)) + return img, .TNRS_Invalid_Length + } + } else if .Color in header.color_type { + if len(c.data) != 6 { + fmt.printf("[COLOR] tRNS length: %v\n", len(c.data)) + return img, .TNRS_Invalid_Length + } + } else if len(c.data) != 2 { + fmt.printf("[GRAY] tRNS length: %v\n", len(c.data)) + return img, .TNRS_Invalid_Length + } + if info.header.bit_depth < 8 && .Paletted not_in info.header.color_type { // Rescale tRNS data so key matches intensity - dsc := depth_scale_table + dsc := depth_scale_table scale := dsc[info.header.bit_depth] if scale != 1 { key := mem.slice_data_cast([]u16be, c.data)[0] * u16be(scale) c.data = []u8{0, u8(key & 255)} } } + trns = c - case .iDOT, .CbGI: + case .iDOT, .CgBI: /* iPhone PNG bastardization that doesn't adhere to spec with broken IDAT chunk. - We're not going to add support for it. If you have the misfortunte of coming + We're not going to add support for it. If you have the misfortune of coming across one of these files, use a utility to defry it. */ return img, .Image_Does_Not_Adhere_to_Spec @@ -635,6 +653,10 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a return img, .IDAT_Missing } + if .Paletted in header.color_type && !seen_plte { + return img, .PLTE_Missing + } + /* Calculate the expected output size, to help `inflate` make better decisions about the output buffer. We'll also use it to check the returned buffer size is what we expected it to be. @@ -683,15 +705,6 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a return {}, defilter_error } - /* - Now we'll handle the relocoring of paletted images, handling of tRNS chunks, - and we'll expand grayscale images to RGB(A). - - For the sake of convenience we return only RGB(A) images. In the future we - may supply an option to return Gray/Gray+Alpha as-is, in which case RGB(A) - will become the default. - */ - if .Paletted in header.color_type && .do_not_expand_indexed in options { return img, nil } @@ -699,7 +712,10 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a return img, nil } - + /* + Now we're going to optionally apply various post-processing stages, + to for example expand grayscale, apply a palette, premultiply alpha, etc. + */ raw_image_channels := img.channels out_image_channels := 3 @@ -1204,7 +1220,6 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a return img, nil } - filter_paeth :: #force_inline proc(left, up, up_left: u8) -> u8 { aa, bb, cc := i16(left), i16(up), i16(up_left) p := aa + bb - cc diff --git a/core/image/qoi/qoi.odin b/core/image/qoi/qoi.odin new file mode 100644 index 000000000..c157e8099 --- /dev/null +++ b/core/image/qoi/qoi.odin @@ -0,0 +1,407 @@ +/* + Copyright 2022 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ + + +// package qoi implements a QOI image reader +// +// The QOI specification is at https://qoiformat.org. +package qoi + +import "core:mem" +import "core:image" +import "core:compress" +import "core:bytes" +import "core:os" + +Error :: image.Error +General :: compress.General_Error +Image :: image.Image +Options :: image.Options + +RGB_Pixel :: image.RGB_Pixel +RGBA_Pixel :: image.RGBA_Pixel + +save_to_memory :: proc(output: ^bytes.Buffer, img: ^Image, options := Options{}, allocator := context.allocator) -> (err: Error) { + context.allocator = allocator + + if img == nil { + return .Invalid_Input_Image + } + + if output == nil { + return .Invalid_Output + } + + pixels := img.width * img.height + if pixels == 0 || pixels > image.MAX_DIMENSIONS { + return .Invalid_Input_Image + } + + // QOI supports only 8-bit images with 3 or 4 channels. + if img.depth != 8 || img.channels < 3 || img.channels > 4 { + return .Invalid_Input_Image + } + + if img.channels * pixels != len(img.pixels.buf) { + return .Invalid_Input_Image + } + + written := 0 + + // Calculate and allocate maximum size. We'll reclaim space to actually written output at the end. + max_size := pixels * (img.channels + 1) + size_of(image.QOI_Header) + size_of(u64be) + + if !resize(&output.buf, max_size) { + return General.Resize_Failed + } + + header := image.QOI_Header{ + magic = image.QOI_Magic, + width = u32be(img.width), + height = u32be(img.height), + channels = u8(img.channels), + color_space = .Linear if .qoi_all_channels_linear in options else .sRGB, + } + header_bytes := transmute([size_of(image.QOI_Header)]u8)header + + copy(output.buf[written:], header_bytes[:]) + written += size_of(image.QOI_Header) + + /* + Encode loop starts here. + */ + seen: [64]RGBA_Pixel + pix := RGBA_Pixel{0, 0, 0, 255} + prev := pix + + seen[qoi_hash(pix)] = pix + + input := img.pixels.buf[:] + run := u8(0) + + for len(input) > 0 { + if img.channels == 4 { + pix = (^RGBA_Pixel)(raw_data(input))^ + } else { + pix.rgb = (^RGB_Pixel)(raw_data(input))^ + } + input = input[img.channels:] + + if pix == prev { + run += 1 + // As long as the pixel matches the last one, accumulate the run total. + // If we reach the max run length or the end of the image, write the run. + if run == 62 || len(input) == 0 { + // Encode and write run + output.buf[written] = u8(QOI_Opcode_Tag.RUN) | (run - 1) + written += 1 + run = 0 + } + } else { + if run > 0 { + // The pixel differs from the previous one, but we still need to write the pending run. + // Encode and write run + output.buf[written] = u8(QOI_Opcode_Tag.RUN) | (run - 1) + written += 1 + run = 0 + } + + index := qoi_hash(pix) + + if seen[index] == pix { + // Write indexed pixel + output.buf[written] = u8(QOI_Opcode_Tag.INDEX) | index + written += 1 + } else { + // Add pixel to index + seen[index] = pix + + // If the alpha matches the previous pixel's alpha, we don't need to write a full RGBA literal. + if pix.a == prev.a { + // Delta + d := pix.rgb - prev.rgb + + // DIFF, biased and modulo 256 + _d := d + 2 + + // LUMA, biased and modulo 256 + _l := RGB_Pixel{ d.r - d.g + 8, d.g + 32, d.b - d.g + 8 } + + if _d.r < 4 && _d.g < 4 && _d.b < 4 { + // Delta is between -2 and 1 inclusive + output.buf[written] = u8(QOI_Opcode_Tag.DIFF) | _d.r << 4 | _d.g << 2 | _d.b + written += 1 + } else if _l.r < 16 && _l.g < 64 && _l.b < 16 { + // Biased luma is between {-8..7, -32..31, -8..7} + output.buf[written ] = u8(QOI_Opcode_Tag.LUMA) | _l.g + output.buf[written + 1] = _l.r << 4 | _l.b + written += 2 + } else { + // Write RGB literal + output.buf[written] = u8(QOI_Opcode_Tag.RGB) + pix_bytes := transmute([4]u8)pix + copy(output.buf[written + 1:], pix_bytes[:3]) + written += 4 + } + } else { + // Write RGBA literal + output.buf[written] = u8(QOI_Opcode_Tag.RGBA) + pix_bytes := transmute([4]u8)pix + copy(output.buf[written + 1:], pix_bytes[:]) + written += 5 + } + } + } + prev = pix + } + + trailer := []u8{0, 0, 0, 0, 0, 0, 0, 1} + copy(output.buf[written:], trailer[:]) + written += len(trailer) + + resize(&output.buf, written) + return nil +} + +save_to_file :: proc(output: string, img: ^Image, options := Options{}, allocator := context.allocator) -> (err: Error) { + context.allocator = allocator + + out := &bytes.Buffer{} + defer bytes.buffer_destroy(out) + + save_to_memory(out, img, options) or_return + write_ok := os.write_entire_file(output, out.buf[:]) + + return nil if write_ok else General.Cannot_Open_File +} + +save :: proc{save_to_memory, save_to_file} + +load_from_slice :: proc(slice: []u8, options := Options{}, allocator := context.allocator) -> (img: ^Image, err: Error) { + ctx := &compress.Context_Memory_Input{ + input_data = slice, + } + + img, err = load_from_context(ctx, options, allocator) + return img, err +} + +load_from_file :: proc(filename: string, options := Options{}, allocator := context.allocator) -> (img: ^Image, err: Error) { + context.allocator = allocator + + data, ok := os.read_entire_file(filename) + defer delete(data) + + if ok { + return load_from_slice(data, options) + } else { + img = new(Image) + return img, compress.General_Error.File_Not_Found + } +} + +@(optimization_mode="speed") +load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.allocator) -> (img: ^Image, err: Error) { + context.allocator = allocator + options := options + + if .alpha_drop_if_present in options || .alpha_premultiply in options { + // TODO: Implement. + // As stated in image/common, unimplemented options are ignored. + } + + if .info in options { + options |= {.return_metadata, .do_not_decompress_image} + options -= {.info} + } + + if .return_header in options && .return_metadata in options { + options -= {.return_header} + } + + header := image.read_data(ctx, image.QOI_Header) or_return + if header.magic != image.QOI_Magic { + return img, .Invalid_QOI_Signature + } + + if img == nil { + img = new(Image) + } + + if .return_metadata in options { + info := new(image.QOI_Info) + info.header = header + img.metadata = info + } + + if header.channels != 3 && header.channels != 4 { + return img, .Invalid_Number_Of_Channels + } + + if header.color_space != .sRGB && header.color_space != .Linear { + return img, .Invalid_Color_Space + } + + if header.width == 0 || header.height == 0 { + return img, .Invalid_Image_Dimensions + } + + total_pixels := header.width * header.height + if total_pixels > image.MAX_DIMENSIONS { + return img, .Image_Dimensions_Too_Large + } + + img.width = int(header.width) + img.height = int(header.height) + img.channels = 4 + img.depth = 8 + + if .do_not_decompress_image in options { + return + } + + bytes_needed := image.compute_buffer_size(int(header.width), int(header.height), 4, 8) + + if !resize(&img.pixels.buf, bytes_needed) { + return img, mem.Allocator_Error.Out_Of_Memory + } + pixels := mem.slice_data_cast([]RGBA_Pixel, img.pixels.buf[:]) + + /* + Decode loop starts here. + */ + seen: [64]RGBA_Pixel + pix := RGBA_Pixel{0, 0, 0, 255} + seen[qoi_hash(pix)] = pix + + decode: for len(pixels) > 0 { + data := image.read_u8(ctx) or_return + + tag := QOI_Opcode_Tag(data) + #partial switch tag { + case .RGB: + pix.rgb = image.read_data(ctx, RGB_Pixel) or_return + + #no_bounds_check { + seen[qoi_hash(pix)] = pix + } + + case .RGBA: + pix = image.read_data(ctx, RGBA_Pixel) or_return + + #no_bounds_check { + seen[qoi_hash(pix)] = pix + } + + case: + // 2-bit tag + tag = QOI_Opcode_Tag(data & QOI_Opcode_Mask) + #partial switch tag { + case .INDEX: + pix = seen[data & 63] + + case .DIFF: + diff_r := ((data >> 4) & 3) - 2 + diff_g := ((data >> 2) & 3) - 2 + diff_b := ((data >> 0) & 3) - 2 + + pix += {diff_r, diff_g, diff_b, 0} + + #no_bounds_check { + seen[qoi_hash(pix)] = pix + } + + case .LUMA: + data2 := image.read_u8(ctx) or_return + + diff_g := (data & 63) - 32 + diff_r := diff_g - 8 + ((data2 >> 4) & 15) + diff_b := diff_g - 8 + (data2 & 15) + + pix += {diff_r, diff_g, diff_b, 0} + + #no_bounds_check { + seen[qoi_hash(pix)] = pix + } + + case .RUN: + if length := int(data & 63) + 1; length > len(pixels) { + return img, .Corrupt + } else { + #no_bounds_check for i in 0.. (index: u8) { + i1 := u16(pixel.r) * 3 + i2 := u16(pixel.g) * 5 + i3 := u16(pixel.b) * 7 + i4 := u16(pixel.a) * 11 + + return u8((i1 + i2 + i3 + i4) & 63) +} \ No newline at end of file diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index 52005d915..38291db6b 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -1500,7 +1500,7 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { passed &= dims_pass hash := hash.crc32(pixels) - error = fmt.tprintf("%v test %v hash is %08x, expected %08x.", file.file, count, hash, test.hash) + error = fmt.tprintf("%v test %v hash is %08x, expected %08x with %v.", file.file, count, hash, test.hash, test.options) expect(t, test.hash == hash, error) passed &= test.hash == hash From ab9457346d2eefb63a30993701377eb0ecb108ab Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 12 Apr 2022 18:26:10 +0200 Subject: [PATCH 021/245] [PNG] Remove debug printf. --- core/image/png/png.odin | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/image/png/png.odin b/core/image/png/png.odin index 55d69e7c7..ba888cb78 100644 --- a/core/image/png/png.odin +++ b/core/image/png/png.odin @@ -25,9 +25,6 @@ import "core:io" import "core:mem" import "core:intrinsics" -import "core:fmt" - - // Limit chunk sizes. // By default: IDAT = 8k x 8k x 16-bits + 8k filter bytes. // The total number of pixels defaults to 64 Megapixel and can be tuned in image/common.odin. @@ -600,16 +597,13 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a if .Paletted in header.color_type { if len(c.data) > 256 { - fmt.printf("[PLTE] tRNS length: %v\n", len(c.data)) return img, .TNRS_Invalid_Length } } else if .Color in header.color_type { if len(c.data) != 6 { - fmt.printf("[COLOR] tRNS length: %v\n", len(c.data)) return img, .TNRS_Invalid_Length } } else if len(c.data) != 2 { - fmt.printf("[GRAY] tRNS length: %v\n", len(c.data)) return img, .TNRS_Invalid_Length } From bf712e93557cd4f05433c00bb7a61dc48621b404 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 12 Apr 2022 19:23:48 +0200 Subject: [PATCH 022/245] [QOI] Add support for RGB images (previously loader always output RGBA). Also add QOI to CI test suite by roundtripping 8-bit RGB(A) through QOI and checking the hashes match. --- core/image/qoi/qoi.odin | 29 ++++++++++++----------- tests/core/image/test_core_image.odin | 34 +++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/core/image/qoi/qoi.odin b/core/image/qoi/qoi.odin index c157e8099..fdbaab686 100644 --- a/core/image/qoi/qoi.odin +++ b/core/image/qoi/qoi.odin @@ -210,11 +210,6 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a context.allocator = allocator options := options - if .alpha_drop_if_present in options || .alpha_premultiply in options { - // TODO: Implement. - // As stated in image/common, unimplemented options are ignored. - } - if .info in options { options |= {.return_metadata, .do_not_decompress_image} options -= {.info} @@ -258,19 +253,19 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a img.width = int(header.width) img.height = int(header.height) - img.channels = 4 + img.channels = 4 if .alpha_add_if_missing in options else int(header.channels) img.depth = 8 if .do_not_decompress_image in options { + img.channels = int(header.channels) return } - bytes_needed := image.compute_buffer_size(int(header.width), int(header.height), 4, 8) + bytes_needed := image.compute_buffer_size(int(header.width), int(header.height), img.channels, 8) if !resize(&img.pixels.buf, bytes_needed) { return img, mem.Allocator_Error.Out_Of_Memory } - pixels := mem.slice_data_cast([]RGBA_Pixel, img.pixels.buf[:]) /* Decode loop starts here. @@ -278,6 +273,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a seen: [64]RGBA_Pixel pix := RGBA_Pixel{0, 0, 0, 255} seen[qoi_hash(pix)] = pix + pixels := img.pixels.buf[:] decode: for len(pixels) > 0 { data := image.read_u8(ctx) or_return @@ -330,13 +326,13 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a } case .RUN: - if length := int(data & 63) + 1; length > len(pixels) { + if length := int(data & 63) + 1; (length * img.channels) > len(pixels) { return img, .Corrupt } else { - #no_bounds_check for i in 0.. (subtotal: int) { passed &= dims_pass - hash := hash.crc32(pixels) - error = fmt.tprintf("%v test %v hash is %08x, expected %08x with %v.", file.file, count, hash, test.hash, test.options) - expect(t, test.hash == hash, error) + png_hash := hash.crc32(pixels) + error = fmt.tprintf("%v test %v hash is %08x, expected %08x with %v.", file.file, count, png_hash, test.hash, test.options) + expect(t, test.hash == png_hash, error) + + passed &= test.hash == png_hash + + // Roundtrip through QOI to test the QOI encoder and decoder. + if passed && img.depth == 8 && (img.channels == 3 || img.channels == 4) { + qoi_buffer: bytes.Buffer + defer bytes.buffer_destroy(&qoi_buffer) + qoi_save_err := qoi.save(&qoi_buffer, img) + + error = fmt.tprintf("%v test %v QOI save failed with %v.", file.file, count, qoi_save_err) + expect(t, qoi_save_err == nil, error) + + if qoi_save_err == nil { + qoi_img, qoi_load_err := qoi.load(qoi_buffer.buf[:]) + defer qoi.destroy(qoi_img) + + error = fmt.tprintf("%v test %v QOI load failed with %v.", file.file, count, qoi_load_err) + expect(t, qoi_load_err == nil, error) + + qoi_hash := hash.crc32(qoi_img.pixels.buf[:]) + error = fmt.tprintf("%v test %v QOI load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, qoi_hash, png_hash, test.options) + expect(t, qoi_hash == png_hash, error) + } + } - passed &= test.hash == hash if .return_metadata in test.options { if v, ok := img.metadata.(^image.PNG_Info); ok { From 8310436350e7d2104c5b94c6f3909f9f517df502 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 13 Apr 2022 00:03:36 +0200 Subject: [PATCH 023/245] [varint] Clear up doc.odin. --- core/encoding/varint/doc.odin | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/core/encoding/varint/doc.odin b/core/encoding/varint/doc.odin index dd068b261..5e4708a59 100644 --- a/core/encoding/varint/doc.odin +++ b/core/encoding/varint/doc.odin @@ -4,24 +4,25 @@ Author of this Odin package: Jeroen van Rijn Example: - ```odin - import "core:encoding/varint" - import "core:fmt" + ```odin + import "core:encoding/varint" + import "core:fmt" - main :: proc() { - buf: [varint.LEB128_MAX_BYTES]u8 + main :: proc() { + buf: [varint.LEB128_MAX_BYTES]u8 - value := u128(42) + value := u128(42) - encode_size, encode_err := varint.encode_uleb128(buf[:], value) - assert(encode_size == 1 && encode_err == .None) + encode_size, encode_err := varint.encode_uleb128(buf[:], value) + assert(encode_size == 1 && encode_err == .None) - fmt.println(buf[:encode_size]) + fmt.printf("Encoded as %v\n", buf[:encode_size]) + decoded_val, decode_size, decode_err := varint.decode_uleb128(buf[:]) - decoded_val, decode_size, decode_err := varint.decode_uleb128(buf[:encode_size]) - assert(decoded_val == value && decode_size == encode_size && decode_err == .None) - } - ``` + assert(decoded_val == value && decode_size == encode_size && decode_err == .None) + fmt.printf("Decoded as %v, using %v byte%v\n", decoded_val, decode_size, "" if decode_size == 1 else "s") + } + ``` */ package varint \ No newline at end of file From a040be957ff3db94a1f35f73d4fc1b207ec1c526 Mon Sep 17 00:00:00 2001 From: Andrea Piseri Date: Wed, 13 Apr 2022 10:55:16 +0200 Subject: [PATCH 024/245] Fix tail recursion in `_quick_sort_general` The `if` statement should have been a `for` loop, in order to allow recursively sorting the subarrays with quicksort, and not resort to shell sort after one step. --- core/slice/sort_private.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/slice/sort_private.odin b/core/slice/sort_private.odin index 7abd2f1ce..d93d74bf9 100644 --- a/core/slice/sort_private.odin +++ b/core/slice/sort_private.odin @@ -150,7 +150,7 @@ _quick_sort_general :: proc(data: $T/[]$E, a, b, max_depth: int, call: $P, $KIND a, b, max_depth := a, b, max_depth - if b-a > 12 { // only use shell sort for lengths <= 12 + for b-a > 12 { // only use shell sort for lengths <= 12 if max_depth == 0 { heap_sort(data, a, b, call) return From 51db46551edb16eaa1396bbc3d8374dc1500154e Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 14 Apr 2022 15:03:47 +0100 Subject: [PATCH 025/245] Add MetalKit; Add NSApplication NSMenu NSMenuItem; Improve Metal classes --- vendor/darwin/Foundation/NSApplication.odin | 95 +++++++ vendor/darwin/Foundation/NSMenu.odin | 103 ++++++++ vendor/darwin/Foundation/NSNumber.odin | 6 +- vendor/darwin/Foundation/NSObject.odin | 5 +- vendor/darwin/Foundation/NSString.odin | 4 + vendor/darwin/Foundation/NSTypes.odin | 7 + vendor/darwin/Foundation/NSWindow.odin | 87 ++++++- vendor/darwin/Foundation/objc.odin | 73 ++++++ vendor/darwin/Metal/MetalClasses.odin | 14 +- vendor/darwin/MetalKit/MetalKit.odin | 259 ++++++++++++++++++++ 10 files changed, 637 insertions(+), 16 deletions(-) create mode 100644 vendor/darwin/Foundation/NSApplication.odin create mode 100644 vendor/darwin/Foundation/NSMenu.odin create mode 100644 vendor/darwin/Foundation/objc.odin create mode 100644 vendor/darwin/MetalKit/MetalKit.odin diff --git a/vendor/darwin/Foundation/NSApplication.odin b/vendor/darwin/Foundation/NSApplication.odin new file mode 100644 index 000000000..2fc4e6356 --- /dev/null +++ b/vendor/darwin/Foundation/NSApplication.odin @@ -0,0 +1,95 @@ +package objc_Foundation + +import "core:intrinsics" + +ActivationPolicy :: enum UInteger { + Regular = 0, + Accessory = 1, + Prohibited = 2, +} + +ApplicationDelegate :: struct { + willFinishLaunching: proc "c" (self: ^ApplicationDelegate, notification: ^Notification), + didFinishLaunching: proc "c" (self: ^ApplicationDelegate, notification: ^Notification), + shouldTerminateAfterLastWindowClosed: proc "c" (self: ^ApplicationDelegate, sender: ^Application), + + user_data: rawptr, +} + +@(objc_class="NSApplication") +Application :: struct {using _: Object} + +@(objc_type=Application, objc_name="sharedApplication", objc_is_class_method=true) +Application_sharedApplication :: proc() -> ^Application { + return msgSend(^Application, Application, "sharedApplication") +} + +@(objc_type=Application, objc_name="setDelegate") +Application_setDelegate :: proc(self: ^Application, delegate: ^ApplicationDelegate) { + willFinishLaunching :: proc "c" (self: ^Value, _: SEL, notification: ^Notification) { + del := (^ApplicationDelegate)(self->pointerValue()) + del->willFinishLaunching(notification) + } + didFinishLaunching :: proc "c" (self: ^Value, _: SEL, notification: ^Notification) { + del := (^ApplicationDelegate)(self->pointerValue()) + del->didFinishLaunching(notification) + } + shouldTerminateAfterLastWindowClosed :: proc "c" (self: ^Value, _: SEL, application: ^Application) { + del := (^ApplicationDelegate)(self->pointerValue()) + del->shouldTerminateAfterLastWindowClosed(application) + } + + wrapper := Value.valueWithPointer(delegate) + + class_addMethod(intrinsics.objc_find_class("NSValue"), intrinsics.objc_find_selector("applicationWillFinishLaunching:"), auto_cast willFinishLaunching, "v@:@") + class_addMethod(intrinsics.objc_find_class("NSValue"), intrinsics.objc_find_selector("applicationDidFinishLaunching:"), auto_cast didFinishLaunching, "v@:@") + class_addMethod(intrinsics.objc_find_class("NSValue"), intrinsics.objc_find_selector("applicationShouldTerminateAfterLastWindowClosed:"), auto_cast shouldTerminateAfterLastWindowClosed, "B@:@") + + msgSend(nil, self, "setDelegate:", wrapper) +} + +@(objc_type=Application, objc_name="setActivationPolicy") +Application_setActivationPolicy :: proc(self: ^Application, activationPolicy: ActivationPolicy) -> BOOL { + return msgSend(BOOL, self, "setActivationPolicy:", activationPolicy) +} + +@(objc_type=Application, objc_name="activateIgnoringOtherApps") +Application_activateIgnoringOtherApps :: proc(self: ^Application, ignoreOtherApps: BOOL) { + msgSend(nil, self, "activateIgnoringOtherApps:", ignoreOtherApps) +} + +@(objc_type=Application, objc_name="setMainMenu") +Application_setMainMenu :: proc(self: ^Application, menu: ^Menu) { + msgSend(nil, self, "setMainMenu:", menu) +} + +@(objc_type=Application, objc_name="windows") +Application_windows :: proc(self: ^Application) -> ^Array { + return msgSend(^Array, self, "windows") +} + +@(objc_type=Application, objc_name="run") +Application_run :: proc(self: ^Application) { + msgSend(nil, self, "run") +} + + +@(objc_type=Application, objc_name="terminate") +Application_terminate :: proc(self: ^Application, sender: ^Object) { + msgSend(nil, self, "terminate:", sender) +} + + + +@(objc_class="NSRunningApplication") +RunningApplication :: struct {using _: Object} + +@(objc_type=RunningApplication, objc_name="currentApplication", objc_is_class_method=true) +RunningApplication_currentApplication :: proc() -> ^RunningApplication { + return msgSend(^RunningApplication, RunningApplication, "currentApplication") +} + +@(objc_type=RunningApplication, objc_name="localizedName") +RunningApplication_localizedName :: proc(self: ^RunningApplication) -> ^String { + return msgSend(^String, self, "localizedName") +} \ No newline at end of file diff --git a/vendor/darwin/Foundation/NSMenu.odin b/vendor/darwin/Foundation/NSMenu.odin new file mode 100644 index 000000000..964e3061d --- /dev/null +++ b/vendor/darwin/Foundation/NSMenu.odin @@ -0,0 +1,103 @@ +package objc_Foundation + +import "core:builtin" +import "core:intrinsics" + +KeyEquivalentModifierFlag :: enum UInteger { + CapsLock = 16, // Set if Caps Lock key is pressed. + Shift = 17, // Set if Shift key is pressed. + Control = 18, // Set if Control key is pressed. + Option = 19, // Set if Option or Alternate key is pressed. + Command = 20, // Set if Command key is pressed. + NumericPad = 21, // Set if any key in the numeric keypad is pressed. + Help = 22, // Set if the Help key is pressed. + Function = 23, // Set if any function key is pressed. +} +KeyEquivalentModifierMask :: distinct bit_set[KeyEquivalentModifierFlag; UInteger] + +// Used to retrieve only the device-independent modifier flags, allowing applications to mask off the device-dependent modifier flags, including event coalescing information. +KeyEventModifierFlagDeviceIndependentFlagsMask := transmute(KeyEquivalentModifierMask)_KeyEventModifierFlagDeviceIndependentFlagsMask +@(private) _KeyEventModifierFlagDeviceIndependentFlagsMask := UInteger(0xffff0000) + + +MenuItemCallback :: proc "c" (unused: rawptr, name: SEL, sender: ^Object) + + +@(objc_class="NSMenuItem") +MenuItem :: struct {using _: Object} + +@(objc_type=MenuItem, objc_name="alloc", objc_is_class_method=true) +MenuItem_alloc :: proc() -> ^MenuItem { + return msgSend(^MenuItem, MenuItem, "alloc") +} +@(objc_type=MenuItem, objc_name="registerActionCallback", objc_is_class_method=true) +MenuItem_registerActionCallback :: proc(name: cstring, callback: MenuItemCallback) -> SEL { + s := string(name) + n := len(s) + sel: SEL + if n > 0 && s[n-1] != ':' { + col_name := intrinsics.alloca(n+2, 1) + builtin.copy(col_name[:n], s) + col_name[n] = ':' + col_name[n+1] = 0 + sel = sel_registerName(cstring(col_name)) + } else { + sel = sel_registerName(name) + } + if callback != nil { + class_addMethod(intrinsics.objc_find_class("NSObject"), sel, auto_cast callback, "v@:@") + } + return sel +} + +@(objc_type=MenuItem, objc_name="init") +MenuItem_init :: proc(self: ^MenuItem) -> ^MenuItem { + return msgSend(^MenuItem, self, "init") +} + +@(objc_type=MenuItem, objc_name="setKeyEquivalentModifierMask") +MenuItem_setKeyEquivalentModifierMask :: proc(self: ^MenuItem, modifierMask: KeyEquivalentModifierMask) { + msgSend(nil, self, "setKeyEquivalentModifierMask:", modifierMask) +} + +@(objc_type=MenuItem, objc_name="keyEquivalentModifierMask") +MenuItem_keyEquivalentModifierMask :: proc(self: ^MenuItem) -> KeyEquivalentModifierMask { + return msgSend(KeyEquivalentModifierMask, self, "keyEquivalentModifierMask") +} + +@(objc_type=MenuItem, objc_name="setSubmenu") +MenuItem_setSubmenu :: proc(self: ^MenuItem, submenu: ^Menu) { + msgSend(nil, self, "setSubmenu:", submenu) +} + + + + +@(objc_class="NSMenu") +Menu :: struct {using _: Object} + +@(objc_type=Menu, objc_name="alloc", objc_is_class_method=true) +Menu_alloc :: proc() -> ^Menu { + return msgSend(^Menu, Menu, "alloc") +} + +@(objc_type=Menu, objc_name="init") +Menu_init :: proc(self: ^Menu) -> ^Menu { + return msgSend(^Menu, self, "init") +} + +@(objc_type=Menu, objc_name="initWithTitle") +Menu_initWithTitle :: proc(self: ^Menu, title: ^String) -> ^Menu { + return msgSend(^Menu, self, "initWithTitle:", title) +} + + +@(objc_type=Menu, objc_name="addItem") +Menu_addItem :: proc(self: ^Menu, item: ^MenuItem) { + msgSend(nil, self, "addItem:", item) +} + +@(objc_type=Menu, objc_name="addItemWithTitle") +Menu_addItemWithTitle :: proc(self: ^Menu, title: ^String, selector: SEL, keyEquivalent: ^String) -> ^MenuItem { + return msgSend(^MenuItem, self, "addItemWithTitle:action:keyEquivalent:", title, selector, keyEquivalent) +} \ No newline at end of file diff --git a/vendor/darwin/Foundation/NSNumber.odin b/vendor/darwin/Foundation/NSNumber.odin index 9201557a3..d459e673f 100644 --- a/vendor/darwin/Foundation/NSNumber.odin +++ b/vendor/darwin/Foundation/NSNumber.odin @@ -48,17 +48,17 @@ Value_getValue :: proc(self: ^Value, value: rawptr, size: UInteger) { @(objc_type=Value, objc_name="objCType") -Value_objCType :: proc(self: ^Value) -> cstring { +Value_objCType :: proc "c" (self: ^Value) -> cstring { return msgSend(cstring, self, "objCType") } @(objc_type=Value, objc_name="isEqualToValue") -Value_isEqualToValue :: proc(self, other: ^Value) -> BOOL { +Value_isEqualToValue :: proc "c" (self, other: ^Value) -> BOOL { return msgSend(BOOL, self, "isEqualToValue:", other) } @(objc_type=Value, objc_name="pointerValue") -Value_pointerValue :: proc(self: ^Value) -> rawptr { +Value_pointerValue :: proc "c" (self: ^Value) -> rawptr { return msgSend(rawptr, self, "pointerValue") } diff --git a/vendor/darwin/Foundation/NSObject.odin b/vendor/darwin/Foundation/NSObject.odin index 1ce17f2f5..6ec5939ee 100644 --- a/vendor/darwin/Foundation/NSObject.odin +++ b/vendor/darwin/Foundation/NSObject.odin @@ -53,7 +53,10 @@ autorelease :: proc(self: ^Object) { retainCount :: proc(self: ^Object) -> UInteger { return msgSend(UInteger, self, "retainCount") } - +@(objc_type=Object, objc_name="class") +class :: proc(self: ^Object) -> Class { + return msgSend(Class, self, "class") +} @(objc_type=Object, objc_name="hash") hash :: proc(self: ^Object) -> UInteger { diff --git a/vendor/darwin/Foundation/NSString.odin b/vendor/darwin/Foundation/NSString.odin index 45b5df37b..18e392415 100644 --- a/vendor/darwin/Foundation/NSString.odin +++ b/vendor/darwin/Foundation/NSString.odin @@ -49,6 +49,10 @@ StringCompareOption :: enum UInteger { unichar :: distinct u16 +@(link_prefix="NS", default_calling_convention="c") +foreign Foundation { + StringFromClass :: proc(cls: Class) -> ^String --- +} AT :: MakeConstantString MakeConstantString :: proc "c" (#const c: cstring) -> ^String { diff --git a/vendor/darwin/Foundation/NSTypes.odin b/vendor/darwin/Foundation/NSTypes.odin index 47f75630f..ef895d449 100644 --- a/vendor/darwin/Foundation/NSTypes.odin +++ b/vendor/darwin/Foundation/NSTypes.odin @@ -33,3 +33,10 @@ ComparisonResult :: enum Integer { } NotFound :: IntegerMax + +Float :: distinct (f32 when size_of(uint) == 4 else f64) + +Size :: struct { + width: Float, + height: Float, +} \ No newline at end of file diff --git a/vendor/darwin/Foundation/NSWindow.odin b/vendor/darwin/Foundation/NSWindow.odin index dec5a160c..3c7c17023 100644 --- a/vendor/darwin/Foundation/NSWindow.odin +++ b/vendor/darwin/Foundation/NSWindow.odin @@ -7,18 +7,75 @@ Rect :: struct { width, height: f64, } +WindowStyleFlag :: enum NS.UInteger { + Titled = 0, + Closable = 1, + Miniaturizable = 2, + Resizable = 3, + TexturedBackground = 8, + UnifiedTitleAndToolbar = 12, + FullScreen = 14, + FullSizeContentView = 15, + UtilityWindow = 4, + DocModalWindow = 6, + NonactivatingPanel = 7, + HUDWindow = 13, +} +WindowStyleMask :: distinct bit_set[WindowStyleFlag; NS.UInteger] +WindowStyleMaskBorderless :: WindowStyleMask{} +WindowStyleMaskTitled :: WindowStyleMask{.Titled} +WindowStyleMaskClosable :: WindowStyleMask{.Closable} +WindowStyleMaskMiniaturizable :: WindowStyleMask{.Miniaturizable} +WindowStyleMaskResizable :: WindowStyleMask{.Resizable} +WindowStyleMaskTexturedBackground :: WindowStyleMask{.TexturedBackground} +WindowStyleMaskUnifiedTitleAndToolbar :: WindowStyleMask{.UnifiedTitleAndToolbar} +WindowStyleMaskFullScreen :: WindowStyleMask{.FullScreen} +WindowStyleMaskFullSizeContentView :: WindowStyleMask{.FullSizeContentView} +WindowStyleMaskUtilityWindow :: WindowStyleMask{.UtilityWindow} +WindowStyleMaskDocModalWindow :: WindowStyleMask{.DocModalWindow} +WindowStyleMaskNonactivatingPanel :: WindowStyleMask{.NonactivatingPanel} +WindowStyleMaskHUDWindow :: WindowStyleMask{.HUDWindow} + +BackingStoreType :: enum NS.UInteger { + Retained = 0, + Nonretained = 1, + Buffered = 2, +} + @(objc_class="NSColor") Color :: struct {using _: Object} @(objc_class="CALayer") Layer :: struct { using _: NS.Object } +@(objc_type=Layer, objc_name="contentsScale") +Layer_contentsScale :: proc(self: ^Layer) -> Float { + return msgSend(Float, self, "contentsScale") +} +@(objc_type=Layer, objc_name="setContentsScale") +Layer_setContentsScale :: proc(self: ^Layer, scale: Float) { + msgSend(nil, self, "setContentsScale:", scale) +} +@(objc_type=Layer, objc_name="frame") +Layer_frame :: proc(self: ^Layer) -> Rect { + return msgSend(Rect, self, "frame") +} +@(objc_type=Layer, objc_name="addSublayer") +Layer_addSublayer :: proc(self: ^Layer, layer: ^Layer) { + msgSend(nil, self, "addSublayer:", layer) +} + @(objc_class="NSResponder") Responder :: struct {using _: Object} @(objc_class="NSView") View :: struct {using _: Responder} + +@(objc_type=View, objc_name="initWithFrame") +View_initWithFrame :: proc(self: ^View, frame: Rect) -> ^View { + return msgSend(^View, self, "initWithFrame:", frame) +} @(objc_type=View, objc_name="layer") View_layer :: proc(self: ^View) -> ^Layer { return msgSend(^Layer, self, "layer") @@ -27,10 +84,6 @@ View_layer :: proc(self: ^View) -> ^Layer { View_setLayer :: proc(self: ^View, layer: ^Layer) { msgSend(nil, self, "setLayer:", layer) } -@(objc_type=View, objc_name="setSubLayer") -View_setSubLayer :: proc(self: ^View, layer: ^Layer) { - msgSend(nil, self, "setSubLayer:", layer) -} @(objc_type=View, objc_name="wantsLayer") View_wantsLayer :: proc(self: ^View) -> BOOL { return msgSend(BOOL, self, "wantsLayer") @@ -40,14 +93,26 @@ View_setWantsLayer :: proc(self: ^View, wantsLayer: BOOL) { msgSend(nil, self, "setWantsLayer:", wantsLayer) } - @(objc_class="NSWindow") Window :: struct {using _: Responder} +@(objc_type=Window, objc_name="alloc", objc_is_class_method=true) +Window_alloc :: proc() -> ^Window { + return msgSend(^Window, Window, "alloc") +} + +@(objc_type=Window, objc_name="initWithContentRect") +Window_initWithContentRect :: proc(self: ^Window, contentRect: Rect, styleMask: WindowStyleMask, backing: BackingStoreType, doDefer: bool) -> ^Window { + return msgSend(^Window, self, "initWithContentRect:styleMask:backing:defer:", contentRect, styleMask, backing, doDefer) +} @(objc_type=Window, objc_name="contentView") Window_contentView :: proc(self: ^Window) -> ^View { return msgSend(^View, self, "contentView") } +@(objc_type=Window, objc_name="setContentView") +Window_setContentView :: proc(self: ^Window, content_view: ^View) { + msgSend(nil, self, "setContentView:", content_view) +} @(objc_type=Window, objc_name="frame") Window_frame :: proc(self: ^Window) -> Rect { return msgSend(Rect, self, "frame") @@ -72,3 +137,15 @@ Window_backgroundColor :: proc(self: ^Window) -> ^NS.Color { Window_setBackgroundColor :: proc(self: ^Window, color: ^NS.Color) { msgSend(nil, self, "setBackgroundColor:", color) } +@(objc_type=Window, objc_name="makeKeyAndOrderFront") +Window_makeKeyAndOrderFront :: proc(self: ^Window, key: ^NS.Object) { + msgSend(nil, self, "makeKeyAndOrderFront:", key) +} +@(objc_type=Window, objc_name="setTitle") +Window_setTitle :: proc(self: ^Window, title: ^NS.String) { + msgSend(nil, self, "setTitle:", title) +} +@(objc_type=Window, objc_name="close") +Window_close :: proc(self: ^Window) { + msgSend(nil, self, "close") +} \ No newline at end of file diff --git a/vendor/darwin/Foundation/objc.odin b/vendor/darwin/Foundation/objc.odin new file mode 100644 index 000000000..7db82df73 --- /dev/null +++ b/vendor/darwin/Foundation/objc.odin @@ -0,0 +1,73 @@ +package objc_Foundation + +foreign import "system:Foundation.framework" + +import "core:intrinsics" +import "core:c" + +IMP :: proc "c" (object: id, sel: SEL, #c_vararg args: ..any) -> id + +foreign Foundation { + objc_lookUpClass :: proc "c" (name: cstring) -> Class --- + sel_registerName :: proc "c" (name: cstring) -> SEL --- + objc_allocateClassPair :: proc "c" (superclass: Class, name: cstring, extraBytes: uint) --- + + class_addMethod :: proc "c" (cls: Class, name: SEL, imp: IMP, types: cstring) -> BOOL --- +} + + +@(objc_class="NSZone") +Zone :: struct {using _: Object} + +@(link_prefix="NS") +foreign Foundation { + AllocateObject :: proc "c" (aClass: Class, extraBytes: UInteger, zone: ^Zone) -> id --- + DeallocateObject :: proc "c" (object: id) --- +} + +Method :: ^objc_method +objc_method :: struct { + method_name: SEL, + method_types: cstring, + method_imp: IMP, +} +objc_method_list :: struct {} + +objc_ivar :: struct {} +objc_ivar_list :: struct {} + +objc_cache :: struct { + mask: u32, + occupied: u32, + buckets: [1]Method, +} + +objc_protocol_list :: struct { + next: ^objc_protocol_list, + count: c.int, + list: [1]^Protocol, +} + +@(objc_class="Protocol") +Protocol :: struct{using _: intrinsics.objc_object} + +objc_object_internals :: struct { + isa: ^objc_class_internals, +} + + +objc_class_internals :: struct { + isa: Class, + super_class: Class, + name: cstring, + version: c.long, + info: c.long, + instance_size: c.long, + ivars: ^objc_ivar_list, + + methodLists: ^^objc_method_list, + + cache: rawptr, + protocols: rawptr, + +} \ No newline at end of file diff --git a/vendor/darwin/Metal/MetalClasses.odin b/vendor/darwin/Metal/MetalClasses.odin index 56d40f5f2..29653f015 100644 --- a/vendor/darwin/Metal/MetalClasses.odin +++ b/vendor/darwin/Metal/MetalClasses.odin @@ -4474,16 +4474,16 @@ TextureDescriptor_storageMode :: #force_inline proc(self: ^TextureDescriptor) -> TextureDescriptor_swizzle :: #force_inline proc(self: ^TextureDescriptor) -> TextureSwizzleChannels { return msgSend(TextureSwizzleChannels, self, "swizzle") } -@(objc_type=TextureDescriptor, objc_name="texture2DDescriptor", objc_is_class_method=true) -TextureDescriptor_texture2DDescriptor :: #force_inline proc(pixelFormat: PixelFormat, width: NS.UInteger, height: NS.UInteger, mipmapped: BOOL) -> ^TextureDescriptor { +@(objc_type=TextureDescriptor, objc_name="texture2DDescriptorWithPixelFormat", objc_is_class_method=true) +TextureDescriptor_texture2DDescriptorWithPixelFormat :: #force_inline proc(pixelFormat: PixelFormat, width: NS.UInteger, height: NS.UInteger, mipmapped: BOOL) -> ^TextureDescriptor { return msgSend(^TextureDescriptor, TextureDescriptor, "texture2DDescriptorWithPixelFormat:width:height:mipmapped:", pixelFormat, width, height, mipmapped) } -@(objc_type=TextureDescriptor, objc_name="textureBufferDescriptor", objc_is_class_method=true) -TextureDescriptor_textureBufferDescriptor :: #force_inline proc(pixelFormat: PixelFormat, width: NS.UInteger, resourceOptions: ResourceOptions, usage: TextureUsage) -> ^TextureDescriptor { +@(objc_type=TextureDescriptor, objc_name="textureBufferDescriptorWithPixelFormat", objc_is_class_method=true) +TextureDescriptor_textureBufferDescriptorWithPixelFormat :: #force_inline proc(pixelFormat: PixelFormat, width: NS.UInteger, resourceOptions: ResourceOptions, usage: TextureUsage) -> ^TextureDescriptor { return msgSend(^TextureDescriptor, TextureDescriptor, "textureBufferDescriptorWithPixelFormat:width:resourceOptions:usage:", pixelFormat, width, resourceOptions, usage) } -@(objc_type=TextureDescriptor, objc_name="textureCubeDescriptor", objc_is_class_method=true) -TextureDescriptor_textureCubeDescriptor :: #force_inline proc(pixelFormat: PixelFormat, size: NS.UInteger, mipmapped: BOOL) -> ^TextureDescriptor { +@(objc_type=TextureDescriptor, objc_name="textureCubeDescriptorWithPixelFormat", objc_is_class_method=true) +TextureDescriptor_textureCubeDescriptorWithPixelFormat :: #force_inline proc(pixelFormat: PixelFormat, size: NS.UInteger, mipmapped: BOOL) -> ^TextureDescriptor { return msgSend(^TextureDescriptor, TextureDescriptor, "textureCubeDescriptorWithPixelFormat:size:mipmapped:", pixelFormat, size, mipmapped) } @(objc_type=TextureDescriptor, objc_name="textureType") @@ -7683,7 +7683,7 @@ RenderCommandEncoder_drawPrimitivesWithInstanceCount :: #force_inline proc(self: msgSend(nil, self, "drawPrimitives:vertexStart:vertexCount:instanceCount:", primitiveType, vertexStart, vertexCount, instanceCount) } @(objc_type=RenderCommandEncoder, objc_name="drawPrimitivesWithInstances") -RenderCommandEncoder_drawPrimitivesWithInstance :: #force_inline proc(self: ^RenderCommandEncoder, primitiveType: PrimitiveType, vertexStart: NS.UInteger, vertexCount: NS.UInteger, instanceCount: NS.UInteger, baseInstance: NS.UInteger) { +RenderCommandEncoder_drawPrimitivesWithInstances :: #force_inline proc(self: ^RenderCommandEncoder, primitiveType: PrimitiveType, vertexStart: NS.UInteger, vertexCount: NS.UInteger, instanceCount: NS.UInteger, baseInstance: NS.UInteger) { msgSend(nil, self, "drawPrimitives:vertexStart:vertexCount:instanceCount:baseInstance:", primitiveType, vertexStart, vertexCount, instanceCount, baseInstance) } @(objc_type=RenderCommandEncoder, objc_name="executeCommandsInBuffer") diff --git a/vendor/darwin/MetalKit/MetalKit.odin b/vendor/darwin/MetalKit/MetalKit.odin new file mode 100644 index 000000000..90d147983 --- /dev/null +++ b/vendor/darwin/MetalKit/MetalKit.odin @@ -0,0 +1,259 @@ +package objc_MetalKit + +import NS "vendor:darwin/Foundation" +import MTL "vendor:darwin/Metal" +import CA "vendor:darwin/QuartzCore" +import "core:intrinsics" + +@(require) +foreign import "system:MetalKit.framework" + +@(private) +msgSend :: intrinsics.objc_send + +ColorSpaceRef :: struct {} + +ViewDelegate :: struct { + drawInMTKView: proc "c" (self: ^ViewDelegate, view: ^View), + drawableSizeWillChange: proc "c" (self: ^ViewDelegate, view: ^View, size: NS.Size), + + user_data: rawptr, +} + +@(objc_class="MTKView") +View :: struct {using _: NS.View} + +@(objc_type=View, objc_name="alloc", objc_is_class_method=true) +View_alloc :: proc() -> ^View { + return msgSend(^View, View, "alloc") +} +@(objc_type=View, objc_name="initWithFrame") +View_initWithFrame :: proc(self: ^View, frame: NS.Rect, device: ^MTL.Device) -> ^View { + return msgSend(^View, self, "initWithFrame:device:", frame, device) +} +@(objc_type=View, objc_name="initWithCoder") +View_initWithCoder :: proc(self: ^View, coder: ^NS.Coder) -> ^View { + return msgSend(^View, self, "initWithCoder:", coder) +} + +@(objc_type=View, objc_name="setDevice") +View_setDevice :: proc(self: ^View, device: ^MTL.Device) { + msgSend(nil, self, "setDevice:", device) +} +@(objc_type=View, objc_name="device") +View_device :: proc(self: ^View) -> ^MTL.Device { + return msgSend(^MTL.Device, self, "device") +} + +@(objc_type=View, objc_name="draw") +View_draw :: proc(self: ^View) { + msgSend(nil, self, "draw") +} + +@(objc_type=View, objc_name="setDelegate") +View_setDelegate :: proc(self: ^View, delegate: ^ViewDelegate) { + drawDispatch :: proc "c" (self: ^NS.Value, cmd: NS.SEL, view: ^View) { + del := (^ViewDelegate)(self->pointerValue()) + del->drawInMTKView(view) + } + drawableSizeWillChange :: proc "c" (self: ^NS.Value, cmd: NS.SEL, view: ^View, size: NS.Size) { + del := (^ViewDelegate)(self->pointerValue()) + del->drawableSizeWillChange(view, size) + } + + wrapper := NS.Value.valueWithPointer(delegate) + + NS.class_addMethod(intrinsics.objc_find_class("NSValue"), intrinsics.objc_find_selector("drawInMTKView:"), auto_cast drawDispatch, "v@:@") + + cbparams :: "v@:@{CGSize=ff}" when size_of(NS.Float) == size_of(f32) else "v@:@{CGSize=dd}" + NS.class_addMethod(intrinsics.objc_find_class("NSValue"), intrinsics.objc_find_selector("mtkView:drawableSizeWillChange:"), auto_cast drawableSizeWillChange, cbparams) + + msgSend(nil, self, "setDelegate:", wrapper) +} + +@(objc_type=View, objc_name="delegate") +View_delegate :: proc(self: ^View) -> ^ViewDelegate { + wrapper := msgSend(^NS.Value, self, "delegate") + if wrapper != nil { + return (^ViewDelegate)(wrapper->pointerValue()) + } + return nil +} + +@(objc_type=View, objc_name="currentDrawable") +View_currentDrawable :: proc(self: ^View) -> ^CA.MetalDrawable { + return msgSend(^CA.MetalDrawable, self, "currentDrawable") +} + +@(objc_type=View, objc_name="setFramebufferOnly") +View_setFramebufferOnly :: proc(self: ^View, framebufferOnly: bool) { + msgSend(nil, self, "setFramebufferOnly:", framebufferOnly) +} +@(objc_type=View, objc_name="framebufferOnly") +View_framebufferOnly :: proc(self: ^View) -> bool { + return msgSend(bool, self, "framebufferOnly") +} + +@(objc_type=View, objc_name="setDepthStencilAttachmentTextureUsage") +View_setDepthStencilAttachmentTextureUsage :: proc(self: ^View, textureUsage: MTL.TextureUsage) { + msgSend(nil, self, "setDepthStencilAttachmentTextureUsage:", textureUsage) +} +@(objc_type=View, objc_name="depthStencilAttachmentTextureUsage") +View_depthStencilAttachmentTextureUsage :: proc(self: ^View) -> MTL.TextureUsage { + return msgSend(MTL.TextureUsage, self, "depthStencilAttachmentTextureUsage") +} + +@(objc_type=View, objc_name="setMultisampleColorAttachmentTextureUsage") +View_setMultisampleColorAttachmentTextureUsage :: proc(self: ^View, textureUsage: MTL.TextureUsage) { + msgSend(nil, self, "setMultisampleColorAttachmentTextureUsage:", textureUsage) +} +@(objc_type=View, objc_name="multisampleColorAttachmentTextureUsage") +View_multisampleColorAttachmentTextureUsage :: proc(self: ^View) -> MTL.TextureUsage { + return msgSend(MTL.TextureUsage, self, "multisampleColorAttachmentTextureUsage") +} + +@(objc_type=View, objc_name="setPresentsWithTransaction") +View_setPresentsWithTransaction :: proc(self: ^View, presentsWithTransaction: bool) { + msgSend(nil, self, "setPresentsWithTransaction:", presentsWithTransaction) +} +@(objc_type=View, objc_name="presentsWithTransaction") +View_presentsWithTransaction :: proc(self: ^View) -> bool { + return msgSend(bool, self, "presentsWithTransaction") +} + +@(objc_type=View, objc_name="setColorPixelFormat") +View_setColorPixelFormat :: proc(self: ^View, colorPixelFormat: MTL.PixelFormat) { + msgSend(nil, self, "setColorPixelFormat:", colorPixelFormat) +} +@(objc_type=View, objc_name="colorPixelFormat") +View_colorPixelFormat :: proc(self: ^View) -> MTL.PixelFormat { + return msgSend(MTL.PixelFormat, self, "colorPixelFormat") +} + +@(objc_type=View, objc_name="setDepthStencilPixelFormat") +View_setDepthStencilPixelFormat :: proc(self: ^View, colorPixelFormat: MTL.PixelFormat) { + msgSend(nil, self, "setDepthStencilPixelFormat:", colorPixelFormat) +} +@(objc_type=View, objc_name="depthStencilPixelFormat") +View_depthStencilPixelFormat :: proc(self: ^View) -> MTL.PixelFormat { + return msgSend(MTL.PixelFormat, self, "depthStencilPixelFormat") +} + +@(objc_type=View, objc_name="setSampleCount") +View_setSampleCount :: proc(self: ^View, sampleCount: NS.UInteger) { + msgSend(nil, self, "setSampleCount:", sampleCount) +} +@(objc_type=View, objc_name="sampleCount") +View_sampleCount :: proc(self: ^View) -> NS.UInteger { + return msgSend(NS.UInteger, self, "sampleCount") +} + +@(objc_type=View, objc_name="setClearColor") +View_setClearColor :: proc(self: ^View, clearColor: MTL.ClearColor) { + msgSend(nil, self, "setClearColor:", clearColor) +} +@(objc_type=View, objc_name="clearColor") +View_clearColor :: proc(self: ^View) -> MTL.ClearColor { + return msgSend(MTL.ClearColor, self, "clearColor") +} + +@(objc_type=View, objc_name="setClearDepth") +View_setClearDepth :: proc(self: ^View, clearDepth: f64) { + msgSend(nil, self, "setClearDepth:", clearDepth) +} +@(objc_type=View, objc_name="clearDepth") +View_clearDepth :: proc(self: ^View) -> f64 { + return msgSend(f64, self, "clearDepth") +} + +@(objc_type=View, objc_name="setClearStencil") +View_setClearStencil :: proc(self: ^View, clearStencil: u32) { + msgSend(nil, self, "setClearStencil:", clearStencil) +} +@(objc_type=View, objc_name="clearStencil") +View_clearStencil :: proc(self: ^View) -> u32 { + return msgSend(u32, self, "clearStencil") +} + +@(objc_type=View, objc_name="depthStencilTexture") +View_depthStencilTexture :: proc(self: ^View) -> ^MTL.Texture { + return msgSend(^MTL.Texture, self, "depthStencilTexture") +} +@(objc_type=View, objc_name="multisampleColorTexture") +View_multisampleColorTexture :: proc(self: ^View) -> ^MTL.Texture { + return msgSend(^MTL.Texture, self, "multisampleColorTexture") +} + +@(objc_type=View, objc_name="releaseDrawables") +View_releaseDrawables :: proc(self: ^View) { + msgSend(nil, self, "releaseDrawables") +} + +@(objc_type=View, objc_name="currentRenderPassDescriptor") +View_currentRenderPassDescriptor :: proc(self: ^View) -> ^MTL.RenderPassDescriptor { + return msgSend(^MTL.RenderPassDescriptor, self, "currentRenderPassDescriptor") +} + +@(objc_type=View, objc_name="setPreferredFramesPerSecond") +View_setPreferredFramesPerSecond :: proc(self: ^View, preferredFramesPerSecond: NS.Integer) { + msgSend(nil, self, "setPreferredFramesPerSecond:", preferredFramesPerSecond) +} +@(objc_type=View, objc_name="preferredFramesPerSecond") +View_preferredFramesPerSecond :: proc(self: ^View) -> NS.Integer { + return msgSend(NS.Integer, self, "preferredFramesPerSecond") +} + +@(objc_type=View, objc_name="setEnableSetNeedsDisplay") +View_setEnableSetNeedsDisplay :: proc(self: ^View, enableSetNeedsDisplay: bool) { + msgSend(nil, self, "setEnableSetNeedsDisplay:", enableSetNeedsDisplay) +} +@(objc_type=View, objc_name="enableSetNeedsDisplay") +View_enableSetNeedsDisplay :: proc(self: ^View) -> bool { + return msgSend(bool, self, "enableSetNeedsDisplay") +} + +@(objc_type=View, objc_name="setAutoresizeDrawable") +View_setAutoresizeDrawable :: proc(self: ^View, autoresizeDrawable: bool) { + msgSend(nil, self, "setAutoresizeDrawable:", autoresizeDrawable) +} +@(objc_type=View, objc_name="autoresizeDrawable") +View_autoresizeDrawable :: proc(self: ^View) -> bool { + return msgSend(bool, self, "autoresizeDrawable") +} + +@(objc_type=View, objc_name="setDrawableSize") +View_setDrawableSize :: proc(self: ^View, drawableSize: NS.Size) { + msgSend(nil, self, "setDrawableSize:", drawableSize) +} +@(objc_type=View, objc_name="drawableSize") +View_drawableSize :: proc(self: ^View) -> NS.Size { + return msgSend(NS.Size, self, "drawableSize") +} + +@(objc_type=View, objc_name="preferredDrawableSize") +View_preferredDrawableSize :: proc(self: ^View) -> NS.Size { + return msgSend(NS.Size, self, "preferredDrawableSize") +} + +@(objc_type=View, objc_name="preferredDevice") +View_preferredDevice :: proc(self: ^View) -> ^MTL.Device { + return msgSend(^MTL.Device, self, "preferredDevice") +} + +@(objc_type=View, objc_name="setPaused") +View_setPaused :: proc(self: ^View, isPaused: bool) { + msgSend(nil, self, "setPaused:", isPaused) +} +@(objc_type=View, objc_name="isPaused") +View_isPaused :: proc(self: ^View) -> bool { + return msgSend(bool, self, "isPaused") +} + +@(objc_type=View, objc_name="setColorSpace") +View_setColorSpace :: proc(self: ^View, colorSpace: ColorSpaceRef) { + msgSend(nil, self, "setColorSpace:", colorSpace) +} +@(objc_type=View, objc_name="colorSpace") +View_colorSpace :: proc(self: ^View) -> ColorSpaceRef { + return msgSend(ColorSpaceRef, self, "colorSpace") +} From 8a9f7fc684b39c803cab184344a8a017308ed63a Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 14 Apr 2022 15:09:03 +0100 Subject: [PATCH 026/245] Fix #1713 --- src/check_expr.cpp | 5 ++++- src/exact_value.cpp | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/check_expr.cpp b/src/check_expr.cpp index dcf17af39..336a711d4 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -8161,7 +8161,10 @@ ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *node, Type * case Type_Basic: { if (!is_type_any(t)) { if (cl->elems.count != 0) { - error(node, "Illegal compound literal"); + gbString s = type_to_string(t); + error(node, "Illegal compound literal, %s cannot be used as a compound literal with fields", s); + gb_string_free(s); + is_constant = false; } break; } diff --git a/src/exact_value.cpp b/src/exact_value.cpp index f6df48951..cedef48c4 100644 --- a/src/exact_value.cpp +++ b/src/exact_value.cpp @@ -591,6 +591,7 @@ failure: i32 exact_value_order(ExactValue const &v) { switch (v.kind) { case ExactValue_Invalid: + case ExactValue_Compound: return 0; case ExactValue_Bool: case ExactValue_String: @@ -607,8 +608,6 @@ i32 exact_value_order(ExactValue const &v) { return 6; case ExactValue_Procedure: return 7; - // case ExactValue_Compound: - // return 8; default: GB_PANIC("How'd you get here? Invalid Value.kind %d", v.kind); From e53c85885559144f3273cfa13a10c6531787d173 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 14 Apr 2022 15:47:49 +0100 Subject: [PATCH 027/245] Add NS.Block to allow for the creation of block-like lambdas in Odin --- vendor/darwin/Foundation/block_literal.odin | 67 +++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 vendor/darwin/Foundation/block_literal.odin diff --git a/vendor/darwin/Foundation/block_literal.odin b/vendor/darwin/Foundation/block_literal.odin new file mode 100644 index 000000000..19e9782e4 --- /dev/null +++ b/vendor/darwin/Foundation/block_literal.odin @@ -0,0 +1,67 @@ +package objc_Foundation + +import "core:intrinsics" + +Internal_Block_Literal_Base :: struct { + isa: ^intrinsics.objc_class, + flags: u32, + reserved: u32, + invoke: proc "c" (^Internal_Block_Literal), + descriptor: ^Block_Descriptor, +} + +Internal_Block_Literal :: struct { + using base: Internal_Block_Literal_Base, + // Imported Variables + user_proc: proc "c" (user_data: rawptr), + user_data: rawptr, +} + +Block_Descriptor :: struct { + reserved: uint, + size: uint, + copy_helper: proc "c" (dst, src: rawptr), + dispose_helper: proc "c" (src: rawptr), + signature: cstring, +} + +global_block_descriptor := Block_Descriptor{ + reserved = 0, + size = size_of(Internal_Block_Literal), +} + + +@(objc_class="NSConcreteGlobalBlock") +Block :: struct {using _: Object} + +@(objc_type=Block, objc_name="create", objc_is_class_method=true) +Block_create :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { + // Set to true on blocks that have captures (and thus are not true + // global blocks) but are known not to escape for various other + // reasons. For backward compatibility with old runtimes, whenever + // BLOCK_IS_NOESCAPE is set, BLOCK_IS_GLOBAL is set too. Copying a + // non-escaping block returns the original block and releasing such a + // block is a no-op, which is exactly how global blocks are handled. + BLOCK_IS_NOESCAPE :: (1 << 23)|BLOCK_IS_GLOBAL + + BLOCK_HAS_COPY_DISPOSE :: 1 << 25 + BLOCK_HAS_CTOR :: 1 << 26 // helpers have C++ code + BLOCK_IS_GLOBAL :: 1 << 28 + BLOCK_HAS_STRET :: 1 << 29 // IFF BLOCK_HAS_SIGNATURE + BLOCK_HAS_SIGNATURE :: 1 << 30 + + extraBytes :: size_of(Internal_Block_Literal) - size_of(Internal_Block_Literal_Base) + + cls := intrinsics.objc_find_class("NSConcreteGlobalBlock") + bl := (^Internal_Block_Literal)(AllocateObject(cls, extraBytes, nil)) + bl.isa = cls + bl.flags = BLOCK_IS_GLOBAL + bl.invoke = proc "c" (bl: ^Internal_Block_Literal) { + bl.user_proc(bl.user_data) + } + bl.descriptor = &global_block_descriptor + bl.user_proc = user_proc + bl.user_data = user_data + + return auto_cast bl +} From 0d621511e582ccba60cb9c7c0d59fcfc88d4f9c4 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 14 Apr 2022 16:16:53 +0100 Subject: [PATCH 028/245] Correct signature types --- vendor/darwin/Metal/MetalClasses.odin | 28 +++++++++++++-------------- vendor/darwin/Metal/MetalTypes.odin | 16 +++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/vendor/darwin/Metal/MetalClasses.odin b/vendor/darwin/Metal/MetalClasses.odin index 29653f015..f91d5f112 100644 --- a/vendor/darwin/Metal/MetalClasses.odin +++ b/vendor/darwin/Metal/MetalClasses.odin @@ -6490,35 +6490,35 @@ Device_newCommandQueueWithMaxCommandBufferCount :: #force_inline proc(self: ^Dev return msgSend(^CommandQueue, self, "newCommandQueueWithMaxCommandBufferCount:", maxCommandBufferCount) } @(objc_type=Device, objc_name="newComputePipelineStateWithDescriptorWithCompletionHandler") -Device_newComputePipelineStateWithDescriptorWithCompletionHandler :: #force_inline proc(self: ^Device, descriptor: ^ComputePipelineDescriptor, options: PipelineOption, completionHandler: NewComputePipelineStateWithReflectionCompletionHandler) { - msgSend(nil, self, "newComputePipelineStateWithDescriptor:options:completionHandler:", descriptor, options, completionHandler) +Device_newComputePipelineStateWithDescriptorWithCompletionHandler :: #force_inline proc(self: ^Device, descriptor: ^ComputePipelineDescriptor, options: PipelineOption, completionHandler: NewComputePipelineStateWithReflectionCompletionHandler) -> ^ComputePipelineState { + return msgSend(^ComputePipelineState, self, "newComputePipelineStateWithDescriptor:options:completionHandler:", descriptor, options, completionHandler) } @(objc_type=Device, objc_name="newComputePipelineStateWithDescriptorWithReflection") -Device_newComputePipelineStateWithDescriptorWithReflection :: #force_inline proc(self: ^Device, descriptor: ^ComputePipelineDescriptor, options: PipelineOption, reflection: ^AutoreleasedComputePipelineReflection) -> (device: ^Device, error: ^NS.Error) { - device = msgSend(^Device, self, "newComputePipelineStateWithDescriptor:options:reflection:error:", descriptor, options, reflection, &error) +Device_newComputePipelineStateWithDescriptorWithReflection :: #force_inline proc(self: ^Device, descriptor: ^ComputePipelineDescriptor, options: PipelineOption, reflection: ^AutoreleasedComputePipelineReflection) -> (res: ^ComputePipelineState, error: ^NS.Error) { + res = msgSend(^ComputePipelineState, self, "newComputePipelineStateWithDescriptor:options:reflection:error:", descriptor, options, reflection, &error) return } @(objc_type=Device, objc_name="newComputePipelineStateWithFunctionWithCompletionHandler") -Device_newComputePipelineStateWithFunctionWithCompletionHandler :: #force_inline proc(self: ^Device, computeFunction: ^Function, completionHandler: NewComputePipelineStateCompletionHandler) { - msgSend(nil, self, "newComputePipelineStateWithFunction:completionHandler:", computeFunction, completionHandler) +Device_newComputePipelineStateWithFunctionWithCompletionHandler :: #force_inline proc(self: ^Device, computeFunction: ^Function, completionHandler: NewComputePipelineStateCompletionHandler) -> ^ComputePipelineState { + return msgSend(^ComputePipelineState, self, "newComputePipelineStateWithFunction:completionHandler:", computeFunction, completionHandler) } @(objc_type=Device, objc_name="newComputePipelineStateWithFunction") -Device_newComputePipelineStateWithFunction :: #force_inline proc(self: ^Device, computeFunction: ^Function) -> (res: ^Device, error: ^NS.Error) { - res = msgSend(^Device, self, "newComputePipelineStateWithFunction:error:", computeFunction, &error) +Device_newComputePipelineStateWithFunction :: #force_inline proc(self: ^Device, computeFunction: ^Function) -> (res: ^ComputePipelineState, error: ^NS.Error) { + res = msgSend(^ComputePipelineState, self, "newComputePipelineStateWithFunction:error:", computeFunction, &error) return } @(objc_type=Device, objc_name="newComputePipelineStateWithFunctionWithOptionsAndCompletionHandler") -Device_newComputePipelineStateWithFunctionWithOptionsAndCompletionHandler :: #force_inline proc(self: ^Device, computeFunction: ^Function, options: PipelineOption, completionHandler: NewComputePipelineStateWithReflectionCompletionHandler) { - msgSend(nil, self, "newComputePipelineStateWithFunction:options:completionHandler:", computeFunction, options, completionHandler) +Device_newComputePipelineStateWithFunctionWithOptionsAndCompletionHandler :: #force_inline proc(self: ^Device, computeFunction: ^Function, options: PipelineOption, completionHandler: NewComputePipelineStateWithReflectionCompletionHandler) -> (res: ^ComputePipelineState) { + return msgSend(^ComputePipelineState, self, "newComputePipelineStateWithFunction:options:completionHandler:", computeFunction, options, completionHandler) } @(objc_type=Device, objc_name="newComputePipelineStateWithFunctionWithReflection") -Device_newComputePipelineStateWithFunctionWithReflection :: #force_inline proc(self: ^Device, computeFunction: ^Function, options: PipelineOption, reflection: ^AutoreleasedComputePipelineReflection) -> (device: ^Device, error: ^NS.Error) { - device = msgSend(^Device, self, "newComputePipelineStateWithFunction:options:reflection:error:", computeFunction, options, reflection, &error) +Device_newComputePipelineStateWithFunctionWithReflection :: #force_inline proc(self: ^Device, computeFunction: ^Function, options: PipelineOption, reflection: ^AutoreleasedComputePipelineReflection) -> (res: ^ComputePipelineState, error: ^NS.Error) { + res = msgSend(^ComputePipelineState, self, "newComputePipelineStateWithFunction:options:reflection:error:", computeFunction, options, reflection, &error) return } @(objc_type=Device, objc_name="newCounterSampleBuffer") -Device_newCounterSampleBuffer :: #force_inline proc(self: ^Device, descriptor: ^CounterSampleBufferDescriptor) -> (device: ^Device, error: ^NS.Error) { - device = msgSend(^Device, self, "newCounterSampleBufferWithDescriptor:error:", descriptor, &error) +Device_newCounterSampleBuffer :: #force_inline proc(self: ^Device, descriptor: ^CounterSampleBufferDescriptor) -> (counter: ^Counter, error: ^NS.Error) { + counter = msgSend(^Counter, self, "newCounterSampleBufferWithDescriptor:error:", descriptor, &error) return } @(objc_type=Device, objc_name="newDefaultLibrary") diff --git a/vendor/darwin/Metal/MetalTypes.odin b/vendor/darwin/Metal/MetalTypes.odin index 673769c09..cc9d25ca0 100644 --- a/vendor/darwin/Metal/MetalTypes.odin +++ b/vendor/darwin/Metal/MetalTypes.odin @@ -184,16 +184,16 @@ Viewport :: struct { Timestamp :: distinct u64 -DeviceNotificationHandler :: distinct rawptr +DeviceNotificationHandler :: ^NS.Block AutoreleasedComputePipelineReflection :: ^ComputePipelineReflection AutoreleasedRenderPipelineReflection :: ^RenderPipelineReflection -NewLibraryCompletionHandler :: distinct rawptr -NewRenderPipelineStateCompletionHandler :: distinct rawptr -NewRenderPipelineStateWithReflectionCompletionHandler :: distinct rawptr -NewComputePipelineStateCompletionHandler :: distinct rawptr -NewComputePipelineStateWithReflectionCompletionHandler :: distinct rawptr -SharedEventNotificationBlock :: distinct rawptr +NewLibraryCompletionHandler :: ^NS.Block +NewRenderPipelineStateCompletionHandler :: ^NS.Block +NewRenderPipelineStateWithReflectionCompletionHandler :: ^NS.Block +NewComputePipelineStateCompletionHandler :: ^NS.Block +NewComputePipelineStateWithReflectionCompletionHandler :: ^NS.Block +SharedEventNotificationBlock :: ^NS.Block -DrawablePresentedHandler :: distinct rawptr +DrawablePresentedHandler :: ^NS.Block AutoreleasedArgument :: ^Argument \ No newline at end of file From ea0b02d9b95fd445f94ff96d94fae78332aa701c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 14 Apr 2022 16:42:24 +0100 Subject: [PATCH 029/245] Add Buffer contentsAsSlice and contentsAsType --- vendor/darwin/Metal/MetalClasses.odin | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vendor/darwin/Metal/MetalClasses.odin b/vendor/darwin/Metal/MetalClasses.odin index f91d5f112..38a7267b9 100644 --- a/vendor/darwin/Metal/MetalClasses.odin +++ b/vendor/darwin/Metal/MetalClasses.odin @@ -5495,6 +5495,17 @@ Buffer_contents :: #force_inline proc(self: ^Buffer) -> []byte { Buffer_contentsPointer :: #force_inline proc(self: ^Buffer) -> rawptr { return msgSend(rawptr, self, "contents") } +@(objc_type=Buffer, objc_name="contentsAsSlice") +Buffer_contentsAsSlice :: #force_inline proc(self: ^Buffer, $T: typeid/[]$E) -> T { + contents := msgSend([^]byte, self, "contents") + length := Buffer_length(self) + return mem.slice_data_cast(T, contents[:length]) +} +@(objc_type=Buffer, objc_name="contentsAsType") +Buffer_contentsAsType :: #force_inline proc(self: ^Buffer, $T: typeid, offset: uintptr = 0) -> ^T { + ptr := msgSend(rawptr, self, "contents") + return (^T)(uintptr(ptr) + offset) +} @(objc_type=Buffer, objc_name="didModifyRange") Buffer_didModifyRange :: #force_inline proc(self: ^Buffer, range: NS.Range) { msgSend(nil, self, "didModifyRange:", range) From 9a2d9002e6de463fb6809d89d91b5b9959b748d1 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 15 Apr 2022 11:14:59 +0100 Subject: [PATCH 030/245] Minor fixes and add use of proc groups where better suited --- vendor/darwin/Metal/MetalClasses.odin | 44 +++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/vendor/darwin/Metal/MetalClasses.odin b/vendor/darwin/Metal/MetalClasses.odin index 38a7267b9..c039510c6 100644 --- a/vendor/darwin/Metal/MetalClasses.odin +++ b/vendor/darwin/Metal/MetalClasses.odin @@ -6442,12 +6442,12 @@ Device_maxTransferRate :: #force_inline proc(self: ^Device) -> u64 { return msgSend(u64, self, "maxTransferRate") } @(objc_type=Device, objc_name="minimumLinearTextureAlignmentForPixelFormat") -Device_minimumLinearTextureAlignmentForPixelFormat :: #force_inline proc(self: ^Device, format: PixelFormat) -> ^Device { - return msgSend(^Device, self, "minimumLinearTextureAlignmentForPixelFormat:", format) +Device_minimumLinearTextureAlignmentForPixelFormat :: #force_inline proc(self: ^Device, format: PixelFormat) -> NS.UInteger { + return msgSend(NS.UInteger, self, "minimumLinearTextureAlignmentForPixelFormat:", format) } @(objc_type=Device, objc_name="minimumTextureBufferAlignmentForPixelFormat") -Device_minimumTextureBufferAlignmentForPixelFormat :: #force_inline proc(self: ^Device, format: PixelFormat) -> ^Device { - return msgSend(^Device, self, "minimumTextureBufferAlignmentForPixelFormat:", format) +Device_minimumTextureBufferAlignmentForPixelFormat :: #force_inline proc(self: ^Device, format: PixelFormat) -> NS.UInteger { + return msgSend(NS.UInteger, self, "minimumTextureBufferAlignmentForPixelFormat:", format) } @(objc_type=Device, objc_name="name") Device_name :: #force_inline proc(self: ^Device) -> ^NS.String { @@ -6527,6 +6527,17 @@ Device_newComputePipelineStateWithFunctionWithReflection :: #force_inline proc(s res = msgSend(^ComputePipelineState, self, "newComputePipelineStateWithFunction:options:reflection:error:", computeFunction, options, reflection, &error) return } + +@(objc_type=Device, objc_name="newComputePipelineState") +Device_newComputePipelineState :: proc{ + Device_newComputePipelineStateWithDescriptorWithCompletionHandler, + Device_newComputePipelineStateWithDescriptorWithReflection, + Device_newComputePipelineStateWithFunctionWithCompletionHandler, + Device_newComputePipelineStateWithFunction, + Device_newComputePipelineStateWithFunctionWithOptionsAndCompletionHandler, + Device_newComputePipelineStateWithFunctionWithReflection, +} + @(objc_type=Device, objc_name="newCounterSampleBuffer") Device_newCounterSampleBuffer :: #force_inline proc(self: ^Device, descriptor: ^CounterSampleBufferDescriptor) -> (counter: ^Counter, error: ^NS.Error) { counter = msgSend(^Counter, self, "newCounterSampleBufferWithDescriptor:error:", descriptor, &error) @@ -6595,6 +6606,16 @@ Device_newLibraryWithURL :: #force_inline proc(self: ^Device, url: ^NS.URL) -> ( library = msgSend(^Library, self, "newLibraryWithURL:error:", url, &error) return } +@(objc_type=Device, objc_name="newLibrary") +Device_newLibrary :: proc{ + Device_newLibraryWithData, + Device_newLibraryWithFile, + Device_newLibraryWithSourceWithCompletionHandler, + Device_newLibraryWithSource, + Device_newLibraryWithURL, +} + + @(objc_type=Device, objc_name="newRasterizationRateMap") Device_newRasterizationRateMap :: #force_inline proc(self: ^Device, descriptor: ^RasterizationRateMapDescriptor) -> ^RasterizationRateMap { return msgSend(^RasterizationRateMap, self, "newRasterizationRateMapWithDescriptor:", descriptor) @@ -6603,8 +6624,8 @@ Device_newRasterizationRateMap :: #force_inline proc(self: ^Device, descriptor: Device_newRenderPipelineStateWithDescriptorWithCompletionHandler :: #force_inline proc(self: ^Device, descriptor: ^RenderPipelineDescriptor, completionHandler: NewRenderPipelineStateCompletionHandler) -> ^RenderPipelineState { return msgSend(^RenderPipelineState, self, "newRenderPipelineStateWithDescriptor:completionHandler:", descriptor, completionHandler) } -@(objc_type=Device, objc_name="newRenderPipelineState") -Device_newRenderPipelineState :: #force_inline proc(self: ^Device, descriptor: ^RenderPipelineDescriptor) -> (pipeline: ^RenderPipelineState, error: ^NS.Error) { +@(objc_type=Device, objc_name="newRenderPipelineStateWithDescriptor") +Device_newRenderPipelineStateWithDescriptor :: #force_inline proc(self: ^Device, descriptor: ^RenderPipelineDescriptor) -> (pipeline: ^RenderPipelineState, error: ^NS.Error) { pipeline = msgSend(^RenderPipelineState, self, "newRenderPipelineStateWithDescriptor:error:", descriptor, &error) return } @@ -6626,6 +6647,17 @@ Device_newRenderPipelineStateWithTileDescriptorWithReflection :: #force_inline p pipeline = msgSend(^RenderPipelineState, self, "newRenderPipelineStateWithTileDescriptor:options:reflection:error:", descriptor, options, reflection, &error) return } +@(objc_type=Device, objc_name="newRenderPipelineState") +Device_newRenderPipelineState :: proc{ + Device_newRenderPipelineStateWithDescriptorWithCompletionHandler, + Device_newRenderPipelineStateWithDescriptor, + Device_newRenderPipelineStateWithDescriptorWithOptionsAndCompletionHandler, + Device_newRenderPipelineStateWithDescriptorWithReflection, + Device_newRenderPipelineStateWithTileDescriptorWithCompletionHandler, + Device_newRenderPipelineStateWithTileDescriptorWithReflection, +} + + @(objc_type=Device, objc_name="newSamplerState") Device_newSamplerState :: #force_inline proc(self: ^Device, descriptor: ^SamplerDescriptor) -> ^SamplerState { return msgSend(^SamplerState, self, "newSamplerStateWithDescriptor:", descriptor) From cfeb16f917eafc987a00c4726322e3664c34ce02 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 15 Apr 2022 11:20:42 +0100 Subject: [PATCH 031/245] Add more proc groups --- vendor/darwin/Metal/MetalClasses.odin | 65 +++++++++++++++++++++------ 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/vendor/darwin/Metal/MetalClasses.odin b/vendor/darwin/Metal/MetalClasses.odin index c039510c6..c30fde95c 100644 --- a/vendor/darwin/Metal/MetalClasses.odin +++ b/vendor/darwin/Metal/MetalClasses.odin @@ -1152,6 +1152,12 @@ CaptureManager_newCaptureScopeWithCommandQueue :: #force_inline proc(self: ^Capt CaptureManager_newCaptureScopeWithDevice :: #force_inline proc(self: ^CaptureManager, device: ^Device) -> ^CaptureScope { return msgSend(^CaptureScope, self, "newCaptureScopeWithDevice:", device) } +@(objc_type=CaptureManager, objc_name="newCaptureScope") +CaptureManager_newCaptureScope :: proc{ + CaptureManager_newCaptureScopeWithCommandQueue, + CaptureManager_newCaptureScopeWithDevice, +} + @(objc_type=CaptureManager, objc_name="setDefaultCaptureScope") CaptureManager_setDefaultCaptureScope :: #force_inline proc(self: ^CaptureManager, defaultCaptureScope: ^CaptureScope) { msgSend(nil, self, "setDefaultCaptureScope:", defaultCaptureScope) @@ -6670,22 +6676,34 @@ Device_newSharedEvent :: #force_inline proc(self: ^Device) -> ^SharedEvent { Device_newSharedEventWithHandle :: #force_inline proc(self: ^Device, sharedEventHandle: ^SharedEventHandle) -> ^SharedEvent { return msgSend(^SharedEvent, self, "newSharedEventWithHandle:", sharedEventHandle) } -@(objc_type=Device, objc_name="newSharedTexture") -Device_newSharedTexture :: #force_inline proc(self: ^Device, descriptor: ^TextureDescriptor) -> ^SharedEvent { +@(objc_type=Device, objc_name="newSharedTextureWithDescriptor") +Device_newSharedTextureWithDescriptor :: #force_inline proc(self: ^Device, descriptor: ^TextureDescriptor) -> ^SharedEvent { return msgSend(^SharedEvent, self, "newSharedTextureWithDescriptor:", descriptor) } @(objc_type=Device, objc_name="newSharedTextureWithHandle") Device_newSharedTextureWithHandle :: #force_inline proc(self: ^Device, sharedHandle: ^SharedTextureHandle) -> ^SharedEvent { return msgSend(^SharedEvent, self, "newSharedTextureWithHandle:", sharedHandle) } -@(objc_type=Device, objc_name="newTexture") -Device_newTexture :: #force_inline proc(self: ^Device, desc: ^TextureDescriptor) -> ^Texture { +@(objc_type=Device, objc_name="newSharedTexture") +Device_newSharedTexture :: proc{ + Device_newSharedTextureWithDescriptor, + Device_newSharedTextureWithHandle, +} + +@(objc_type=Device, objc_name="newTextureWithDescriptor") +Device_newTextureWithDescriptor :: #force_inline proc(self: ^Device, desc: ^TextureDescriptor) -> ^Texture { return msgSend(^Texture, self, "newTextureWithDescriptor:", desc) } @(objc_type=Device, objc_name="newTextureWithIOSurface") Device_newTextureWithIOSurface :: #force_inline proc(self: ^Device, descriptor: ^TextureDescriptor, iosurface: IOSurfaceRef, plane: NS.UInteger) -> ^Texture { return msgSend(^Texture, self, "newTextureWithDescriptor:iosurface:plane:", descriptor, iosurface, plane) } +@(objc_type=Device, objc_name="newTexture") +Device_newTexture :: proc{ + Device_newTextureWithDescriptor, + Device_newTextureWithIOSurface, +} + @(objc_type=Device, objc_name="peerCount") Device_peerCount :: #force_inline proc(self: ^Device) -> u32 { return msgSend(u32, self, "peerCount") @@ -7147,22 +7165,34 @@ Heap_label :: #force_inline proc(self: ^Heap) -> ^NS.String { Heap_maxAvailableSizeWithAlignment :: #force_inline proc(self: ^Heap, alignment: NS.UInteger) -> NS.UInteger { return msgSend(NS.UInteger, self, "maxAvailableSizeWithAlignment:", alignment) } -@(objc_type=Heap, objc_name="newBuffer") -Heap_newBuffer :: #force_inline proc(self: ^Heap, length: NS.UInteger, options: ResourceOptions) -> ^Buffer { +@(objc_type=Heap, objc_name="newBufferWithLength") +Heap_newBufferWithLength :: #force_inline proc(self: ^Heap, length: NS.UInteger, options: ResourceOptions) -> ^Buffer { return msgSend(^Buffer, self, "newBufferWithLength:options:", length, options) } @(objc_type=Heap, objc_name="newBufferWithOptions") Heap_newBufferWithOptions :: #force_inline proc(self: ^Heap, length: NS.UInteger, options: ResourceOptions, offset: NS.UInteger) -> ^Buffer { return msgSend(^Buffer, self, "newBufferWithLength:options:offset:", length, options, offset) } -@(objc_type=Heap, objc_name="newTexture") -Heap_newTexture :: #force_inline proc(self: ^Heap, desc: ^TextureDescriptor) -> ^Texture { +@(objc_type=Heap, objc_name="newBuffer") +Heap_newBuffer :: proc{ + Heap_newBufferWithLength, + Heap_newBufferWithOptions, +} + +@(objc_type=Heap, objc_name="newTextureWithDescriptor") +Heap_newTextureWithDescriptor :: #force_inline proc(self: ^Heap, desc: ^TextureDescriptor) -> ^Texture { return msgSend(^Texture, self, "newTextureWithDescriptor:", desc) } -@(objc_type=Heap, objc_name="newTextureWithOffset") -Heap_newTextureWithOffset :: #force_inline proc(self: ^Heap, descriptor: ^TextureDescriptor, offset: NS.UInteger) -> ^Texture { +@(objc_type=Heap, objc_name="newTextureWithDescriptorAndOffset") +Heap_newTextureWithDescriptorAndOffset :: #force_inline proc(self: ^Heap, descriptor: ^TextureDescriptor, offset: NS.UInteger) -> ^Texture { return msgSend(^Texture, self, "newTextureWithDescriptor:offset:", descriptor, offset) } +@(objc_type=Heap, objc_name="newTexture") +Heap_newTexture :: proc{ + Heap_newTextureWithDescriptor, + Heap_newTextureWithDescriptorAndOffset, +} + @(objc_type=Heap, objc_name="resourceOptions") Heap_resourceOptions :: #force_inline proc(self: ^Heap) -> ResourceOptions { return msgSend(ResourceOptions, self, "resourceOptions") @@ -7431,7 +7461,7 @@ Library_label :: #force_inline proc(self: ^Library) -> ^NS.String { return msgSend(^NS.String, self, "label") } @(objc_type=Library, objc_name="newFunctionWithCompletionHandler") -Library_newFunctionWithCompletionHandler :: #force_inline proc(self: ^Library, descriptor: ^FunctionDescriptor, completionHandler: rawptr) -> ^Function { +Library_newFunctionWithCompletionHandler :: #force_inline proc(self: ^Library, descriptor: ^FunctionDescriptor, completionHandler: ^NS.Block) -> ^Function { return msgSend(^Function, self, "newFunctionWithDescriptor:completionHandler:", descriptor, completionHandler) } @(objc_type=Library, objc_name="newFunctionWithDescriptor") @@ -7444,7 +7474,7 @@ Library_newFunctionWithName :: #force_inline proc(self: ^Library, functionName: return msgSend(^Function, self, "newFunctionWithName:", functionName) } @(objc_type=Library, objc_name="newFunctionWithConstantValuesAndCompletionHandler") -Library_newFunctionWithConstantValuesAndCompletionHandler :: #force_inline proc(self: ^Library, name: ^NS.String, constantValues: ^FunctionConstantValues, completionHandler: rawptr) -> ^Function { +Library_newFunctionWithConstantValuesAndCompletionHandler :: #force_inline proc(self: ^Library, name: ^NS.String, constantValues: ^FunctionConstantValues, completionHandler: ^NS.Block) -> ^Function { return msgSend(^Function, self, "newFunctionWithName:constantValues:completionHandler:", name, constantValues, completionHandler) } @(objc_type=Library, objc_name="newFunctionWithConstantValues") @@ -7452,8 +7482,17 @@ Library_newFunctionWithConstantValues :: #force_inline proc(self: ^Library, name function = msgSend(^Function, self, "newFunctionWithName:constantValues:error:", name, constantValues, &error) return } +@(objc_type=Library, objc_name="newFunction") +Library_newFunction :: proc{ + Library_newFunctionWithCompletionHandler, + Library_newFunctionWithDescriptor, + Library_newFunctionWithName, + Library_newFunctionWithConstantValuesAndCompletionHandler, + Library_newFunctionWithConstantValues, +} + @(objc_type=Library, objc_name="newIntersectionFunctionWithCompletionHandler") -Library_newIntersectionFunctionWithCompletionHandler :: #force_inline proc(self: ^Library, descriptor: ^IntersectionFunctionDescriptor, completionHandler: rawptr) -> ^Function { +Library_newIntersectionFunctionWithCompletionHandler :: #force_inline proc(self: ^Library, descriptor: ^IntersectionFunctionDescriptor, completionHandler: ^NS.Block) -> ^Function { return msgSend(^Function, self, "newIntersectionFunctionWithDescriptor:completionHandler:", descriptor, completionHandler) } @(objc_type=Library, objc_name="newIntersectionFunction") From 6b7c04e046d97bd08401123977a046398563bb87 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 15 Apr 2022 11:33:28 +0100 Subject: [PATCH 032/245] Improve utilities --- .../{block_literal.odin => NSBlock.odin} | 20 +++++++++++++++---- vendor/darwin/Metal/MetalClasses.odin | 2 ++ vendor/darwin/Metal/MetalProcedures.odin | 5 +++++ 3 files changed, 23 insertions(+), 4 deletions(-) rename vendor/darwin/Foundation/{block_literal.odin => NSBlock.odin} (74%) diff --git a/vendor/darwin/Foundation/block_literal.odin b/vendor/darwin/Foundation/NSBlock.odin similarity index 74% rename from vendor/darwin/Foundation/block_literal.odin rename to vendor/darwin/Foundation/NSBlock.odin index 19e9782e4..67ab502e8 100644 --- a/vendor/darwin/Foundation/block_literal.odin +++ b/vendor/darwin/Foundation/NSBlock.odin @@ -34,8 +34,9 @@ global_block_descriptor := Block_Descriptor{ @(objc_class="NSConcreteGlobalBlock") Block :: struct {using _: Object} -@(objc_type=Block, objc_name="create", objc_is_class_method=true) -Block_create :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { + +@(private="file") +Block_createInternal :: proc "c" (is_global: bool, user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { // Set to true on blocks that have captures (and thus are not true // global blocks) but are known not to escape for various other // reasons. For backward compatibility with old runtimes, whenever @@ -55,13 +56,24 @@ Block_create :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: raw cls := intrinsics.objc_find_class("NSConcreteGlobalBlock") bl := (^Internal_Block_Literal)(AllocateObject(cls, extraBytes, nil)) bl.isa = cls - bl.flags = BLOCK_IS_GLOBAL + bl.flags = BLOCK_IS_GLOBAL if is_global else 0 bl.invoke = proc "c" (bl: ^Internal_Block_Literal) { bl.user_proc(bl.user_data) } bl.descriptor = &global_block_descriptor bl.user_proc = user_proc bl.user_data = user_data - + return auto_cast bl } + +@(objc_type=Block, objc_name="createGlobal", objc_is_class_method=true) +Block_createGlobal :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { + return Block_createInternal(true, user_data, user_proc) +} + + +@(objc_type=Block, objc_name="createLocal", objc_is_class_method=true) +Block_createLocal :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { + return Block_createInternal(false, user_data, user_proc) +} diff --git a/vendor/darwin/Metal/MetalClasses.odin b/vendor/darwin/Metal/MetalClasses.odin index c30fde95c..075aae545 100644 --- a/vendor/darwin/Metal/MetalClasses.odin +++ b/vendor/darwin/Metal/MetalClasses.odin @@ -6588,6 +6588,7 @@ Device_newHeap :: #force_inline proc(self: ^Device, descriptor: ^HeapDescriptor) Device_newIndirectCommandBuffer :: #force_inline proc(self: ^Device, descriptor: ^IndirectCommandBufferDescriptor, maxCount: NS.UInteger, options: ResourceOptions) -> ^IndirectCommandBuffer { return msgSend(^IndirectCommandBuffer, self, "newIndirectCommandBufferWithDescriptor:maxCommandCount:options:", descriptor, maxCount, options) } + @(objc_type=Device, objc_name="newLibraryWithData") Device_newLibraryWithData :: #force_inline proc(self: ^Device, data: dispatch_data_t) -> (library: ^Library, error: ^NS.Error) { library = msgSend(^Library, self, "newLibraryWithData:error:", data, &error) @@ -6626,6 +6627,7 @@ Device_newLibrary :: proc{ Device_newRasterizationRateMap :: #force_inline proc(self: ^Device, descriptor: ^RasterizationRateMapDescriptor) -> ^RasterizationRateMap { return msgSend(^RasterizationRateMap, self, "newRasterizationRateMapWithDescriptor:", descriptor) } + @(objc_type=Device, objc_name="newRenderPipelineStateWithDescriptorWithCompletionHandler") Device_newRenderPipelineStateWithDescriptorWithCompletionHandler :: #force_inline proc(self: ^Device, descriptor: ^RenderPipelineDescriptor, completionHandler: NewRenderPipelineStateCompletionHandler) -> ^RenderPipelineState { return msgSend(^RenderPipelineState, self, "newRenderPipelineStateWithDescriptor:completionHandler:", descriptor, completionHandler) diff --git a/vendor/darwin/Metal/MetalProcedures.odin b/vendor/darwin/Metal/MetalProcedures.odin index b76c7f541..ca8fb1aea 100644 --- a/vendor/darwin/Metal/MetalProcedures.odin +++ b/vendor/darwin/Metal/MetalProcedures.odin @@ -11,4 +11,9 @@ foreign Metal { CopyAllDevicesWithObserver :: proc(observer: ^id, handler: DeviceNotificationHandler) -> ^NS.Array --- CreateSystemDefaultDevice :: proc() -> ^Device --- RemoveDeviceObserver :: proc(observer: id) --- +} + + +new :: proc($T: typeid) -> ^T where intrinsics.type_is_subtype_of(T, NS.Object) { + return T.alloc()->init() } \ No newline at end of file From fc3f62e3eda6f6c605c0e1db73a1dc36cb5fc848 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 15 Apr 2022 11:50:08 +0100 Subject: [PATCH 033/245] Minor rearrangement --- vendor/darwin/Foundation/NSBlock.odin | 34 ++++++++++++++------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/vendor/darwin/Foundation/NSBlock.odin b/vendor/darwin/Foundation/NSBlock.odin index 67ab502e8..7fa061484 100644 --- a/vendor/darwin/Foundation/NSBlock.odin +++ b/vendor/darwin/Foundation/NSBlock.odin @@ -2,6 +2,21 @@ package objc_Foundation import "core:intrinsics" +@(objc_class="NSConcreteGlobalBlock") +Block :: struct {using _: Object} + +@(objc_type=Block, objc_name="createGlobal", objc_is_class_method=true) +Block_createGlobal :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { + return Block_createInternal(true, user_data, user_proc) +} + +@(objc_type=Block, objc_name="createLocal", objc_is_class_method=true) +Block_createLocal :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { + return Block_createInternal(false, user_data, user_proc) +} + + +@(private) Internal_Block_Literal_Base :: struct { isa: ^intrinsics.objc_class, flags: u32, @@ -10,6 +25,7 @@ Internal_Block_Literal_Base :: struct { descriptor: ^Block_Descriptor, } +@(private) Internal_Block_Literal :: struct { using base: Internal_Block_Literal_Base, // Imported Variables @@ -17,6 +33,7 @@ Internal_Block_Literal :: struct { user_data: rawptr, } +@(private) Block_Descriptor :: struct { reserved: uint, size: uint, @@ -25,16 +42,12 @@ Block_Descriptor :: struct { signature: cstring, } +@(private) global_block_descriptor := Block_Descriptor{ reserved = 0, size = size_of(Internal_Block_Literal), } - -@(objc_class="NSConcreteGlobalBlock") -Block :: struct {using _: Object} - - @(private="file") Block_createInternal :: proc "c" (is_global: bool, user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { // Set to true on blocks that have captures (and thus are not true @@ -66,14 +79,3 @@ Block_createInternal :: proc "c" (is_global: bool, user_data: rawptr, user_proc: return auto_cast bl } - -@(objc_type=Block, objc_name="createGlobal", objc_is_class_method=true) -Block_createGlobal :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { - return Block_createInternal(true, user_data, user_proc) -} - - -@(objc_type=Block, objc_name="createLocal", objc_is_class_method=true) -Block_createLocal :: proc "c" (user_data: rawptr, user_proc: proc "c" (user_data: rawptr)) -> ^Block { - return Block_createInternal(false, user_data, user_proc) -} From 989641a6167498dfe6663fb330525d4d92becf8a Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 15 Apr 2022 12:14:12 +0100 Subject: [PATCH 034/245] Update Vulkan generation and package --- .../vulkan/_gen/create_vulkan_odin_wrapper.py | 37 +- vendor/vulkan/_gen/vk_icd.h | 2 +- vendor/vulkan/_gen/vk_platform.h | 4 +- vendor/vulkan/_gen/vulkan_core.h | 2569 ++++++++++++----- vendor/vulkan/_gen/vulkan_ios.h | 2 +- vendor/vulkan/_gen/vulkan_macos.h | 2 +- vendor/vulkan/_gen/vulkan_metal.h | 2 +- vendor/vulkan/_gen/vulkan_win32.h | 2 +- vendor/vulkan/core.odin | 98 +- vendor/vulkan/enums.odin | 1819 +++++++----- vendor/vulkan/procedures.odin | 341 ++- vendor/vulkan/structs.odin | 1529 ++++++---- 12 files changed, 4320 insertions(+), 2087 deletions(-) diff --git a/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py b/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py index f1949f973..ae1bc8d64 100644 --- a/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py +++ b/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py @@ -7,14 +7,14 @@ import os.path import math file_and_urls = [ - ("vk_platform.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_platform.h', True), - ("vulkan_core.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_core.h', False), - ("vk_layer.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_layer.h', True), - ("vk_icd.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vk_icd.h', True), - ("vulkan_win32.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_win32.h', False), - ("vulkan_metal.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_metal.h', False), - ("vulkan_macos.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_macos.h', False), - ("vulkan_ios.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/master/include/vulkan/vulkan_ios.h', False), + ("vk_platform.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vk_platform.h', True), + ("vulkan_core.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vulkan_core.h', False), + ("vk_layer.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vk_layer.h', True), + ("vk_icd.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vk_icd.h', True), + ("vulkan_win32.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vulkan_win32.h', False), + ("vulkan_metal.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vulkan_metal.h', False), + ("vulkan_macos.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vulkan_macos.h', False), + ("vulkan_ios.h", 'https://raw.githubusercontent.com/KhronosGroup/Vulkan-Headers/main/include/vulkan/vulkan_ios.h', False), ] for file, url, _ in file_and_urls: @@ -125,7 +125,7 @@ def to_snake_case(name): s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name) return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower() -ext_suffixes = ["KHR", "EXT", "AMD", "NV", "NVX", "GOOGLE"] +ext_suffixes = ["KHR", "EXT", "AMD", "NV", "NVX", "GOOGLE", "KHX"] ext_suffixes_title = [ext.title() for ext in ext_suffixes] @@ -254,9 +254,19 @@ def parse_constants(f): f.write("{}{} :: {}\n".format(name, "".rjust(max_len-len(name)), value)) f.write("\n// Vendor Constants\n") - data = re.findall(r"#define VK_((?:"+'|'.join(ext_suffixes)+r")\w+)\s*(.*?)\n", src, re.S) + fixes = '|'.join(ext_suffixes) + inner = r"((?:(?:" + fixes + r")\w+)|(?:\w+" + fixes + r"))" + pattern = r"#define\s+VK_" + inner + r"\s*(.*?)\n" + data = re.findall(pattern, src, re.S) + + number_suffix_re = re.compile(r"(\d+)[UuLlFf]") + max_len = max(len(name) for name, value in data) for name, value in data: + value = remove_prefix(value, 'VK_') + v = number_suffix_re.findall(value) + if v: + value = v[0] f.write("{}{} :: {}\n".format(name, "".rjust(max_len-len(name)), value)) f.write("\n") @@ -652,15 +662,12 @@ MAX_MEMORY_TYPES :: 32 MAX_MEMORY_HEAPS :: 16 MAX_EXTENSION_NAME_SIZE :: 256 MAX_DESCRIPTION_SIZE :: 256 -MAX_DEVICE_GROUP_SIZE_KHX :: 32 MAX_DEVICE_GROUP_SIZE :: 32 LUID_SIZE_KHX :: 8 -LUID_SIZE_KHR :: 8 LUID_SIZE :: 8 -MAX_DRIVER_NAME_SIZE_KHR :: 256 -MAX_DRIVER_INFO_SIZE_KHR :: 256 -MAX_QUEUE_FAMILY_EXTERNAL :: ~u32(0)-1 +MAX_QUEUE_FAMILY_EXTERNAL :: ~u32(1) MAX_GLOBAL_PRIORITY_SIZE_EXT :: 16 +QUEUE_FAMILY_EXTERNAL :: MAX_QUEUE_FAMILY_EXTERNAL """[1::]) parse_constants(f) diff --git a/vendor/vulkan/_gen/vk_icd.h b/vendor/vulkan/_gen/vk_icd.h index ae006d06d..41989ee35 100644 --- a/vendor/vulkan/_gen/vk_icd.h +++ b/vendor/vulkan/_gen/vk_icd.h @@ -33,7 +33,7 @@ // Version 2 - Add Loader/ICD Interface version negotiation // via vk_icdNegotiateLoaderICDInterfaceVersion. // Version 3 - Add ICD creation/destruction of KHR_surface objects. -// Version 4 - Add unknown physical device extension qyering via +// Version 4 - Add unknown physical device extension querying via // vk_icdGetPhysicalDeviceProcAddr. // Version 5 - Tells ICDs that the loader is now paying attention to the // application version of Vulkan passed into the ApplicationInfo diff --git a/vendor/vulkan/_gen/vk_platform.h b/vendor/vulkan/_gen/vk_platform.h index 18b913abc..3ff8c5d14 100644 --- a/vendor/vulkan/_gen/vk_platform.h +++ b/vendor/vulkan/_gen/vk_platform.h @@ -2,7 +2,7 @@ // File: vk_platform.h // /* -** Copyright 2014-2021 The Khronos Group Inc. +** Copyright 2014-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -42,7 +42,7 @@ extern "C" #define VKAPI_CALL __stdcall #define VKAPI_PTR VKAPI_CALL #elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7 - #error "Vulkan isn't supported for the 'armeabi' NDK ABI" + #error "Vulkan is not supported for the 'armeabi' NDK ABI" #elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE) // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat" // calling convention, i.e. float parameters are passed in registers. This diff --git a/vendor/vulkan/_gen/vulkan_core.h b/vendor/vulkan/_gen/vulkan_core.h index 18b302fa0..5c8b8461f 100644 --- a/vendor/vulkan/_gen/vulkan_core.h +++ b/vendor/vulkan/_gen/vulkan_core.h @@ -2,7 +2,7 @@ #define VULKAN_CORE_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ @@ -72,10 +72,10 @@ extern "C" { #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 191 +#define VK_HEADER_VERSION 211 // Complete version of this file -#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) +#define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) // DEPRECATED: This define is deprecated. VK_API_VERSION_MAJOR should be used instead. #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) @@ -160,6 +160,7 @@ typedef enum VkResult { VK_ERROR_INVALID_EXTERNAL_HANDLE = -1000072003, VK_ERROR_FRAGMENTATION = -1000161000, VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS = -1000257000, + VK_PIPELINE_COMPILE_REQUIRED = 1000297000, VK_ERROR_SURFACE_LOST_KHR = -1000000000, VK_ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000000001, VK_SUBOPTIMAL_KHR = 1000001003, @@ -168,19 +169,20 @@ typedef enum VkResult { VK_ERROR_VALIDATION_FAILED_EXT = -1000011001, VK_ERROR_INVALID_SHADER_NV = -1000012000, VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT = -1000158000, - VK_ERROR_NOT_PERMITTED_EXT = -1000174001, + VK_ERROR_NOT_PERMITTED_KHR = -1000174001, VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT = -1000255000, VK_THREAD_IDLE_KHR = 1000268000, VK_THREAD_DONE_KHR = 1000268001, VK_OPERATION_DEFERRED_KHR = 1000268002, VK_OPERATION_NOT_DEFERRED_KHR = 1000268003, - VK_PIPELINE_COMPILE_REQUIRED_EXT = 1000297000, VK_ERROR_OUT_OF_POOL_MEMORY_KHR = VK_ERROR_OUT_OF_POOL_MEMORY, VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR = VK_ERROR_INVALID_EXTERNAL_HANDLE, VK_ERROR_FRAGMENTATION_EXT = VK_ERROR_FRAGMENTATION, + VK_ERROR_NOT_PERMITTED_EXT = VK_ERROR_NOT_PERMITTED_KHR, VK_ERROR_INVALID_DEVICE_ADDRESS_EXT = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS, VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS, - VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED_EXT, + VK_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED, + VK_ERROR_PIPELINE_COMPILE_REQUIRED_EXT = VK_PIPELINE_COMPILE_REQUIRED, VK_RESULT_MAX_ENUM = 0x7FFFFFFF } VkResult; @@ -349,6 +351,58 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002, VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO = 1000257003, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO = 1000257004, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES = 53, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES = 54, + VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO = 1000192000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES = 1000215000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES = 1000245000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES = 1000276000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES = 1000295000, + VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO = 1000295001, + VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO = 1000295002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES = 1000297000, + VK_STRUCTURE_TYPE_MEMORY_BARRIER_2 = 1000314000, + VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2 = 1000314001, + VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2 = 1000314002, + VK_STRUCTURE_TYPE_DEPENDENCY_INFO = 1000314003, + VK_STRUCTURE_TYPE_SUBMIT_INFO_2 = 1000314004, + VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO = 1000314005, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO = 1000314006, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES = 1000314007, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES = 1000325000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES = 1000335000, + VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2 = 1000337000, + VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2 = 1000337001, + VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2 = 1000337002, + VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2 = 1000337003, + VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2 = 1000337004, + VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2 = 1000337005, + VK_STRUCTURE_TYPE_BUFFER_COPY_2 = 1000337006, + VK_STRUCTURE_TYPE_IMAGE_COPY_2 = 1000337007, + VK_STRUCTURE_TYPE_IMAGE_BLIT_2 = 1000337008, + VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2 = 1000337009, + VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2 = 1000337010, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES = 1000225000, + VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO = 1000225001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES = 1000225002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES = 1000138000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES = 1000138001, + VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK = 1000138002, + VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO = 1000138003, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES = 1000066000, + VK_STRUCTURE_TYPE_RENDERING_INFO = 1000044000, + VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO = 1000044001, + VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO = 1000044002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES = 1000044003, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO = 1000044004, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES = 1000280000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES = 1000280001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES = 1000281001, + VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3 = 1000360000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES = 1000413000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES = 1000413001, + VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS = 1000413002, + VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS = 1000413003, VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR = 1000001000, VK_STRUCTURE_TYPE_PRESENT_INFO_KHR = 1000001001, VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR = 1000060007, @@ -418,8 +472,14 @@ typedef enum VkStructureType { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_FORMAT_PROPERTIES_KHR = 1000023015, #endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_2_KHR = 1000023016, +#endif #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR = 1000024000, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_DECODE_CAPABILITIES_KHR = 1000024001, #endif VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV = 1000026000, VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001, @@ -436,54 +496,94 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_CAPABILITIES_EXT = 1000038000, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT = 1000038001, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000038001, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000038002, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000038002, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000038003, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_VCL_FRAME_INFO_EXT = 1000038003, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_VCL_FRAME_INFO_EXT = 1000038004, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT = 1000038004, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT = 1000038005, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_EXT = 1000038005, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_NALU_SLICE_EXT = 1000038006, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_EXT = 1000038006, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_EXT = 1000038007, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_EXT = 1000038007, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_PROFILE_EXT = 1000038008, + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT = 1000038008, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT = 1000038009, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H264_REFERENCE_LISTS_EXT = 1000038010, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_CAPABILITIES_EXT = 1000039000, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000039001, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT = 1000039002, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_VCL_FRAME_INFO_EXT = 1000039003, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT = 1000039004, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_EXT = 1000039005, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_EXT = 1000039006, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_PROFILE_EXT = 1000039007, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_REFERENCE_LISTS_EXT = 1000039008, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT = 1000039009, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT = 1000039010, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_CAPABILITIES_EXT = 1000040000, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_CREATE_INFO_EXT = 1000040001, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_EXT = 1000040001, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PICTURE_INFO_EXT = 1000040002, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_MVC_EXT = 1000040002, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_MVC_EXT = 1000040003, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_EXT = 1000040003, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_EXT = 1000040004, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000040004, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000040005, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000040005, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000040006, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT = 1000040007, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT = 1000040006, #endif VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000, + VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000044006, + VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT = 1000044007, + VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD = 1000044008, + VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX = 1000044009, VK_STRUCTURE_TYPE_STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP = 1000049000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV = 1000050000, VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000, @@ -493,7 +593,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000, VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000, VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN = 1000062000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT = 1000066000, VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT = 1000067000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT = 1000067001, VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073000, @@ -565,10 +664,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID = 1000129003, VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID = 1000129004, VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID = 1000129005, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT = 1000138000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT = 1000138001, - VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT = 1000138002, - VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT = 1000138003, + VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_2_ANDROID = 1000129006, VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT = 1000143000, VK_STRUCTURE_TYPE_RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT = 1000143001, VK_STRUCTURE_TYPE_PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT = 1000143002, @@ -607,6 +703,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT = 1000158003, VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT = 1000158004, VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT = 1000158005, + VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_2_EXT = 1000158006, VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160000, VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160001, #ifdef VK_ENABLE_BETA_EXTENSIONS @@ -634,7 +731,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV = 1000166001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_IMAGE_FORMAT_INFO_EXT = 1000170000, VK_STRUCTURE_TYPE_FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT = 1000170001, - VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = 1000174000, VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT = 1000178000, VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, @@ -646,29 +742,28 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_EXT = 1000187000, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_CREATE_INFO_EXT = 1000187001, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000187001, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000187002, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT = 1000187002, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT = 1000187003, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_EXT = 1000187003, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_EXT = 1000187004, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_EXT = 1000187004, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PICTURE_INFO_EXT = 1000187005, -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS - VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT = 1000187006, + VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT = 1000187005, #endif + VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR = 1000174000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR = 1000388000, + VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR = 1000388001, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP = 1000191000, - VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = 1000192000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV = 1000202001, @@ -689,14 +784,10 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DISPLAY_NATIVE_HDR_SURFACE_CAPABILITIES_AMD = 1000213000, VK_STRUCTURE_TYPE_SWAPCHAIN_DISPLAY_NATIVE_HDR_CREATE_INFO_AMD = 1000213001, VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR = 1000215000, VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT = 1000217000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001, VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT = 1000225000, - VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = 1000225001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = 1000225002, VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000226000, VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR = 1000226001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR = 1000226002, @@ -712,7 +803,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV = 1000240000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT = 1000244000, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT = 1000245000, VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT = 1000247000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR = 1000248000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV = 1000249000, @@ -743,7 +833,6 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR = 1000269004, VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR = 1000269005, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = 1000276000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV = 1000277000, VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV = 1000277001, VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV = 1000277002, @@ -754,10 +843,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV = 1000277007, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV = 1000278000, VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV = 1000278001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = 1000280000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = 1000280001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT = 1000281000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = 1000281001, VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM = 1000282000, VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM = 1000282001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT = 1000284000, @@ -771,30 +857,26 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR = 1000290000, VK_STRUCTURE_TYPE_PRESENT_ID_KHR = 1000294000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR = 1000294001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT = 1000295000, - VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT = 1000295001, - VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT = 1000295002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_INFO_KHR = 1000299000, #endif #ifdef VK_ENABLE_BETA_EXTENSIONS VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_INFO_KHR = 1000299001, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR = 1000299002, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + VK_STRUCTURE_TYPE_VIDEO_ENCODE_CAPABILITIES_KHR = 1000299003, #endif VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, - VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR = 1000314000, - VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR = 1000314001, - VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR = 1000314002, - VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR = 1000314003, - VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR = 1000314004, - VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR = 1000314005, - VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR = 1000314006, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR = 1000314007, VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV = 1000314008, VK_STRUCTURE_TYPE_CHECKPOINT_DATA_2_NV = 1000314009, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT = 1000320000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_PROPERTIES_EXT = 1000320001, + VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_LIBRARY_CREATE_INFO_EXT = 1000320002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR = 1000323000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = 1000325000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV = 1000326000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV = 1000326001, VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV = 1000326002, @@ -805,20 +887,10 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT = 1000332000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM = 1000333000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = 1000335000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR = 1000336000, - VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR = 1000337000, - VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR = 1000337001, - VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR = 1000337002, - VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR = 1000337003, - VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR = 1000337004, - VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR = 1000337005, - VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR = 1000337006, - VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR = 1000337007, - VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR = 1000337008, - VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR = 1000337009, - VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR = 1000337010, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT = 1000340000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM = 1000342000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT = 1000344000, VK_STRUCTURE_TYPE_DIRECTFB_SURFACE_CREATE_INFO_EXT = 1000346000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE = 1000351000, VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE = 1000351002, @@ -826,12 +898,24 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT = 1000352001, VK_STRUCTURE_TYPE_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT = 1000352002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRM_PROPERTIES_EXT = 1000353000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT = 1000355000, + VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT = 1000355001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT = 1000356000, VK_STRUCTURE_TYPE_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364000, VK_STRUCTURE_TYPE_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA = 1000364001, VK_STRUCTURE_TYPE_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364002, VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA = 1000365000, VK_STRUCTURE_TYPE_SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000365001, + VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA = 1000366000, + VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA = 1000366001, + VK_STRUCTURE_TYPE_BUFFER_COLLECTION_IMAGE_CREATE_INFO_FUCHSIA = 1000366002, + VK_STRUCTURE_TYPE_BUFFER_COLLECTION_PROPERTIES_FUCHSIA = 1000366003, + VK_STRUCTURE_TYPE_BUFFER_CONSTRAINTS_INFO_FUCHSIA = 1000366004, + VK_STRUCTURE_TYPE_BUFFER_COLLECTION_BUFFER_CREATE_INFO_FUCHSIA = 1000366005, + VK_STRUCTURE_TYPE_IMAGE_CONSTRAINTS_INFO_FUCHSIA = 1000366006, + VK_STRUCTURE_TYPE_IMAGE_FORMAT_CONSTRAINTS_INFO_FUCHSIA = 1000366007, + VK_STRUCTURE_TYPE_SYSMEM_COLOR_SPACE_FUCHSIA = 1000366008, + VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CONSTRAINTS_INFO_FUCHSIA = 1000366009, VK_STRUCTURE_TYPE_SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI = 1000369000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_FEATURES_HUAWEI = 1000369001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBPASS_SHADING_PROPERTIES_HUAWEI = 1000369002, @@ -842,14 +926,31 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SCREEN_SURFACE_CREATE_INFO_QNX = 1000378000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT = 1000381000, VK_STRUCTURE_TYPE_PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = 1000388000, - VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = 1000388001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT = 1000382000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT = 1000391000, + VK_STRUCTURE_TYPE_IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT = 1000391001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT = 1000392000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT = 1000392001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT = 1000393000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT = 1000411000, + VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT = 1000411001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE = 1000420000, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_BINDING_REFERENCE_VALVE = 1000420001, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE = 1000420002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = 1000425000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = 1000425001, + VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = 1000425002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV = 1000430000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, + VK_STRUCTURE_TYPE_RENDERING_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_INFO, + VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO, + VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDERING_INFO, + VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_NV = VK_STRUCTURE_TYPE_ATTACHMENT_SAMPLE_COUNT_INFO_AMD, VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES, @@ -869,6 +970,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO, VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO_KHR = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO, VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO_KHR = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES, VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO, @@ -911,6 +1013,10 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES, VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES, + VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK, + VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO, VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2, VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2, VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR = VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2, @@ -932,9 +1038,11 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES, VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT_KHR = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT, + VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES, + VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES, @@ -947,12 +1055,17 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR = VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO, VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL = VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES, + VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES, VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_STENCIL_LAYOUT, VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES, VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES, @@ -961,6 +1074,42 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO_KHR = VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO_KHR = VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES, + VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEVICE_PRIVATE_DATA_CREATE_INFO, + VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES, + VK_STRUCTURE_TYPE_MEMORY_BARRIER_2_KHR = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2, + VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2_KHR = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2, + VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2_KHR = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2, + VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR = VK_STRUCTURE_TYPE_DEPENDENCY_INFO, + VK_STRUCTURE_TYPE_SUBMIT_INFO_2_KHR = VK_STRUCTURE_TYPE_SUBMIT_INFO_2, + VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO_KHR = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO, + VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO_KHR = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES, + VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2, + VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2_KHR = VK_STRUCTURE_TYPE_COPY_IMAGE_TO_BUFFER_INFO_2, + VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR = VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2, + VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR = VK_STRUCTURE_TYPE_BUFFER_COPY_2, + VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR = VK_STRUCTURE_TYPE_IMAGE_COPY_2, + VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR = VK_STRUCTURE_TYPE_IMAGE_BLIT_2, + VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR = VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2, + VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, + VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR, + VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = VK_STRUCTURE_TYPE_QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES, + VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS, + VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF } VkStructureType; @@ -980,6 +1129,8 @@ typedef enum VkImageLayout { VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL = 1000241001, VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL = 1000241002, VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL = 1000241003, + VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL = 1000314000, + VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL = 1000314001, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002, #ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_DECODE_DST_KHR = 1000024000, @@ -1002,8 +1153,6 @@ typedef enum VkImageLayout { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR = 1000299002, #endif - VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR = 1000314000, - VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR = 1000314001, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR, @@ -1011,6 +1160,8 @@ typedef enum VkImageLayout { VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_MAX_ENUM = 0x7FFFFFFF } VkImageLayout; @@ -1043,6 +1194,7 @@ typedef enum VkObjectType { VK_OBJECT_TYPE_COMMAND_POOL = 25, VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION = 1000156000, VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE = 1000085000, + VK_OBJECT_TYPE_PRIVATE_DATA_SLOT = 1000295000, VK_OBJECT_TYPE_SURFACE_KHR = 1000000000, VK_OBJECT_TYPE_SWAPCHAIN_KHR = 1000001000, VK_OBJECT_TYPE_DISPLAY_KHR = 1000002000, @@ -1063,9 +1215,10 @@ typedef enum VkObjectType { VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL = 1000210000, VK_OBJECT_TYPE_DEFERRED_OPERATION_KHR = 1000268000, VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV = 1000277000, - VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT = 1000295000, + VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA = 1000366000, VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR = VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE, VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR = VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION, + VK_OBJECT_TYPE_PRIVATE_DATA_SLOT_EXT = VK_OBJECT_TYPE_PRIVATE_DATA_SLOT, VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF } VkObjectType; @@ -1318,6 +1471,26 @@ typedef enum VkFormat { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM = 1000156031, VK_FORMAT_G16_B16R16_2PLANE_422_UNORM = 1000156032, VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM = 1000156033, + VK_FORMAT_G8_B8R8_2PLANE_444_UNORM = 1000330000, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16 = 1000330001, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16 = 1000330002, + VK_FORMAT_G16_B16R16_2PLANE_444_UNORM = 1000330003, + VK_FORMAT_A4R4G4B4_UNORM_PACK16 = 1000340000, + VK_FORMAT_A4B4G4R4_UNORM_PACK16 = 1000340001, + VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK = 1000066000, + VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK = 1000066001, + VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK = 1000066002, + VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK = 1000066003, + VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK = 1000066004, + VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK = 1000066005, + VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK = 1000066006, + VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK = 1000066007, + VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK = 1000066008, + VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK = 1000066009, + VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK = 1000066010, + VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK = 1000066011, + VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK = 1000066012, + VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK = 1000066013, VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG = 1000054000, VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG = 1000054001, VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG = 1000054002, @@ -1326,26 +1499,20 @@ typedef enum VkFormat { VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG = 1000054005, VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG = 1000054006, VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG = 1000054007, - VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT = 1000066000, - VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT = 1000066001, - VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT = 1000066002, - VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT = 1000066003, - VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT = 1000066004, - VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT = 1000066005, - VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT = 1000066006, - VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT = 1000066007, - VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT = 1000066008, - VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT = 1000066009, - VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT = 1000066010, - VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT = 1000066011, - VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT = 1000066012, - VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT = 1000066013, - VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT = 1000330000, - VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT = 1000330001, - VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT = 1000330002, - VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT = 1000330003, - VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT = 1000340000, - VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT = 1000340001, + VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK, + VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK, + VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK, + VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK, + VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK, + VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK, VK_FORMAT_G8B8G8R8_422_UNORM_KHR = VK_FORMAT_G8B8G8R8_422_UNORM, VK_FORMAT_B8G8R8G8_422_UNORM_KHR = VK_FORMAT_B8G8R8G8_422_UNORM, VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM_KHR = VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, @@ -1380,6 +1547,12 @@ typedef enum VkFormat { VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM_KHR = VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM, VK_FORMAT_G16_B16R16_2PLANE_422_UNORM_KHR = VK_FORMAT_G16_B16R16_2PLANE_422_UNORM, VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM_KHR = VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, + VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT = VK_FORMAT_G8_B8R8_2PLANE_444_UNORM, + VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT = VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16, + VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT = VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16, + VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT = VK_FORMAT_G16_B16R16_2PLANE_444_UNORM, + VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT = VK_FORMAT_A4R4G4B4_UNORM_PACK16, + VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT = VK_FORMAT_A4B4G4R4_UNORM_PACK16, VK_FORMAT_MAX_ENUM = 0x7FFFFFFF } VkFormat; @@ -1422,6 +1595,7 @@ typedef enum VkQueryType { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_QUERY_TYPE_VIDEO_ENCODE_BITSTREAM_BUFFER_RANGE_KHR = 1000299000, #endif + VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT = 1000382000, VK_QUERY_TYPE_MAX_ENUM = 0x7FFFFFFF } VkQueryType; @@ -1553,6 +1727,21 @@ typedef enum VkDynamicState { VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK = 6, VK_DYNAMIC_STATE_STENCIL_WRITE_MASK = 7, VK_DYNAMIC_STATE_STENCIL_REFERENCE = 8, + VK_DYNAMIC_STATE_CULL_MODE = 1000267000, + VK_DYNAMIC_STATE_FRONT_FACE = 1000267001, + VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY = 1000267002, + VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT = 1000267003, + VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT = 1000267004, + VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE = 1000267005, + VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE = 1000267006, + VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE = 1000267007, + VK_DYNAMIC_STATE_DEPTH_COMPARE_OP = 1000267008, + VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE = 1000267009, + VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE = 1000267010, + VK_DYNAMIC_STATE_STENCIL_OP = 1000267011, + VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE = 1000377001, + VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE = 1000377002, + VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE = 1000377004, VK_DYNAMIC_STATE_VIEWPORT_W_SCALING_NV = 1000087000, VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT = 1000099000, VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT = 1000143000, @@ -1562,25 +1751,25 @@ typedef enum VkDynamicState { VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_NV = 1000205001, VK_DYNAMIC_STATE_FRAGMENT_SHADING_RATE_KHR = 1000226000, VK_DYNAMIC_STATE_LINE_STIPPLE_EXT = 1000259000, - VK_DYNAMIC_STATE_CULL_MODE_EXT = 1000267000, - VK_DYNAMIC_STATE_FRONT_FACE_EXT = 1000267001, - VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT = 1000267002, - VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT = 1000267003, - VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT = 1000267004, - VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT = 1000267005, - VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT = 1000267006, - VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT = 1000267007, - VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT = 1000267008, - VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT = 1000267009, - VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT = 1000267010, - VK_DYNAMIC_STATE_STENCIL_OP_EXT = 1000267011, VK_DYNAMIC_STATE_VERTEX_INPUT_EXT = 1000352000, VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT = 1000377000, - VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT = 1000377001, - VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT = 1000377002, VK_DYNAMIC_STATE_LOGIC_OP_EXT = 1000377003, - VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT = 1000377004, VK_DYNAMIC_STATE_COLOR_WRITE_ENABLE_EXT = 1000381000, + VK_DYNAMIC_STATE_CULL_MODE_EXT = VK_DYNAMIC_STATE_CULL_MODE, + VK_DYNAMIC_STATE_FRONT_FACE_EXT = VK_DYNAMIC_STATE_FRONT_FACE, + VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT = VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY, + VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT = VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT, + VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT_EXT = VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT, + VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT = VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE, + VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE, + VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE, + VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT = VK_DYNAMIC_STATE_DEPTH_COMPARE_OP, + VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE, + VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT = VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE, + VK_DYNAMIC_STATE_STENCIL_OP_EXT = VK_DYNAMIC_STATE_STENCIL_OP, + VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT = VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE, + VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT = VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE, + VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT = VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE, VK_DYNAMIC_STATE_MAX_ENUM = 0x7FFFFFFF } VkDynamicState; @@ -1699,10 +1888,11 @@ typedef enum VkDescriptorType { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC = 8, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9, VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT = 10, - VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT = 1000138000, + VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK = 1000138000, VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR = 1000150000, VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV = 1000165000, VK_DESCRIPTOR_TYPE_MUTABLE_VALVE = 1000351000, + VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, VK_DESCRIPTOR_TYPE_MAX_ENUM = 0x7FFFFFFF } VkDescriptorType; @@ -1717,8 +1907,10 @@ typedef enum VkAttachmentLoadOp { typedef enum VkAttachmentStoreOp { VK_ATTACHMENT_STORE_OP_STORE = 0, VK_ATTACHMENT_STORE_OP_DONT_CARE = 1, - VK_ATTACHMENT_STORE_OP_NONE_EXT = 1000301000, - VK_ATTACHMENT_STORE_OP_NONE_QCOM = VK_ATTACHMENT_STORE_OP_NONE_EXT, + VK_ATTACHMENT_STORE_OP_NONE = 1000301000, + VK_ATTACHMENT_STORE_OP_NONE_KHR = VK_ATTACHMENT_STORE_OP_NONE, + VK_ATTACHMENT_STORE_OP_NONE_QCOM = VK_ATTACHMENT_STORE_OP_NONE, + VK_ATTACHMENT_STORE_OP_NONE_EXT = VK_ATTACHMENT_STORE_OP_NONE, VK_ATTACHMENT_STORE_OP_MAX_ENUM = 0x7FFFFFFF } VkAttachmentStoreOp; @@ -1770,6 +1962,7 @@ typedef enum VkAccessFlagBits { VK_ACCESS_HOST_WRITE_BIT = 0x00004000, VK_ACCESS_MEMORY_READ_BIT = 0x00008000, VK_ACCESS_MEMORY_WRITE_BIT = 0x00010000, + VK_ACCESS_NONE = 0, VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000, VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000, VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000, @@ -1781,10 +1974,10 @@ typedef enum VkAccessFlagBits { VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000, VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000, VK_ACCESS_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000, - VK_ACCESS_NONE_KHR = 0, VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV = VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR, VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_NV = VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR, VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_NV = VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR, + VK_ACCESS_NONE_KHR = VK_ACCESS_NONE, VK_ACCESS_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkAccessFlagBits; typedef VkFlags VkAccessFlags; @@ -1797,6 +1990,7 @@ typedef enum VkImageAspectFlagBits { VK_IMAGE_ASPECT_PLANE_0_BIT = 0x00000010, VK_IMAGE_ASPECT_PLANE_1_BIT = 0x00000020, VK_IMAGE_ASPECT_PLANE_2_BIT = 0x00000040, + VK_IMAGE_ASPECT_NONE = 0, VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT = 0x00000080, VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT = 0x00000100, VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT = 0x00000200, @@ -1804,6 +1998,7 @@ typedef enum VkImageAspectFlagBits { VK_IMAGE_ASPECT_PLANE_0_BIT_KHR = VK_IMAGE_ASPECT_PLANE_0_BIT, VK_IMAGE_ASPECT_PLANE_1_BIT_KHR = VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT_KHR = VK_IMAGE_ASPECT_PLANE_2_BIT, + VK_IMAGE_ASPECT_NONE_KHR = VK_IMAGE_ASPECT_NONE, VK_IMAGE_ASPECT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkImageAspectFlagBits; typedef VkFlags VkImageAspectFlags; @@ -1879,6 +2074,8 @@ typedef enum VkImageCreateFlagBits { VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV = 0x00002000, VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT = 0x00001000, VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT = 0x00004000, + VK_IMAGE_CREATE_2D_VIEW_COMPATIBLE_BIT_EXT = 0x00020000, + VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM = 0x00008000, VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT, VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT, VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT, @@ -1935,6 +2132,11 @@ typedef enum VkImageUsageFlagBits { VK_IMAGE_USAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkImageUsageFlagBits; typedef VkFlags VkImageUsageFlags; + +typedef enum VkInstanceCreateFlagBits { + VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR = 0x00000001, + VK_INSTANCE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkInstanceCreateFlagBits; typedef VkFlags VkInstanceCreateFlags; typedef enum VkMemoryHeapFlagBits { @@ -2000,6 +2202,7 @@ typedef enum VkPipelineStageFlagBits { VK_PIPELINE_STAGE_HOST_BIT = 0x00004000, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT = 0x00008000, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT = 0x00010000, + VK_PIPELINE_STAGE_NONE = 0, VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000, VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR = 0x02000000, @@ -2009,10 +2212,10 @@ typedef enum VkPipelineStageFlagBits { VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000, VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000, VK_PIPELINE_STAGE_COMMAND_PREPROCESS_BIT_NV = 0x00020000, - VK_PIPELINE_STAGE_NONE_KHR = 0, VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV = VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_NV = VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_NV = VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR, + VK_PIPELINE_STAGE_NONE_KHR = VK_PIPELINE_STAGE_NONE, VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineStageFlagBits; typedef VkFlags VkPipelineStageFlags; @@ -2040,7 +2243,8 @@ typedef VkFlags VkFenceCreateFlags; typedef VkFlags VkSemaphoreCreateFlags; typedef enum VkEventCreateFlagBits { - VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR = 0x00000001, + VK_EVENT_CREATE_DEVICE_ONLY_BIT = 0x00000001, + VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR = VK_EVENT_CREATE_DEVICE_ONLY_BIT, VK_EVENT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkEventCreateFlagBits; typedef VkFlags VkEventCreateFlags; @@ -2132,7 +2336,8 @@ typedef VkFlags VkImageViewCreateFlags; typedef VkFlags VkShaderModuleCreateFlags; typedef enum VkPipelineCacheCreateFlagBits { - VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT = 0x00000001, + VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001, + VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT, VK_PIPELINE_CACHE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineCacheCreateFlagBits; typedef VkFlags VkPipelineCacheCreateFlags; @@ -2152,6 +2357,10 @@ typedef enum VkPipelineCreateFlagBits { VK_PIPELINE_CREATE_DERIVATIVE_BIT = 0x00000004, VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT = 0x00000008, VK_PIPELINE_CREATE_DISPATCH_BASE_BIT = 0x00000010, + VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT = 0x00000100, + VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT = 0x00000200, + VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00200000, + VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = 0x00400000, VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_BIT_KHR = 0x00004000, VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_BIT_KHR = 0x00008000, VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_MISS_SHADERS_BIT_KHR = 0x00010000, @@ -2164,19 +2373,25 @@ typedef enum VkPipelineCreateFlagBits { VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR = 0x00000080, VK_PIPELINE_CREATE_INDIRECT_BINDABLE_BIT_NV = 0x00040000, VK_PIPELINE_CREATE_LIBRARY_BIT_KHR = 0x00000800, - VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT = 0x00000100, - VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT = 0x00000200, + VK_PIPELINE_CREATE_RETAIN_LINK_TIME_OPTIMIZATION_INFO_BIT_EXT = 0x00800000, + VK_PIPELINE_CREATE_LINK_TIME_OPTIMIZATION_BIT_EXT = 0x00000400, VK_PIPELINE_CREATE_RAY_TRACING_ALLOW_MOTION_BIT_NV = 0x00100000, VK_PIPELINE_CREATE_DISPATCH_BASE = VK_PIPELINE_CREATE_DISPATCH_BASE_BIT, + VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR, + VK_PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT = VK_PIPELINE_CREATE_RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_BIT_EXT, VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHR = VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT, VK_PIPELINE_CREATE_DISPATCH_BASE_KHR = VK_PIPELINE_CREATE_DISPATCH_BASE, + VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT, + VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT, VK_PIPELINE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineCreateFlagBits; typedef VkFlags VkPipelineCreateFlags; typedef enum VkPipelineShaderStageCreateFlagBits { - VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT = 0x00000001, - VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT = 0x00000002, + VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT = 0x00000001, + VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT = 0x00000002, + VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT, + VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT, VK_PIPELINE_SHADER_STAGE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkPipelineShaderStageCreateFlagBits; typedef VkFlags VkPipelineShaderStageCreateFlags; @@ -2222,9 +2437,25 @@ typedef VkFlags VkPipelineTessellationStateCreateFlags; typedef VkFlags VkPipelineViewportStateCreateFlags; typedef VkFlags VkPipelineRasterizationStateCreateFlags; typedef VkFlags VkPipelineMultisampleStateCreateFlags; + +typedef enum VkPipelineDepthStencilStateCreateFlagBits { + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM = 0x00000001, + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM = 0x00000002, + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPipelineDepthStencilStateCreateFlagBits; typedef VkFlags VkPipelineDepthStencilStateCreateFlags; + +typedef enum VkPipelineColorBlendStateCreateFlagBits { + VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_ARM = 0x00000001, + VK_PIPELINE_COLOR_BLEND_STATE_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPipelineColorBlendStateCreateFlagBits; typedef VkFlags VkPipelineColorBlendStateCreateFlags; typedef VkFlags VkPipelineDynamicStateCreateFlags; + +typedef enum VkPipelineLayoutCreateFlagBits { + VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT = 0x00000002, + VK_PIPELINE_LAYOUT_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPipelineLayoutCreateFlagBits; typedef VkFlags VkPipelineLayoutCreateFlags; typedef VkFlags VkShaderStageFlags; @@ -2288,6 +2519,9 @@ typedef enum VkSubpassDescriptionFlagBits { VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX = 0x00000002, VK_SUBPASS_DESCRIPTION_FRAGMENT_REGION_BIT_QCOM = 0x00000004, VK_SUBPASS_DESCRIPTION_SHADER_RESOLVE_BIT_QCOM = 0x00000008, + VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_BIT_ARM = 0x00000010, + VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM = 0x00000020, + VK_SUBPASS_DESCRIPTION_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM = 0x00000040, VK_SUBPASS_DESCRIPTION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF } VkSubpassDescriptionFlagBits; typedef VkFlags VkSubpassDescriptionFlags; @@ -5285,6 +5519,11 @@ typedef enum VkDriverId { VK_DRIVER_ID_COREAVI_PROPRIETARY = 15, VK_DRIVER_ID_JUICE_PROPRIETARY = 16, VK_DRIVER_ID_VERISILICON_PROPRIETARY = 17, + VK_DRIVER_ID_MESA_TURNIP = 18, + VK_DRIVER_ID_MESA_V3DV = 19, + VK_DRIVER_ID_MESA_PANVK = 20, + VK_DRIVER_ID_SAMSUNG_PROPRIETARY = 21, + VK_DRIVER_ID_MESA_VENUS = 22, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -6006,6 +6245,1037 @@ VKAPI_ATTR uint64_t VKAPI_CALL vkGetDeviceMemoryOpaqueCaptureAddress( #endif +#define VK_VERSION_1_3 1 +// Vulkan 1.3 version number +#define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0)// Patch version should always be set to 0 + +typedef uint64_t VkFlags64; +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPrivateDataSlot) + +typedef enum VkPipelineCreationFeedbackFlagBits { + VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT = 0x00000001, + VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT = 0x00000002, + VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT = 0x00000004, + VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT, + VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT, + VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT = VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT, + VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkPipelineCreationFeedbackFlagBits; +typedef VkFlags VkPipelineCreationFeedbackFlags; + +typedef enum VkToolPurposeFlagBits { + VK_TOOL_PURPOSE_VALIDATION_BIT = 0x00000001, + VK_TOOL_PURPOSE_PROFILING_BIT = 0x00000002, + VK_TOOL_PURPOSE_TRACING_BIT = 0x00000004, + VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT = 0x00000008, + VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT = 0x00000010, + VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT = 0x00000020, + VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT = 0x00000040, + VK_TOOL_PURPOSE_VALIDATION_BIT_EXT = VK_TOOL_PURPOSE_VALIDATION_BIT, + VK_TOOL_PURPOSE_PROFILING_BIT_EXT = VK_TOOL_PURPOSE_PROFILING_BIT, + VK_TOOL_PURPOSE_TRACING_BIT_EXT = VK_TOOL_PURPOSE_TRACING_BIT, + VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT_EXT = VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT, + VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT_EXT = VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT, + VK_TOOL_PURPOSE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkToolPurposeFlagBits; +typedef VkFlags VkToolPurposeFlags; +typedef VkFlags VkPrivateDataSlotCreateFlags; +typedef VkFlags64 VkPipelineStageFlags2; + +// Flag bits for VkPipelineStageFlagBits2 +typedef VkFlags64 VkPipelineStageFlagBits2; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE = 0ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE_KHR = 0ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT = 0x00000001ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR = 0x00000001ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT = 0x00000002ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR = 0x00000002ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT = 0x00000004ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR = 0x00000004ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT = 0x00000008ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR = 0x00000008ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT = 0x00000010ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR = 0x00000010ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT = 0x00000020ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR = 0x00000020ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT = 0x00000040ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR = 0x00000040ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT = 0x00000080ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR = 0x00000080ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT = 0x00000100ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR = 0x00000100ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT = 0x00000200ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR = 0x00000200ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT = 0x00000400ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR = 0x00000400ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT = 0x00000800ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR = 0x00000800ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR = 0x00001000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT = 0x00002000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR = 0x00002000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT = 0x00004000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT_KHR = 0x00004000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT = 0x00008000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR = 0x00008000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT = 0x00010000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR = 0x00010000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT = 0x100000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT_KHR = 0x100000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT = 0x200000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR = 0x200000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT = 0x400000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT_KHR = 0x400000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT = 0x800000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR = 0x800000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT = 0x1000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR = 0x1000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT = 0x2000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR = 0x2000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT = 0x4000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR = 0x4000000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR = 0x04000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR = 0x08000000ULL; +#endif +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV = 0x00020000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV = 0x00400000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR = 0x02000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR = 0x00200000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_NV = 0x00200000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_NV = 0x02000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_NV = 0x00080000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV = 0x00100000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI = 0x8000000000ULL; +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INVOCATION_MASK_BIT_HUAWEI = 0x10000000000ULL; + +typedef VkFlags64 VkAccessFlags2; + +// Flag bits for VkAccessFlagBits2 +typedef VkFlags64 VkAccessFlagBits2; +static const VkAccessFlagBits2 VK_ACCESS_2_NONE = 0ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_NONE_KHR = 0ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT = 0x00000001ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR = 0x00000001ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT = 0x00000002ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT_KHR = 0x00000002ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT = 0x00000004ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR = 0x00000004ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT = 0x00000008ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT_KHR = 0x00000008ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT = 0x00000010ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR = 0x00000010ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT = 0x00000020ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT_KHR = 0x00000020ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT = 0x00000040ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT_KHR = 0x00000040ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT = 0x00000080ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR = 0x00000080ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT = 0x00000100ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR = 0x00000100ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT = 0x00000200ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR = 0x00000200ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT = 0x00000400ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR = 0x00000400ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT = 0x00000800ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT_KHR = 0x00000800ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT = 0x00001000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR = 0x00001000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT = 0x00002000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT_KHR = 0x00002000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT = 0x00004000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT_KHR = 0x00004000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT = 0x00008000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT_KHR = 0x00008000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT = 0x00010000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT_KHR = 0x00010000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT = 0x100000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR = 0x100000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT = 0x200000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR = 0x200000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT = 0x400000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR = 0x400000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR = 0x800000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR = 0x1000000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR = 0x2000000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR = 0x4000000000ULL; +#endif +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT = 0x00100000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR = 0x00200000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR = 0x00400000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_NV = 0x00200000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_NV = 0x00400000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT = 0x00080000ULL; +static const VkAccessFlagBits2 VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI = 0x8000000000ULL; + + +typedef enum VkSubmitFlagBits { + VK_SUBMIT_PROTECTED_BIT = 0x00000001, + VK_SUBMIT_PROTECTED_BIT_KHR = VK_SUBMIT_PROTECTED_BIT, + VK_SUBMIT_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkSubmitFlagBits; +typedef VkFlags VkSubmitFlags; + +typedef enum VkRenderingFlagBits { + VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT = 0x00000001, + VK_RENDERING_SUSPENDING_BIT = 0x00000002, + VK_RENDERING_RESUMING_BIT = 0x00000004, + VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT, + VK_RENDERING_SUSPENDING_BIT_KHR = VK_RENDERING_SUSPENDING_BIT, + VK_RENDERING_RESUMING_BIT_KHR = VK_RENDERING_RESUMING_BIT, + VK_RENDERING_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF +} VkRenderingFlagBits; +typedef VkFlags VkRenderingFlags; +typedef VkFlags64 VkFormatFeatureFlags2; + +// Flag bits for VkFormatFeatureFlagBits2 +typedef VkFlags64 VkFormatFeatureFlagBits2; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT = 0x00000001ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR = 0x00000001ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT = 0x00000002ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR = 0x00000002ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT = 0x00000004ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR = 0x00000004ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT = 0x00000008ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR = 0x00000008ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT = 0x00000010ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR = 0x00000010ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT = 0x00000020ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR = 0x00000020ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT = 0x00000040ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR = 0x00000040ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT = 0x00000080ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR = 0x00000080ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT = 0x00000100ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR = 0x00000100ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT = 0x00000200ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR = 0x00000200ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT = 0x00000400ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR = 0x00000400ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT = 0x00000800ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR = 0x00000800ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR = 0x00001000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT = 0x00002000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT = 0x00002000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT = 0x00004000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR = 0x00004000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT = 0x00008000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR = 0x00008000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT = 0x00010000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR = 0x00010000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT = 0x00020000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR = 0x00020000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT = 0x00040000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR = 0x00040000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT = 0x00080000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR = 0x00080000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT = 0x00100000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR = 0x00100000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT = 0x00200000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR = 0x00200000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT = 0x00400000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR = 0x00400000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT = 0x00800000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR = 0x00800000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT = 0x80000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR = 0x80000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT = 0x100000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR = 0x100000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT = 0x200000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR = 0x200000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR = 0x02000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR = 0x04000000ULL; +#endif +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR = 0x20000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT = 0x01000000ULL; +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x40000000ULL; +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR = 0x08000000ULL; +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR = 0x10000000ULL; +#endif +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV = 0x4000000000ULL; + +typedef struct VkPhysicalDeviceVulkan13Features { + VkStructureType sType; + void* pNext; + VkBool32 robustImageAccess; + VkBool32 inlineUniformBlock; + VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind; + VkBool32 pipelineCreationCacheControl; + VkBool32 privateData; + VkBool32 shaderDemoteToHelperInvocation; + VkBool32 shaderTerminateInvocation; + VkBool32 subgroupSizeControl; + VkBool32 computeFullSubgroups; + VkBool32 synchronization2; + VkBool32 textureCompressionASTC_HDR; + VkBool32 shaderZeroInitializeWorkgroupMemory; + VkBool32 dynamicRendering; + VkBool32 shaderIntegerDotProduct; + VkBool32 maintenance4; +} VkPhysicalDeviceVulkan13Features; + +typedef struct VkPhysicalDeviceVulkan13Properties { + VkStructureType sType; + void* pNext; + uint32_t minSubgroupSize; + uint32_t maxSubgroupSize; + uint32_t maxComputeWorkgroupSubgroups; + VkShaderStageFlags requiredSubgroupSizeStages; + uint32_t maxInlineUniformBlockSize; + uint32_t maxPerStageDescriptorInlineUniformBlocks; + uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks; + uint32_t maxDescriptorSetInlineUniformBlocks; + uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks; + uint32_t maxInlineUniformTotalSize; + VkBool32 integerDotProduct8BitUnsignedAccelerated; + VkBool32 integerDotProduct8BitSignedAccelerated; + VkBool32 integerDotProduct8BitMixedSignednessAccelerated; + VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedSignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProduct16BitUnsignedAccelerated; + VkBool32 integerDotProduct16BitSignedAccelerated; + VkBool32 integerDotProduct16BitMixedSignednessAccelerated; + VkBool32 integerDotProduct32BitUnsignedAccelerated; + VkBool32 integerDotProduct32BitSignedAccelerated; + VkBool32 integerDotProduct32BitMixedSignednessAccelerated; + VkBool32 integerDotProduct64BitUnsignedAccelerated; + VkBool32 integerDotProduct64BitSignedAccelerated; + VkBool32 integerDotProduct64BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated; + VkDeviceSize storageTexelBufferOffsetAlignmentBytes; + VkBool32 storageTexelBufferOffsetSingleTexelAlignment; + VkDeviceSize uniformTexelBufferOffsetAlignmentBytes; + VkBool32 uniformTexelBufferOffsetSingleTexelAlignment; + VkDeviceSize maxBufferSize; +} VkPhysicalDeviceVulkan13Properties; + +typedef struct VkPipelineCreationFeedback { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; +} VkPipelineCreationFeedback; + +typedef struct VkPipelineCreationFeedbackCreateInfo { + VkStructureType sType; + const void* pNext; + VkPipelineCreationFeedback* pPipelineCreationFeedback; + uint32_t pipelineStageCreationFeedbackCount; + VkPipelineCreationFeedback* pPipelineStageCreationFeedbacks; +} VkPipelineCreationFeedbackCreateInfo; + +typedef struct VkPhysicalDeviceShaderTerminateInvocationFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderTerminateInvocation; +} VkPhysicalDeviceShaderTerminateInvocationFeatures; + +typedef struct VkPhysicalDeviceToolProperties { + VkStructureType sType; + void* pNext; + char name[VK_MAX_EXTENSION_NAME_SIZE]; + char version[VK_MAX_EXTENSION_NAME_SIZE]; + VkToolPurposeFlags purposes; + char description[VK_MAX_DESCRIPTION_SIZE]; + char layer[VK_MAX_EXTENSION_NAME_SIZE]; +} VkPhysicalDeviceToolProperties; + +typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderDemoteToHelperInvocation; +} VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures; + +typedef struct VkPhysicalDevicePrivateDataFeatures { + VkStructureType sType; + void* pNext; + VkBool32 privateData; +} VkPhysicalDevicePrivateDataFeatures; + +typedef struct VkDevicePrivateDataCreateInfo { + VkStructureType sType; + const void* pNext; + uint32_t privateDataSlotRequestCount; +} VkDevicePrivateDataCreateInfo; + +typedef struct VkPrivateDataSlotCreateInfo { + VkStructureType sType; + const void* pNext; + VkPrivateDataSlotCreateFlags flags; +} VkPrivateDataSlotCreateInfo; + +typedef struct VkPhysicalDevicePipelineCreationCacheControlFeatures { + VkStructureType sType; + void* pNext; + VkBool32 pipelineCreationCacheControl; +} VkPhysicalDevicePipelineCreationCacheControlFeatures; + +typedef struct VkMemoryBarrier2 { + VkStructureType sType; + const void* pNext; + VkPipelineStageFlags2 srcStageMask; + VkAccessFlags2 srcAccessMask; + VkPipelineStageFlags2 dstStageMask; + VkAccessFlags2 dstAccessMask; +} VkMemoryBarrier2; + +typedef struct VkBufferMemoryBarrier2 { + VkStructureType sType; + const void* pNext; + VkPipelineStageFlags2 srcStageMask; + VkAccessFlags2 srcAccessMask; + VkPipelineStageFlags2 dstStageMask; + VkAccessFlags2 dstAccessMask; + uint32_t srcQueueFamilyIndex; + uint32_t dstQueueFamilyIndex; + VkBuffer buffer; + VkDeviceSize offset; + VkDeviceSize size; +} VkBufferMemoryBarrier2; + +typedef struct VkImageMemoryBarrier2 { + VkStructureType sType; + const void* pNext; + VkPipelineStageFlags2 srcStageMask; + VkAccessFlags2 srcAccessMask; + VkPipelineStageFlags2 dstStageMask; + VkAccessFlags2 dstAccessMask; + VkImageLayout oldLayout; + VkImageLayout newLayout; + uint32_t srcQueueFamilyIndex; + uint32_t dstQueueFamilyIndex; + VkImage image; + VkImageSubresourceRange subresourceRange; +} VkImageMemoryBarrier2; + +typedef struct VkDependencyInfo { + VkStructureType sType; + const void* pNext; + VkDependencyFlags dependencyFlags; + uint32_t memoryBarrierCount; + const VkMemoryBarrier2* pMemoryBarriers; + uint32_t bufferMemoryBarrierCount; + const VkBufferMemoryBarrier2* pBufferMemoryBarriers; + uint32_t imageMemoryBarrierCount; + const VkImageMemoryBarrier2* pImageMemoryBarriers; +} VkDependencyInfo; + +typedef struct VkSemaphoreSubmitInfo { + VkStructureType sType; + const void* pNext; + VkSemaphore semaphore; + uint64_t value; + VkPipelineStageFlags2 stageMask; + uint32_t deviceIndex; +} VkSemaphoreSubmitInfo; + +typedef struct VkCommandBufferSubmitInfo { + VkStructureType sType; + const void* pNext; + VkCommandBuffer commandBuffer; + uint32_t deviceMask; +} VkCommandBufferSubmitInfo; + +typedef struct VkSubmitInfo2 { + VkStructureType sType; + const void* pNext; + VkSubmitFlags flags; + uint32_t waitSemaphoreInfoCount; + const VkSemaphoreSubmitInfo* pWaitSemaphoreInfos; + uint32_t commandBufferInfoCount; + const VkCommandBufferSubmitInfo* pCommandBufferInfos; + uint32_t signalSemaphoreInfoCount; + const VkSemaphoreSubmitInfo* pSignalSemaphoreInfos; +} VkSubmitInfo2; + +typedef struct VkPhysicalDeviceSynchronization2Features { + VkStructureType sType; + void* pNext; + VkBool32 synchronization2; +} VkPhysicalDeviceSynchronization2Features; + +typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderZeroInitializeWorkgroupMemory; +} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures; + +typedef struct VkPhysicalDeviceImageRobustnessFeatures { + VkStructureType sType; + void* pNext; + VkBool32 robustImageAccess; +} VkPhysicalDeviceImageRobustnessFeatures; + +typedef struct VkBufferCopy2 { + VkStructureType sType; + const void* pNext; + VkDeviceSize srcOffset; + VkDeviceSize dstOffset; + VkDeviceSize size; +} VkBufferCopy2; + +typedef struct VkCopyBufferInfo2 { + VkStructureType sType; + const void* pNext; + VkBuffer srcBuffer; + VkBuffer dstBuffer; + uint32_t regionCount; + const VkBufferCopy2* pRegions; +} VkCopyBufferInfo2; + +typedef struct VkImageCopy2 { + VkStructureType sType; + const void* pNext; + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffset; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffset; + VkExtent3D extent; +} VkImageCopy2; + +typedef struct VkCopyImageInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkImageCopy2* pRegions; +} VkCopyImageInfo2; + +typedef struct VkBufferImageCopy2 { + VkStructureType sType; + const void* pNext; + VkDeviceSize bufferOffset; + uint32_t bufferRowLength; + uint32_t bufferImageHeight; + VkImageSubresourceLayers imageSubresource; + VkOffset3D imageOffset; + VkExtent3D imageExtent; +} VkBufferImageCopy2; + +typedef struct VkCopyBufferToImageInfo2 { + VkStructureType sType; + const void* pNext; + VkBuffer srcBuffer; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkBufferImageCopy2* pRegions; +} VkCopyBufferToImageInfo2; + +typedef struct VkCopyImageToBufferInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkBuffer dstBuffer; + uint32_t regionCount; + const VkBufferImageCopy2* pRegions; +} VkCopyImageToBufferInfo2; + +typedef struct VkImageBlit2 { + VkStructureType sType; + const void* pNext; + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffsets[2]; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffsets[2]; +} VkImageBlit2; + +typedef struct VkBlitImageInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkImageBlit2* pRegions; + VkFilter filter; +} VkBlitImageInfo2; + +typedef struct VkImageResolve2 { + VkStructureType sType; + const void* pNext; + VkImageSubresourceLayers srcSubresource; + VkOffset3D srcOffset; + VkImageSubresourceLayers dstSubresource; + VkOffset3D dstOffset; + VkExtent3D extent; +} VkImageResolve2; + +typedef struct VkResolveImageInfo2 { + VkStructureType sType; + const void* pNext; + VkImage srcImage; + VkImageLayout srcImageLayout; + VkImage dstImage; + VkImageLayout dstImageLayout; + uint32_t regionCount; + const VkImageResolve2* pRegions; +} VkResolveImageInfo2; + +typedef struct VkPhysicalDeviceSubgroupSizeControlFeatures { + VkStructureType sType; + void* pNext; + VkBool32 subgroupSizeControl; + VkBool32 computeFullSubgroups; +} VkPhysicalDeviceSubgroupSizeControlFeatures; + +typedef struct VkPhysicalDeviceSubgroupSizeControlProperties { + VkStructureType sType; + void* pNext; + uint32_t minSubgroupSize; + uint32_t maxSubgroupSize; + uint32_t maxComputeWorkgroupSubgroups; + VkShaderStageFlags requiredSubgroupSizeStages; +} VkPhysicalDeviceSubgroupSizeControlProperties; + +typedef struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfo { + VkStructureType sType; + void* pNext; + uint32_t requiredSubgroupSize; +} VkPipelineShaderStageRequiredSubgroupSizeCreateInfo; + +typedef struct VkPhysicalDeviceInlineUniformBlockFeatures { + VkStructureType sType; + void* pNext; + VkBool32 inlineUniformBlock; + VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind; +} VkPhysicalDeviceInlineUniformBlockFeatures; + +typedef struct VkPhysicalDeviceInlineUniformBlockProperties { + VkStructureType sType; + void* pNext; + uint32_t maxInlineUniformBlockSize; + uint32_t maxPerStageDescriptorInlineUniformBlocks; + uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks; + uint32_t maxDescriptorSetInlineUniformBlocks; + uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks; +} VkPhysicalDeviceInlineUniformBlockProperties; + +typedef struct VkWriteDescriptorSetInlineUniformBlock { + VkStructureType sType; + const void* pNext; + uint32_t dataSize; + const void* pData; +} VkWriteDescriptorSetInlineUniformBlock; + +typedef struct VkDescriptorPoolInlineUniformBlockCreateInfo { + VkStructureType sType; + const void* pNext; + uint32_t maxInlineUniformBlockBindings; +} VkDescriptorPoolInlineUniformBlockCreateInfo; + +typedef struct VkPhysicalDeviceTextureCompressionASTCHDRFeatures { + VkStructureType sType; + void* pNext; + VkBool32 textureCompressionASTC_HDR; +} VkPhysicalDeviceTextureCompressionASTCHDRFeatures; + +typedef struct VkRenderingAttachmentInfo { + VkStructureType sType; + const void* pNext; + VkImageView imageView; + VkImageLayout imageLayout; + VkResolveModeFlagBits resolveMode; + VkImageView resolveImageView; + VkImageLayout resolveImageLayout; + VkAttachmentLoadOp loadOp; + VkAttachmentStoreOp storeOp; + VkClearValue clearValue; +} VkRenderingAttachmentInfo; + +typedef struct VkRenderingInfo { + VkStructureType sType; + const void* pNext; + VkRenderingFlags flags; + VkRect2D renderArea; + uint32_t layerCount; + uint32_t viewMask; + uint32_t colorAttachmentCount; + const VkRenderingAttachmentInfo* pColorAttachments; + const VkRenderingAttachmentInfo* pDepthAttachment; + const VkRenderingAttachmentInfo* pStencilAttachment; +} VkRenderingInfo; + +typedef struct VkPipelineRenderingCreateInfo { + VkStructureType sType; + const void* pNext; + uint32_t viewMask; + uint32_t colorAttachmentCount; + const VkFormat* pColorAttachmentFormats; + VkFormat depthAttachmentFormat; + VkFormat stencilAttachmentFormat; +} VkPipelineRenderingCreateInfo; + +typedef struct VkPhysicalDeviceDynamicRenderingFeatures { + VkStructureType sType; + void* pNext; + VkBool32 dynamicRendering; +} VkPhysicalDeviceDynamicRenderingFeatures; + +typedef struct VkCommandBufferInheritanceRenderingInfo { + VkStructureType sType; + const void* pNext; + VkRenderingFlags flags; + uint32_t viewMask; + uint32_t colorAttachmentCount; + const VkFormat* pColorAttachmentFormats; + VkFormat depthAttachmentFormat; + VkFormat stencilAttachmentFormat; + VkSampleCountFlagBits rasterizationSamples; +} VkCommandBufferInheritanceRenderingInfo; + +typedef struct VkPhysicalDeviceShaderIntegerDotProductFeatures { + VkStructureType sType; + void* pNext; + VkBool32 shaderIntegerDotProduct; +} VkPhysicalDeviceShaderIntegerDotProductFeatures; + +typedef struct VkPhysicalDeviceShaderIntegerDotProductProperties { + VkStructureType sType; + void* pNext; + VkBool32 integerDotProduct8BitUnsignedAccelerated; + VkBool32 integerDotProduct8BitSignedAccelerated; + VkBool32 integerDotProduct8BitMixedSignednessAccelerated; + VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedSignedAccelerated; + VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProduct16BitUnsignedAccelerated; + VkBool32 integerDotProduct16BitSignedAccelerated; + VkBool32 integerDotProduct16BitMixedSignednessAccelerated; + VkBool32 integerDotProduct32BitUnsignedAccelerated; + VkBool32 integerDotProduct32BitSignedAccelerated; + VkBool32 integerDotProduct32BitMixedSignednessAccelerated; + VkBool32 integerDotProduct64BitUnsignedAccelerated; + VkBool32 integerDotProduct64BitSignedAccelerated; + VkBool32 integerDotProduct64BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated; + VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated; +} VkPhysicalDeviceShaderIntegerDotProductProperties; + +typedef struct VkPhysicalDeviceTexelBufferAlignmentProperties { + VkStructureType sType; + void* pNext; + VkDeviceSize storageTexelBufferOffsetAlignmentBytes; + VkBool32 storageTexelBufferOffsetSingleTexelAlignment; + VkDeviceSize uniformTexelBufferOffsetAlignmentBytes; + VkBool32 uniformTexelBufferOffsetSingleTexelAlignment; +} VkPhysicalDeviceTexelBufferAlignmentProperties; + +typedef struct VkFormatProperties3 { + VkStructureType sType; + void* pNext; + VkFormatFeatureFlags2 linearTilingFeatures; + VkFormatFeatureFlags2 optimalTilingFeatures; + VkFormatFeatureFlags2 bufferFeatures; +} VkFormatProperties3; + +typedef struct VkPhysicalDeviceMaintenance4Features { + VkStructureType sType; + void* pNext; + VkBool32 maintenance4; +} VkPhysicalDeviceMaintenance4Features; + +typedef struct VkPhysicalDeviceMaintenance4Properties { + VkStructureType sType; + void* pNext; + VkDeviceSize maxBufferSize; +} VkPhysicalDeviceMaintenance4Properties; + +typedef struct VkDeviceBufferMemoryRequirements { + VkStructureType sType; + const void* pNext; + const VkBufferCreateInfo* pCreateInfo; +} VkDeviceBufferMemoryRequirements; + +typedef struct VkDeviceImageMemoryRequirements { + VkStructureType sType; + const void* pNext; + const VkImageCreateInfo* pCreateInfo; + VkImageAspectFlagBits planeAspect; +} VkDeviceImageMemoryRequirements; + +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolProperties)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolProperties* pToolProperties); +typedef VkResult (VKAPI_PTR *PFN_vkCreatePrivateDataSlot)(VkDevice device, const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlot* pPrivateDataSlot); +typedef void (VKAPI_PTR *PFN_vkDestroyPrivateDataSlot)(VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateData)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data); +typedef void (VKAPI_PTR *PFN_vkGetPrivateData)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t* pData); +typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2)(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask); +typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfo* pDependencyInfos); +typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2)(VkCommandBuffer commandBuffer, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); +typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2* pSubmits, VkFence fence); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer2)(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2* pCopyBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImage2)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2* pCopyImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage2)(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer2)(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2* pBlitImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2* pResolveImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBeginRendering)(VkCommandBuffer commandBuffer, const VkRenderingInfo* pRenderingInfo); +typedef void (VKAPI_PTR *PFN_vkCmdEndRendering)(VkCommandBuffer commandBuffer); +typedef void (VKAPI_PTR *PFN_vkCmdSetCullMode)(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode); +typedef void (VKAPI_PTR *PFN_vkCmdSetFrontFace)(VkCommandBuffer commandBuffer, VkFrontFace frontFace); +typedef void (VKAPI_PTR *PFN_vkCmdSetPrimitiveTopology)(VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology); +typedef void (VKAPI_PTR *PFN_vkCmdSetViewportWithCount)(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports); +typedef void (VKAPI_PTR *PFN_vkCmdSetScissorWithCount)(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors); +typedef void (VKAPI_PTR *PFN_vkCmdBindVertexBuffers2)(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer* pBuffers, const VkDeviceSize* pOffsets, const VkDeviceSize* pSizes, const VkDeviceSize* pStrides); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthTestEnable)(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthWriteEnable)(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthCompareOp)(VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBoundsTestEnable)(VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetStencilTestEnable)(VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetStencilOp)(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp); +typedef void (VKAPI_PTR *PFN_vkCmdSetRasterizerDiscardEnable)(VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetDepthBiasEnable)(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable); +typedef void (VKAPI_PTR *PFN_vkCmdSetPrimitiveRestartEnable)(VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable); +typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirements)(VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirements)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceToolProperties( + VkPhysicalDevice physicalDevice, + uint32_t* pToolCount, + VkPhysicalDeviceToolProperties* pToolProperties); + +VKAPI_ATTR VkResult VKAPI_CALL vkCreatePrivateDataSlot( + VkDevice device, + const VkPrivateDataSlotCreateInfo* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkPrivateDataSlot* pPrivateDataSlot); + +VKAPI_ATTR void VKAPI_CALL vkDestroyPrivateDataSlot( + VkDevice device, + VkPrivateDataSlot privateDataSlot, + const VkAllocationCallbacks* pAllocator); + +VKAPI_ATTR VkResult VKAPI_CALL vkSetPrivateData( + VkDevice device, + VkObjectType objectType, + uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, + uint64_t data); + +VKAPI_ATTR void VKAPI_CALL vkGetPrivateData( + VkDevice device, + VkObjectType objectType, + uint64_t objectHandle, + VkPrivateDataSlot privateDataSlot, + uint64_t* pData); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent2( + VkCommandBuffer commandBuffer, + VkEvent event, + const VkDependencyInfo* pDependencyInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent2( + VkCommandBuffer commandBuffer, + VkEvent event, + VkPipelineStageFlags2 stageMask); + +VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents2( + VkCommandBuffer commandBuffer, + uint32_t eventCount, + const VkEvent* pEvents, + const VkDependencyInfo* pDependencyInfos); + +VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier2( + VkCommandBuffer commandBuffer, + const VkDependencyInfo* pDependencyInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp2( + VkCommandBuffer commandBuffer, + VkPipelineStageFlags2 stage, + VkQueryPool queryPool, + uint32_t query); + +VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit2( + VkQueue queue, + uint32_t submitCount, + const VkSubmitInfo2* pSubmits, + VkFence fence); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer2( + VkCommandBuffer commandBuffer, + const VkCopyBufferInfo2* pCopyBufferInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage2( + VkCommandBuffer commandBuffer, + const VkCopyImageInfo2* pCopyImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage2( + VkCommandBuffer commandBuffer, + const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer2( + VkCommandBuffer commandBuffer, + const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage2( + VkCommandBuffer commandBuffer, + const VkBlitImageInfo2* pBlitImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage2( + VkCommandBuffer commandBuffer, + const VkResolveImageInfo2* pResolveImageInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdBeginRendering( + VkCommandBuffer commandBuffer, + const VkRenderingInfo* pRenderingInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdEndRendering( + VkCommandBuffer commandBuffer); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetCullMode( + VkCommandBuffer commandBuffer, + VkCullModeFlags cullMode); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetFrontFace( + VkCommandBuffer commandBuffer, + VkFrontFace frontFace); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetPrimitiveTopology( + VkCommandBuffer commandBuffer, + VkPrimitiveTopology primitiveTopology); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetViewportWithCount( + VkCommandBuffer commandBuffer, + uint32_t viewportCount, + const VkViewport* pViewports); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetScissorWithCount( + VkCommandBuffer commandBuffer, + uint32_t scissorCount, + const VkRect2D* pScissors); + +VKAPI_ATTR void VKAPI_CALL vkCmdBindVertexBuffers2( + VkCommandBuffer commandBuffer, + uint32_t firstBinding, + uint32_t bindingCount, + const VkBuffer* pBuffers, + const VkDeviceSize* pOffsets, + const VkDeviceSize* pSizes, + const VkDeviceSize* pStrides); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthTestEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthTestEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthWriteEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthWriteEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthCompareOp( + VkCommandBuffer commandBuffer, + VkCompareOp depthCompareOp); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBoundsTestEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthBoundsTestEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilTestEnable( + VkCommandBuffer commandBuffer, + VkBool32 stencilTestEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilOp( + VkCommandBuffer commandBuffer, + VkStencilFaceFlags faceMask, + VkStencilOp failOp, + VkStencilOp passOp, + VkStencilOp depthFailOp, + VkCompareOp compareOp); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetRasterizerDiscardEnable( + VkCommandBuffer commandBuffer, + VkBool32 rasterizerDiscardEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBiasEnable( + VkCommandBuffer commandBuffer, + VkBool32 depthBiasEnable); + +VKAPI_ATTR void VKAPI_CALL vkCmdSetPrimitiveRestartEnable( + VkCommandBuffer commandBuffer, + VkBool32 primitiveRestartEnable); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirements( + VkDevice device, + const VkDeviceBufferMemoryRequirements* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirements( + VkDevice device, + const VkDeviceImageMemoryRequirements* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirements( + VkDevice device, + const VkDeviceImageMemoryRequirements* pInfo, + uint32_t* pSparseMemoryRequirementCount, + VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); +#endif + + #define VK_KHR_surface 1 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR) #define VK_KHR_SURFACE_SPEC_VERSION 25 @@ -6432,6 +7702,68 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSharedSwapchainsKHR( #define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME "VK_KHR_sampler_mirror_clamp_to_edge" +#define VK_KHR_dynamic_rendering 1 +#define VK_KHR_DYNAMIC_RENDERING_SPEC_VERSION 1 +#define VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME "VK_KHR_dynamic_rendering" +typedef VkRenderingFlags VkRenderingFlagsKHR; + +typedef VkRenderingFlagBits VkRenderingFlagBitsKHR; + +typedef VkRenderingInfo VkRenderingInfoKHR; + +typedef VkRenderingAttachmentInfo VkRenderingAttachmentInfoKHR; + +typedef VkPipelineRenderingCreateInfo VkPipelineRenderingCreateInfoKHR; + +typedef VkPhysicalDeviceDynamicRenderingFeatures VkPhysicalDeviceDynamicRenderingFeaturesKHR; + +typedef VkCommandBufferInheritanceRenderingInfo VkCommandBufferInheritanceRenderingInfoKHR; + +typedef struct VkRenderingFragmentShadingRateAttachmentInfoKHR { + VkStructureType sType; + const void* pNext; + VkImageView imageView; + VkImageLayout imageLayout; + VkExtent2D shadingRateAttachmentTexelSize; +} VkRenderingFragmentShadingRateAttachmentInfoKHR; + +typedef struct VkRenderingFragmentDensityMapAttachmentInfoEXT { + VkStructureType sType; + const void* pNext; + VkImageView imageView; + VkImageLayout imageLayout; +} VkRenderingFragmentDensityMapAttachmentInfoEXT; + +typedef struct VkAttachmentSampleCountInfoAMD { + VkStructureType sType; + const void* pNext; + uint32_t colorAttachmentCount; + const VkSampleCountFlagBits* pColorAttachmentSamples; + VkSampleCountFlagBits depthStencilAttachmentSamples; +} VkAttachmentSampleCountInfoAMD; + +typedef VkAttachmentSampleCountInfoAMD VkAttachmentSampleCountInfoNV; + +typedef struct VkMultiviewPerViewAttributesInfoNVX { + VkStructureType sType; + const void* pNext; + VkBool32 perViewAttributes; + VkBool32 perViewAttributesPositionXOnly; +} VkMultiviewPerViewAttributesInfoNVX; + +typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderingKHR)(VkCommandBuffer commandBuffer, const VkRenderingInfo* pRenderingInfo); +typedef void (VKAPI_PTR *PFN_vkCmdEndRenderingKHR)(VkCommandBuffer commandBuffer); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR void VKAPI_CALL vkCmdBeginRenderingKHR( + VkCommandBuffer commandBuffer, + const VkRenderingInfo* pRenderingInfo); + +VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderingKHR( + VkCommandBuffer commandBuffer); +#endif + + #define VK_KHR_multiview 1 #define VK_KHR_MULTIVIEW_SPEC_VERSION 1 #define VK_KHR_MULTIVIEW_EXTENSION_NAME "VK_KHR_multiview" @@ -6566,8 +7898,10 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDispatchBaseKHR( #define VK_KHR_maintenance1 1 -#define VK_KHR_MAINTENANCE1_SPEC_VERSION 2 -#define VK_KHR_MAINTENANCE1_EXTENSION_NAME "VK_KHR_maintenance1" +#define VK_KHR_MAINTENANCE_1_SPEC_VERSION 2 +#define VK_KHR_MAINTENANCE_1_EXTENSION_NAME "VK_KHR_maintenance1" +#define VK_KHR_MAINTENANCE1_SPEC_VERSION VK_KHR_MAINTENANCE_1_SPEC_VERSION +#define VK_KHR_MAINTENANCE1_EXTENSION_NAME VK_KHR_MAINTENANCE_1_EXTENSION_NAME typedef VkCommandPoolTrimFlags VkCommandPoolTrimFlagsKHR; typedef void (VKAPI_PTR *PFN_vkTrimCommandPoolKHR)(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags); @@ -7147,8 +8481,10 @@ VKAPI_ATTR void VKAPI_CALL vkReleaseProfilingLockKHR( #define VK_KHR_maintenance2 1 -#define VK_KHR_MAINTENANCE2_SPEC_VERSION 1 -#define VK_KHR_MAINTENANCE2_EXTENSION_NAME "VK_KHR_maintenance2" +#define VK_KHR_MAINTENANCE_2_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE_2_EXTENSION_NAME "VK_KHR_maintenance2" +#define VK_KHR_MAINTENANCE2_SPEC_VERSION VK_KHR_MAINTENANCE_2_SPEC_VERSION +#define VK_KHR_MAINTENANCE2_EXTENSION_NAME VK_KHR_MAINTENANCE_2_EXTENSION_NAME typedef VkPointClippingBehavior VkPointClippingBehaviorKHR; typedef VkTessellationDomainOrigin VkTessellationDomainOriginKHR; @@ -7401,8 +8737,10 @@ VKAPI_ATTR VkResult VKAPI_CALL vkBindImageMemory2KHR( #define VK_KHR_maintenance3 1 -#define VK_KHR_MAINTENANCE3_SPEC_VERSION 1 -#define VK_KHR_MAINTENANCE3_EXTENSION_NAME "VK_KHR_maintenance3" +#define VK_KHR_MAINTENANCE_3_SPEC_VERSION 1 +#define VK_KHR_MAINTENANCE_3_EXTENSION_NAME "VK_KHR_maintenance3" +#define VK_KHR_MAINTENANCE3_SPEC_VERSION VK_KHR_MAINTENANCE_3_SPEC_VERSION +#define VK_KHR_MAINTENANCE3_EXTENSION_NAME VK_KHR_MAINTENANCE_3_EXTENSION_NAME typedef VkPhysicalDeviceMaintenance3Properties VkPhysicalDeviceMaintenance3PropertiesKHR; typedef VkDescriptorSetLayoutSupport VkDescriptorSetLayoutSupportKHR; @@ -7477,6 +8815,43 @@ typedef struct VkPhysicalDeviceShaderClockFeaturesKHR { +#define VK_KHR_global_priority 1 +#define VK_MAX_GLOBAL_PRIORITY_SIZE_KHR 16U +#define VK_KHR_GLOBAL_PRIORITY_SPEC_VERSION 1 +#define VK_KHR_GLOBAL_PRIORITY_EXTENSION_NAME "VK_KHR_global_priority" + +typedef enum VkQueueGlobalPriorityKHR { + VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR = 128, + VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR = 256, + VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR = 512, + VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR = 1024, + VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT = VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR, + VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR, + VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT = VK_QUEUE_GLOBAL_PRIORITY_HIGH_KHR, + VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT = VK_QUEUE_GLOBAL_PRIORITY_REALTIME_KHR, + VK_QUEUE_GLOBAL_PRIORITY_MAX_ENUM_KHR = 0x7FFFFFFF +} VkQueueGlobalPriorityKHR; +typedef struct VkDeviceQueueGlobalPriorityCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkQueueGlobalPriorityKHR globalPriority; +} VkDeviceQueueGlobalPriorityCreateInfoKHR; + +typedef struct VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 globalPriorityQuery; +} VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR; + +typedef struct VkQueueFamilyGlobalPriorityPropertiesKHR { + VkStructureType sType; + void* pNext; + uint32_t priorityCount; + VkQueueGlobalPriorityKHR priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_KHR]; +} VkQueueFamilyGlobalPriorityPropertiesKHR; + + + #define VK_KHR_driver_properties 1 #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 #define VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME "VK_KHR_driver_properties" @@ -7569,16 +8944,12 @@ typedef VkPhysicalDeviceVulkanMemoryModelFeatures VkPhysicalDeviceVulkanMemoryMo #define VK_KHR_shader_terminate_invocation 1 #define VK_KHR_SHADER_TERMINATE_INVOCATION_SPEC_VERSION 1 #define VK_KHR_SHADER_TERMINATE_INVOCATION_EXTENSION_NAME "VK_KHR_shader_terminate_invocation" -typedef struct VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderTerminateInvocation; -} VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR; +typedef VkPhysicalDeviceShaderTerminateInvocationFeatures VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR; #define VK_KHR_fragment_shading_rate 1 -#define VK_KHR_FRAGMENT_SHADING_RATE_SPEC_VERSION 1 +#define VK_KHR_FRAGMENT_SHADING_RATE_SPEC_VERSION 2 #define VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME "VK_KHR_fragment_shading_rate" typedef enum VkFragmentShadingRateCombinerOpKHR { @@ -7870,46 +9241,9 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutableInternalRepresentationsKHR #define VK_KHR_shader_integer_dot_product 1 #define VK_KHR_SHADER_INTEGER_DOT_PRODUCT_SPEC_VERSION 1 #define VK_KHR_SHADER_INTEGER_DOT_PRODUCT_EXTENSION_NAME "VK_KHR_shader_integer_dot_product" -typedef struct VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderIntegerDotProduct; -} VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR; +typedef VkPhysicalDeviceShaderIntegerDotProductFeatures VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR; -typedef struct VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR { - VkStructureType sType; - void* pNext; - VkBool32 integerDotProduct8BitUnsignedAccelerated; - VkBool32 integerDotProduct8BitSignedAccelerated; - VkBool32 integerDotProduct8BitMixedSignednessAccelerated; - VkBool32 integerDotProduct4x8BitPackedUnsignedAccelerated; - VkBool32 integerDotProduct4x8BitPackedSignedAccelerated; - VkBool32 integerDotProduct4x8BitPackedMixedSignednessAccelerated; - VkBool32 integerDotProduct16BitUnsignedAccelerated; - VkBool32 integerDotProduct16BitSignedAccelerated; - VkBool32 integerDotProduct16BitMixedSignednessAccelerated; - VkBool32 integerDotProduct32BitUnsignedAccelerated; - VkBool32 integerDotProduct32BitSignedAccelerated; - VkBool32 integerDotProduct32BitMixedSignednessAccelerated; - VkBool32 integerDotProduct64BitUnsignedAccelerated; - VkBool32 integerDotProduct64BitSignedAccelerated; - VkBool32 integerDotProduct64BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating8BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating8BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating16BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating16BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating32BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating32BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated; - VkBool32 integerDotProductAccumulatingSaturating64BitUnsignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating64BitSignedAccelerated; - VkBool32 integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated; -} VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR; +typedef VkPhysicalDeviceShaderIntegerDotProductProperties VkPhysicalDeviceShaderIntegerDotProductPropertiesKHR; @@ -7949,261 +9283,94 @@ typedef struct VkPhysicalDevicePresentIdFeaturesKHR { #define VK_KHR_synchronization2 1 -typedef uint64_t VkFlags64; #define VK_KHR_SYNCHRONIZATION_2_SPEC_VERSION 1 #define VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME "VK_KHR_synchronization2" -typedef VkFlags64 VkPipelineStageFlags2KHR; +typedef VkPipelineStageFlags2 VkPipelineStageFlags2KHR; -// Flag bits for VkPipelineStageFlagBits2KHR -typedef VkFlags64 VkPipelineStageFlagBits2KHR; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_NONE_KHR = 0ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR = 0x00000001ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR = 0x00000002ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR = 0x00000004ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR = 0x00000008ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR = 0x00000010ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR = 0x00000020ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR = 0x00000040ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR = 0x00000080ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR = 0x00000100ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR = 0x00000200ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR = 0x00000400ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR = 0x00000800ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR = 0x00001000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR = 0x00001000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR = 0x00002000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_HOST_BIT_KHR = 0x00004000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR = 0x00008000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR = 0x00010000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COPY_BIT_KHR = 0x100000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR = 0x200000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_BLIT_BIT_KHR = 0x400000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR = 0x800000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR = 0x1000000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR = 0x2000000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR = 0x4000000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR = 0x04000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR = 0x08000000ULL; -#endif -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT = 0x00040000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV = 0x00020000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV = 0x00400000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR = 0x02000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR = 0x00200000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_NV = 0x00200000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_NV = 0x02000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_DENSITY_PROCESS_BIT_EXT = 0x00800000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_NV = 0x00080000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV = 0x00100000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI = 0x8000000000ULL; -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_INVOCATION_MASK_BIT_HUAWEI = 0x10000000000ULL; +typedef VkPipelineStageFlagBits2 VkPipelineStageFlagBits2KHR; -typedef VkFlags64 VkAccessFlags2KHR; +typedef VkAccessFlags2 VkAccessFlags2KHR; -// Flag bits for VkAccessFlagBits2KHR -typedef VkFlags64 VkAccessFlagBits2KHR; -static const VkAccessFlagBits2KHR VK_ACCESS_2_NONE_KHR = 0ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR = 0x00000001ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INDEX_READ_BIT_KHR = 0x00000002ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR = 0x00000004ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_UNIFORM_READ_BIT_KHR = 0x00000008ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR = 0x00000010ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_READ_BIT_KHR = 0x00000020ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_WRITE_BIT_KHR = 0x00000040ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR = 0x00000080ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR = 0x00000100ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR = 0x00000200ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR = 0x00000400ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFER_READ_BIT_KHR = 0x00000800ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR = 0x00001000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_HOST_READ_BIT_KHR = 0x00002000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_HOST_WRITE_BIT_KHR = 0x00004000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_MEMORY_READ_BIT_KHR = 0x00008000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_MEMORY_WRITE_BIT_KHR = 0x00010000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR = 0x100000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR = 0x200000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR = 0x400000000ULL; -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR = 0x800000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR = 0x1000000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR = 0x2000000000ULL; -#endif -#ifdef VK_ENABLE_BETA_EXTENSIONS -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR = 0x4000000000ULL; -#endif -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT = 0x00100000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV = 0x00020000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV = 0x00040000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR = 0x00800000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR = 0x00200000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR = 0x00400000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_NV = 0x00200000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_NV = 0x00400000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT = 0x01000000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT = 0x00080000ULL; -static const VkAccessFlagBits2KHR VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI = 0x8000000000ULL; +typedef VkAccessFlagBits2 VkAccessFlagBits2KHR; +typedef VkSubmitFlagBits VkSubmitFlagBitsKHR; -typedef enum VkSubmitFlagBitsKHR { - VK_SUBMIT_PROTECTED_BIT_KHR = 0x00000001, - VK_SUBMIT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkSubmitFlagBitsKHR; -typedef VkFlags VkSubmitFlagsKHR; -typedef struct VkMemoryBarrier2KHR { - VkStructureType sType; - const void* pNext; - VkPipelineStageFlags2KHR srcStageMask; - VkAccessFlags2KHR srcAccessMask; - VkPipelineStageFlags2KHR dstStageMask; - VkAccessFlags2KHR dstAccessMask; -} VkMemoryBarrier2KHR; +typedef VkSubmitFlags VkSubmitFlagsKHR; -typedef struct VkBufferMemoryBarrier2KHR { - VkStructureType sType; - const void* pNext; - VkPipelineStageFlags2KHR srcStageMask; - VkAccessFlags2KHR srcAccessMask; - VkPipelineStageFlags2KHR dstStageMask; - VkAccessFlags2KHR dstAccessMask; - uint32_t srcQueueFamilyIndex; - uint32_t dstQueueFamilyIndex; - VkBuffer buffer; - VkDeviceSize offset; - VkDeviceSize size; -} VkBufferMemoryBarrier2KHR; +typedef VkMemoryBarrier2 VkMemoryBarrier2KHR; -typedef struct VkImageMemoryBarrier2KHR { - VkStructureType sType; - const void* pNext; - VkPipelineStageFlags2KHR srcStageMask; - VkAccessFlags2KHR srcAccessMask; - VkPipelineStageFlags2KHR dstStageMask; - VkAccessFlags2KHR dstAccessMask; - VkImageLayout oldLayout; - VkImageLayout newLayout; - uint32_t srcQueueFamilyIndex; - uint32_t dstQueueFamilyIndex; - VkImage image; - VkImageSubresourceRange subresourceRange; -} VkImageMemoryBarrier2KHR; +typedef VkBufferMemoryBarrier2 VkBufferMemoryBarrier2KHR; -typedef struct VkDependencyInfoKHR { - VkStructureType sType; - const void* pNext; - VkDependencyFlags dependencyFlags; - uint32_t memoryBarrierCount; - const VkMemoryBarrier2KHR* pMemoryBarriers; - uint32_t bufferMemoryBarrierCount; - const VkBufferMemoryBarrier2KHR* pBufferMemoryBarriers; - uint32_t imageMemoryBarrierCount; - const VkImageMemoryBarrier2KHR* pImageMemoryBarriers; -} VkDependencyInfoKHR; +typedef VkImageMemoryBarrier2 VkImageMemoryBarrier2KHR; -typedef struct VkSemaphoreSubmitInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphore semaphore; - uint64_t value; - VkPipelineStageFlags2KHR stageMask; - uint32_t deviceIndex; -} VkSemaphoreSubmitInfoKHR; +typedef VkDependencyInfo VkDependencyInfoKHR; -typedef struct VkCommandBufferSubmitInfoKHR { - VkStructureType sType; - const void* pNext; - VkCommandBuffer commandBuffer; - uint32_t deviceMask; -} VkCommandBufferSubmitInfoKHR; +typedef VkSubmitInfo2 VkSubmitInfo2KHR; -typedef struct VkSubmitInfo2KHR { - VkStructureType sType; - const void* pNext; - VkSubmitFlagsKHR flags; - uint32_t waitSemaphoreInfoCount; - const VkSemaphoreSubmitInfoKHR* pWaitSemaphoreInfos; - uint32_t commandBufferInfoCount; - const VkCommandBufferSubmitInfoKHR* pCommandBufferInfos; - uint32_t signalSemaphoreInfoCount; - const VkSemaphoreSubmitInfoKHR* pSignalSemaphoreInfos; -} VkSubmitInfo2KHR; +typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfoKHR; -typedef struct VkPhysicalDeviceSynchronization2FeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 synchronization2; -} VkPhysicalDeviceSynchronization2FeaturesKHR; +typedef VkCommandBufferSubmitInfo VkCommandBufferSubmitInfoKHR; + +typedef VkPhysicalDeviceSynchronization2Features VkPhysicalDeviceSynchronization2FeaturesKHR; typedef struct VkQueueFamilyCheckpointProperties2NV { - VkStructureType sType; - void* pNext; - VkPipelineStageFlags2KHR checkpointExecutionStageMask; + VkStructureType sType; + void* pNext; + VkPipelineStageFlags2 checkpointExecutionStageMask; } VkQueueFamilyCheckpointProperties2NV; typedef struct VkCheckpointData2NV { - VkStructureType sType; - void* pNext; - VkPipelineStageFlags2KHR stage; - void* pCheckpointMarker; + VkStructureType sType; + void* pNext; + VkPipelineStageFlags2 stage; + void* pCheckpointMarker; } VkCheckpointData2NV; -typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfoKHR* pDependencyInfo); -typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2KHR stageMask); -typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2KHR)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfoKHR* pDependencyInfos); -typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2KHR)(VkCommandBuffer commandBuffer, const VkDependencyInfoKHR* pDependencyInfo); -typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2KHR)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkQueryPool queryPool, uint32_t query); -typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2KHR)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence); -typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarker2AMD)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2KHR stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); +typedef void (VKAPI_PTR *PFN_vkCmdSetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResetEvent2KHR)(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags2 stageMask); +typedef void (VKAPI_PTR *PFN_vkCmdWaitEvents2KHR)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, const VkDependencyInfo* pDependencyInfos); +typedef void (VKAPI_PTR *PFN_vkCmdPipelineBarrier2KHR)(VkCommandBuffer commandBuffer, const VkDependencyInfo* pDependencyInfo); +typedef void (VKAPI_PTR *PFN_vkCmdWriteTimestamp2KHR)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); +typedef VkResult (VKAPI_PTR *PFN_vkQueueSubmit2KHR)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2* pSubmits, VkFence fence); +typedef void (VKAPI_PTR *PFN_vkCmdWriteBufferMarker2AMD)(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); typedef void (VKAPI_PTR *PFN_vkGetQueueCheckpointData2NV)(VkQueue queue, uint32_t* pCheckpointDataCount, VkCheckpointData2NV* pCheckpointData); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, - const VkDependencyInfoKHR* pDependencyInfo); + const VkDependencyInfo* pDependencyInfo); VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent2KHR( VkCommandBuffer commandBuffer, VkEvent event, - VkPipelineStageFlags2KHR stageMask); + VkPipelineStageFlags2 stageMask); VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents2KHR( VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, - const VkDependencyInfoKHR* pDependencyInfos); + const VkDependencyInfo* pDependencyInfos); VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier2KHR( VkCommandBuffer commandBuffer, - const VkDependencyInfoKHR* pDependencyInfo); + const VkDependencyInfo* pDependencyInfo); VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp2KHR( VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, + VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query); VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit2KHR( VkQueue queue, uint32_t submitCount, - const VkSubmitInfo2KHR* pSubmits, + const VkSubmitInfo2* pSubmits, VkFence fence); VKAPI_ATTR void VKAPI_CALL vkCmdWriteBufferMarker2AMD( VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, + VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker); @@ -8229,11 +9396,7 @@ typedef struct VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR { #define VK_KHR_zero_initialize_workgroup_memory 1 #define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_SPEC_VERSION 1 #define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_EXTENSION_NAME "VK_KHR_zero_initialize_workgroup_memory" -typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderZeroInitializeWorkgroupMemory; -} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR; +typedef VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeatures VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR; @@ -8254,148 +9417,109 @@ typedef struct VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR { #define VK_KHR_copy_commands2 1 #define VK_KHR_COPY_COMMANDS_2_SPEC_VERSION 1 #define VK_KHR_COPY_COMMANDS_2_EXTENSION_NAME "VK_KHR_copy_commands2" -typedef struct VkBufferCopy2KHR { - VkStructureType sType; - const void* pNext; - VkDeviceSize srcOffset; - VkDeviceSize dstOffset; - VkDeviceSize size; -} VkBufferCopy2KHR; +typedef VkCopyBufferInfo2 VkCopyBufferInfo2KHR; -typedef struct VkCopyBufferInfo2KHR { - VkStructureType sType; - const void* pNext; - VkBuffer srcBuffer; - VkBuffer dstBuffer; - uint32_t regionCount; - const VkBufferCopy2KHR* pRegions; -} VkCopyBufferInfo2KHR; +typedef VkCopyImageInfo2 VkCopyImageInfo2KHR; -typedef struct VkImageCopy2KHR { - VkStructureType sType; - const void* pNext; - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D extent; -} VkImageCopy2KHR; +typedef VkCopyBufferToImageInfo2 VkCopyBufferToImageInfo2KHR; -typedef struct VkCopyImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkImageCopy2KHR* pRegions; -} VkCopyImageInfo2KHR; +typedef VkCopyImageToBufferInfo2 VkCopyImageToBufferInfo2KHR; -typedef struct VkBufferImageCopy2KHR { - VkStructureType sType; - const void* pNext; - VkDeviceSize bufferOffset; - uint32_t bufferRowLength; - uint32_t bufferImageHeight; - VkImageSubresourceLayers imageSubresource; - VkOffset3D imageOffset; - VkExtent3D imageExtent; -} VkBufferImageCopy2KHR; +typedef VkBlitImageInfo2 VkBlitImageInfo2KHR; -typedef struct VkCopyBufferToImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkBuffer srcBuffer; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkBufferImageCopy2KHR* pRegions; -} VkCopyBufferToImageInfo2KHR; +typedef VkResolveImageInfo2 VkResolveImageInfo2KHR; -typedef struct VkCopyImageToBufferInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkBuffer dstBuffer; - uint32_t regionCount; - const VkBufferImageCopy2KHR* pRegions; -} VkCopyImageToBufferInfo2KHR; +typedef VkBufferCopy2 VkBufferCopy2KHR; -typedef struct VkImageBlit2KHR { - VkStructureType sType; - const void* pNext; - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffsets[2]; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffsets[2]; -} VkImageBlit2KHR; +typedef VkImageCopy2 VkImageCopy2KHR; -typedef struct VkBlitImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkImageBlit2KHR* pRegions; - VkFilter filter; -} VkBlitImageInfo2KHR; +typedef VkImageBlit2 VkImageBlit2KHR; -typedef struct VkImageResolve2KHR { - VkStructureType sType; - const void* pNext; - VkImageSubresourceLayers srcSubresource; - VkOffset3D srcOffset; - VkImageSubresourceLayers dstSubresource; - VkOffset3D dstOffset; - VkExtent3D extent; -} VkImageResolve2KHR; +typedef VkBufferImageCopy2 VkBufferImageCopy2KHR; -typedef struct VkResolveImageInfo2KHR { - VkStructureType sType; - const void* pNext; - VkImage srcImage; - VkImageLayout srcImageLayout; - VkImage dstImage; - VkImageLayout dstImageLayout; - uint32_t regionCount; - const VkImageResolve2KHR* pRegions; -} VkResolveImageInfo2KHR; +typedef VkImageResolve2 VkImageResolve2KHR; -typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR* pCopyBufferInfo); -typedef void (VKAPI_PTR *PFN_vkCmdCopyImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR* pCopyImageInfo); -typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo); -typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo); -typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2KHR)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR* pBlitImageInfo); -typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2KHR)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR* pResolveImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2* pCopyBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2* pCopyImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); +typedef void (VKAPI_PTR *PFN_vkCmdBlitImage2KHR)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2* pBlitImageInfo); +typedef void (VKAPI_PTR *PFN_vkCmdResolveImage2KHR)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2* pResolveImageInfo); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer2KHR( VkCommandBuffer commandBuffer, - const VkCopyBufferInfo2KHR* pCopyBufferInfo); + const VkCopyBufferInfo2* pCopyBufferInfo); VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage2KHR( VkCommandBuffer commandBuffer, - const VkCopyImageInfo2KHR* pCopyImageInfo); + const VkCopyImageInfo2* pCopyImageInfo); VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage2KHR( VkCommandBuffer commandBuffer, - const VkCopyBufferToImageInfo2KHR* pCopyBufferToImageInfo); + const VkCopyBufferToImageInfo2* pCopyBufferToImageInfo); VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer2KHR( VkCommandBuffer commandBuffer, - const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo); + const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo); VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage2KHR( VkCommandBuffer commandBuffer, - const VkBlitImageInfo2KHR* pBlitImageInfo); + const VkBlitImageInfo2* pBlitImageInfo); VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage2KHR( VkCommandBuffer commandBuffer, - const VkResolveImageInfo2KHR* pResolveImageInfo); + const VkResolveImageInfo2* pResolveImageInfo); +#endif + + +#define VK_KHR_format_feature_flags2 1 +#define VK_KHR_FORMAT_FEATURE_FLAGS_2_SPEC_VERSION 1 +#define VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME "VK_KHR_format_feature_flags2" +typedef VkFormatFeatureFlags2 VkFormatFeatureFlags2KHR; + +typedef VkFormatFeatureFlagBits2 VkFormatFeatureFlagBits2KHR; + +typedef VkFormatProperties3 VkFormatProperties3KHR; + + + +#define VK_KHR_portability_enumeration 1 +#define VK_KHR_PORTABILITY_ENUMERATION_SPEC_VERSION 1 +#define VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME "VK_KHR_portability_enumeration" + + +#define VK_KHR_maintenance4 1 +#define VK_KHR_MAINTENANCE_4_SPEC_VERSION 2 +#define VK_KHR_MAINTENANCE_4_EXTENSION_NAME "VK_KHR_maintenance4" +typedef VkPhysicalDeviceMaintenance4Features VkPhysicalDeviceMaintenance4FeaturesKHR; + +typedef VkPhysicalDeviceMaintenance4Properties VkPhysicalDeviceMaintenance4PropertiesKHR; + +typedef VkDeviceBufferMemoryRequirements VkDeviceBufferMemoryRequirementsKHR; + +typedef VkDeviceImageMemoryRequirements VkDeviceImageMemoryRequirementsKHR; + +typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirementsKHR)(VkDevice device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirementsKHR( + VkDevice device, + const VkDeviceBufferMemoryRequirements* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirementsKHR( + VkDevice device, + const VkDeviceImageMemoryRequirements* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirementsKHR( + VkDevice device, + const VkDeviceImageMemoryRequirements* pInfo, + uint32_t* pSparseMemoryRequirementCount, + VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); #endif @@ -8443,6 +9567,7 @@ typedef enum VkDebugReportObjectTypeEXT { VK_DEBUG_REPORT_OBJECT_TYPE_CU_FUNCTION_NVX_EXT = 1000029001, VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR_EXT = 1000150000, VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT = 1000165000, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT = 1000366000, VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT = VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_EXT, @@ -9028,11 +10153,7 @@ typedef struct VkValidationFlagsEXT { #define VK_EXT_texture_compression_astc_hdr 1 #define VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_SPEC_VERSION 1 #define VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME "VK_EXT_texture_compression_astc_hdr" -typedef struct VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 textureCompressionASTC_HDR; -} VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT; +typedef VkPhysicalDeviceTextureCompressionASTCHDRFeatures VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT; @@ -9302,8 +10423,10 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPastPresentationTimingGOOGLE( #define VK_NV_viewport_array2 1 -#define VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION 1 -#define VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME "VK_NV_viewport_array2" +#define VK_NV_VIEWPORT_ARRAY_2_SPEC_VERSION 1 +#define VK_NV_VIEWPORT_ARRAY_2_EXTENSION_NAME "VK_NV_viewport_array2" +#define VK_NV_VIEWPORT_ARRAY2_SPEC_VERSION VK_NV_VIEWPORT_ARRAY_2_SPEC_VERSION +#define VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME VK_NV_VIEWPORT_ARRAY_2_EXTENSION_NAME #define VK_NVX_multiview_per_view_attributes 1 @@ -9658,35 +10781,13 @@ typedef VkPhysicalDeviceSamplerFilterMinmaxProperties VkPhysicalDeviceSamplerFil #define VK_EXT_inline_uniform_block 1 #define VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION 1 #define VK_EXT_INLINE_UNIFORM_BLOCK_EXTENSION_NAME "VK_EXT_inline_uniform_block" -typedef struct VkPhysicalDeviceInlineUniformBlockFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 inlineUniformBlock; - VkBool32 descriptorBindingInlineUniformBlockUpdateAfterBind; -} VkPhysicalDeviceInlineUniformBlockFeaturesEXT; +typedef VkPhysicalDeviceInlineUniformBlockFeatures VkPhysicalDeviceInlineUniformBlockFeaturesEXT; -typedef struct VkPhysicalDeviceInlineUniformBlockPropertiesEXT { - VkStructureType sType; - void* pNext; - uint32_t maxInlineUniformBlockSize; - uint32_t maxPerStageDescriptorInlineUniformBlocks; - uint32_t maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks; - uint32_t maxDescriptorSetInlineUniformBlocks; - uint32_t maxDescriptorSetUpdateAfterBindInlineUniformBlocks; -} VkPhysicalDeviceInlineUniformBlockPropertiesEXT; +typedef VkPhysicalDeviceInlineUniformBlockProperties VkPhysicalDeviceInlineUniformBlockPropertiesEXT; -typedef struct VkWriteDescriptorSetInlineUniformBlockEXT { - VkStructureType sType; - const void* pNext; - uint32_t dataSize; - const void* pData; -} VkWriteDescriptorSetInlineUniformBlockEXT; +typedef VkWriteDescriptorSetInlineUniformBlock VkWriteDescriptorSetInlineUniformBlockEXT; -typedef struct VkDescriptorPoolInlineUniformBlockCreateInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t maxInlineUniformBlockBindings; -} VkDescriptorPoolInlineUniformBlockCreateInfoEXT; +typedef VkDescriptorPoolInlineUniformBlockCreateInfo VkDescriptorPoolInlineUniformBlockCreateInfoEXT; @@ -9873,7 +10974,7 @@ typedef struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV { #define VK_EXT_image_drm_format_modifier 1 -#define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION 1 +#define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION 2 #define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME "VK_EXT_image_drm_format_modifier" typedef struct VkDrmFormatModifierPropertiesEXT { uint64_t drmFormatModifier; @@ -9918,6 +11019,19 @@ typedef struct VkImageDrmFormatModifierPropertiesEXT { uint64_t drmFormatModifier; } VkImageDrmFormatModifierPropertiesEXT; +typedef struct VkDrmFormatModifierProperties2EXT { + uint64_t drmFormatModifier; + uint32_t drmFormatModifierPlaneCount; + VkFormatFeatureFlags2 drmFormatModifierTilingFeatures; +} VkDrmFormatModifierProperties2EXT; + +typedef struct VkDrmFormatModifierPropertiesList2EXT { + VkStructureType sType; + void* pNext; + uint32_t drmFormatModifierCount; + VkDrmFormatModifierProperties2EXT* pDrmFormatModifierProperties; +} VkDrmFormatModifierPropertiesList2EXT; + typedef VkResult (VKAPI_PTR *PFN_vkGetImageDrmFormatModifierPropertiesEXT)(VkDevice device, VkImage image, VkImageDrmFormatModifierPropertiesEXT* pProperties); #ifndef VK_NO_PROTOTYPES @@ -10519,19 +11633,9 @@ typedef struct VkFilterCubicImageViewImageFormatPropertiesEXT { #define VK_EXT_global_priority 1 #define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 2 #define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" +typedef VkQueueGlobalPriorityKHR VkQueueGlobalPriorityEXT; -typedef enum VkQueueGlobalPriorityEXT { - VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT = 128, - VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT = 256, - VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT = 512, - VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT = 1024, - VK_QUEUE_GLOBAL_PRIORITY_MAX_ENUM_EXT = 0x7FFFFFFF -} VkQueueGlobalPriorityEXT; -typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkQueueGlobalPriorityEXT globalPriority; -} VkDeviceQueueGlobalPriorityCreateInfoEXT; +typedef VkDeviceQueueGlobalPriorityCreateInfoKHR VkDeviceQueueGlobalPriorityCreateInfoEXT; @@ -10709,26 +11813,13 @@ typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT { #define VK_EXT_pipeline_creation_feedback 1 #define VK_EXT_PIPELINE_CREATION_FEEDBACK_SPEC_VERSION 1 #define VK_EXT_PIPELINE_CREATION_FEEDBACK_EXTENSION_NAME "VK_EXT_pipeline_creation_feedback" +typedef VkPipelineCreationFeedbackFlagBits VkPipelineCreationFeedbackFlagBitsEXT; -typedef enum VkPipelineCreationFeedbackFlagBitsEXT { - VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT = 0x00000001, - VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT_EXT = 0x00000002, - VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT_EXT = 0x00000004, - VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkPipelineCreationFeedbackFlagBitsEXT; -typedef VkFlags VkPipelineCreationFeedbackFlagsEXT; -typedef struct VkPipelineCreationFeedbackEXT { - VkPipelineCreationFeedbackFlagsEXT flags; - uint64_t duration; -} VkPipelineCreationFeedbackEXT; +typedef VkPipelineCreationFeedbackFlags VkPipelineCreationFeedbackFlagsEXT; -typedef struct VkPipelineCreationFeedbackCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkPipelineCreationFeedbackEXT* pPipelineCreationFeedback; - uint32_t pipelineStageCreationFeedbackCount; - VkPipelineCreationFeedbackEXT* pPipelineStageCreationFeedbacks; -} VkPipelineCreationFeedbackCreateInfoEXT; +typedef VkPipelineCreationFeedbackCreateInfo VkPipelineCreationFeedbackCreateInfoEXT; + +typedef VkPipelineCreationFeedback VkPipelineCreationFeedbackEXT; @@ -11079,7 +12170,7 @@ VKAPI_ATTR void VKAPI_CALL vkSetLocalDimmingAMD( #define VK_EXT_fragment_density_map 1 -#define VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION 1 +#define VK_EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION 2 #define VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME "VK_EXT_fragment_density_map" typedef struct VkPhysicalDeviceFragmentDensityMapFeaturesEXT { VkStructureType sType; @@ -11113,8 +12204,10 @@ typedef VkPhysicalDeviceScalarBlockLayoutFeatures VkPhysicalDeviceScalarBlockLay #define VK_GOOGLE_hlsl_functionality1 1 -#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 1 -#define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1" +#define VK_GOOGLE_HLSL_FUNCTIONALITY_1_SPEC_VERSION 1 +#define VK_GOOGLE_HLSL_FUNCTIONALITY_1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1" +#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION VK_GOOGLE_HLSL_FUNCTIONALITY_1_SPEC_VERSION +#define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME VK_GOOGLE_HLSL_FUNCTIONALITY_1_EXTENSION_NAME #define VK_GOOGLE_decorate_string 1 @@ -11125,27 +12218,11 @@ typedef VkPhysicalDeviceScalarBlockLayoutFeatures VkPhysicalDeviceScalarBlockLay #define VK_EXT_subgroup_size_control 1 #define VK_EXT_SUBGROUP_SIZE_CONTROL_SPEC_VERSION 2 #define VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME "VK_EXT_subgroup_size_control" -typedef struct VkPhysicalDeviceSubgroupSizeControlFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 subgroupSizeControl; - VkBool32 computeFullSubgroups; -} VkPhysicalDeviceSubgroupSizeControlFeaturesEXT; +typedef VkPhysicalDeviceSubgroupSizeControlFeatures VkPhysicalDeviceSubgroupSizeControlFeaturesEXT; -typedef struct VkPhysicalDeviceSubgroupSizeControlPropertiesEXT { - VkStructureType sType; - void* pNext; - uint32_t minSubgroupSize; - uint32_t maxSubgroupSize; - uint32_t maxComputeWorkgroupSubgroups; - VkShaderStageFlags requiredSubgroupSizeStages; -} VkPhysicalDeviceSubgroupSizeControlPropertiesEXT; +typedef VkPhysicalDeviceSubgroupSizeControlProperties VkPhysicalDeviceSubgroupSizeControlPropertiesEXT; -typedef struct VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT { - VkStructureType sType; - void* pNext; - uint32_t requiredSubgroupSize; -} VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT; +typedef VkPipelineShaderStageRequiredSubgroupSizeCreateInfo VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT; @@ -11262,35 +12339,19 @@ VKAPI_ATTR VkDeviceAddress VKAPI_CALL vkGetBufferDeviceAddressEXT( #define VK_EXT_tooling_info 1 #define VK_EXT_TOOLING_INFO_SPEC_VERSION 1 #define VK_EXT_TOOLING_INFO_EXTENSION_NAME "VK_EXT_tooling_info" +typedef VkToolPurposeFlagBits VkToolPurposeFlagBitsEXT; -typedef enum VkToolPurposeFlagBitsEXT { - VK_TOOL_PURPOSE_VALIDATION_BIT_EXT = 0x00000001, - VK_TOOL_PURPOSE_PROFILING_BIT_EXT = 0x00000002, - VK_TOOL_PURPOSE_TRACING_BIT_EXT = 0x00000004, - VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT_EXT = 0x00000008, - VK_TOOL_PURPOSE_MODIFYING_FEATURES_BIT_EXT = 0x00000010, - VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT = 0x00000020, - VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT = 0x00000040, - VK_TOOL_PURPOSE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkToolPurposeFlagBitsEXT; -typedef VkFlags VkToolPurposeFlagsEXT; -typedef struct VkPhysicalDeviceToolPropertiesEXT { - VkStructureType sType; - void* pNext; - char name[VK_MAX_EXTENSION_NAME_SIZE]; - char version[VK_MAX_EXTENSION_NAME_SIZE]; - VkToolPurposeFlagsEXT purposes; - char description[VK_MAX_DESCRIPTION_SIZE]; - char layer[VK_MAX_EXTENSION_NAME_SIZE]; -} VkPhysicalDeviceToolPropertiesEXT; +typedef VkToolPurposeFlags VkToolPurposeFlagsEXT; -typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolPropertiesEXT)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolPropertiesEXT* pToolProperties); +typedef VkPhysicalDeviceToolProperties VkPhysicalDeviceToolPropertiesEXT; + +typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceToolPropertiesEXT)(VkPhysicalDevice physicalDevice, uint32_t* pToolCount, VkPhysicalDeviceToolProperties* pToolProperties); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceToolPropertiesEXT( VkPhysicalDevice physicalDevice, uint32_t* pToolCount, - VkPhysicalDeviceToolPropertiesEXT* pToolProperties); + VkPhysicalDeviceToolProperties* pToolProperties); #endif @@ -11721,11 +12782,7 @@ typedef struct VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT { #define VK_EXT_shader_demote_to_helper_invocation 1 #define VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_SPEC_VERSION 1 #define VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME "VK_EXT_shader_demote_to_helper_invocation" -typedef struct VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 shaderDemoteToHelperInvocation; -} VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT; +typedef VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT; @@ -11947,14 +13004,7 @@ typedef struct VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT { VkBool32 texelBufferAlignment; } VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT; -typedef struct VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT { - VkStructureType sType; - void* pNext; - VkDeviceSize storageTexelBufferOffsetAlignmentBytes; - VkBool32 storageTexelBufferOffsetSingleTexelAlignment; - VkDeviceSize uniformTexelBufferOffsetAlignmentBytes; - VkBool32 uniformTexelBufferOffsetSingleTexelAlignment; -} VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT; +typedef VkPhysicalDeviceTexelBufferAlignmentProperties VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT; @@ -12092,61 +13142,47 @@ typedef struct VkPhysicalDeviceCustomBorderColorFeaturesEXT { #define VK_EXT_private_data 1 -VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkPrivateDataSlotEXT) +typedef VkPrivateDataSlot VkPrivateDataSlotEXT; + #define VK_EXT_PRIVATE_DATA_SPEC_VERSION 1 #define VK_EXT_PRIVATE_DATA_EXTENSION_NAME "VK_EXT_private_data" +typedef VkPrivateDataSlotCreateFlags VkPrivateDataSlotCreateFlagsEXT; -typedef enum VkPrivateDataSlotCreateFlagBitsEXT { - VK_PRIVATE_DATA_SLOT_CREATE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF -} VkPrivateDataSlotCreateFlagBitsEXT; -typedef VkFlags VkPrivateDataSlotCreateFlagsEXT; -typedef struct VkPhysicalDevicePrivateDataFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 privateData; -} VkPhysicalDevicePrivateDataFeaturesEXT; +typedef VkPhysicalDevicePrivateDataFeatures VkPhysicalDevicePrivateDataFeaturesEXT; -typedef struct VkDevicePrivateDataCreateInfoEXT { - VkStructureType sType; - const void* pNext; - uint32_t privateDataSlotRequestCount; -} VkDevicePrivateDataCreateInfoEXT; +typedef VkDevicePrivateDataCreateInfo VkDevicePrivateDataCreateInfoEXT; -typedef struct VkPrivateDataSlotCreateInfoEXT { - VkStructureType sType; - const void* pNext; - VkPrivateDataSlotCreateFlagsEXT flags; -} VkPrivateDataSlotCreateInfoEXT; +typedef VkPrivateDataSlotCreateInfo VkPrivateDataSlotCreateInfoEXT; -typedef VkResult (VKAPI_PTR *PFN_vkCreatePrivateDataSlotEXT)(VkDevice device, const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlotEXT* pPrivateDataSlot); -typedef void (VKAPI_PTR *PFN_vkDestroyPrivateDataSlotEXT)(VkDevice device, VkPrivateDataSlotEXT privateDataSlot, const VkAllocationCallbacks* pAllocator); -typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data); -typedef void (VKAPI_PTR *PFN_vkGetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t* pData); +typedef VkResult (VKAPI_PTR *PFN_vkCreatePrivateDataSlotEXT)(VkDevice device, const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPrivateDataSlot* pPrivateDataSlot); +typedef void (VKAPI_PTR *PFN_vkDestroyPrivateDataSlotEXT)(VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator); +typedef VkResult (VKAPI_PTR *PFN_vkSetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data); +typedef void (VKAPI_PTR *PFN_vkGetPrivateDataEXT)(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t* pData); #ifndef VK_NO_PROTOTYPES VKAPI_ATTR VkResult VKAPI_CALL vkCreatePrivateDataSlotEXT( VkDevice device, - const VkPrivateDataSlotCreateInfoEXT* pCreateInfo, + const VkPrivateDataSlotCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, - VkPrivateDataSlotEXT* pPrivateDataSlot); + VkPrivateDataSlot* pPrivateDataSlot); VKAPI_ATTR void VKAPI_CALL vkDestroyPrivateDataSlotEXT( VkDevice device, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator); VKAPI_ATTR VkResult VKAPI_CALL vkSetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, uint64_t data); VKAPI_ATTR void VKAPI_CALL vkGetPrivateDataEXT( VkDevice device, VkObjectType objectType, uint64_t objectHandle, - VkPrivateDataSlotEXT privateDataSlot, + VkPrivateDataSlot privateDataSlot, uint64_t* pData); #endif @@ -12154,11 +13190,7 @@ VKAPI_ATTR void VKAPI_CALL vkGetPrivateDataEXT( #define VK_EXT_pipeline_creation_cache_control 1 #define VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_SPEC_VERSION 3 #define VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_EXTENSION_NAME "VK_EXT_pipeline_creation_cache_control" -typedef struct VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 pipelineCreationCacheControl; -} VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT; +typedef VkPhysicalDevicePipelineCreationCacheControlFeatures VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT; @@ -12192,6 +13224,39 @@ typedef struct VkDeviceDiagnosticsConfigCreateInfoNV { #define VK_QCOM_RENDER_PASS_STORE_OPS_EXTENSION_NAME "VK_QCOM_render_pass_store_ops" +#define VK_EXT_graphics_pipeline_library 1 +#define VK_EXT_GRAPHICS_PIPELINE_LIBRARY_SPEC_VERSION 1 +#define VK_EXT_GRAPHICS_PIPELINE_LIBRARY_EXTENSION_NAME "VK_EXT_graphics_pipeline_library" + +typedef enum VkGraphicsPipelineLibraryFlagBitsEXT { + VK_GRAPHICS_PIPELINE_LIBRARY_VERTEX_INPUT_INTERFACE_BIT_EXT = 0x00000001, + VK_GRAPHICS_PIPELINE_LIBRARY_PRE_RASTERIZATION_SHADERS_BIT_EXT = 0x00000002, + VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_SHADER_BIT_EXT = 0x00000004, + VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT = 0x00000008, + VK_GRAPHICS_PIPELINE_LIBRARY_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF +} VkGraphicsPipelineLibraryFlagBitsEXT; +typedef VkFlags VkGraphicsPipelineLibraryFlagsEXT; +typedef struct VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 graphicsPipelineLibrary; +} VkPhysicalDeviceGraphicsPipelineLibraryFeaturesEXT; + +typedef struct VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT { + VkStructureType sType; + void* pNext; + VkBool32 graphicsPipelineLibraryFastLinking; + VkBool32 graphicsPipelineLibraryIndependentInterpolationDecoration; +} VkPhysicalDeviceGraphicsPipelineLibraryPropertiesEXT; + +typedef struct VkGraphicsPipelineLibraryCreateInfoEXT { + VkStructureType sType; + void* pNext; + VkGraphicsPipelineLibraryFlagsEXT flags; +} VkGraphicsPipelineLibraryCreateInfoEXT; + + + #define VK_NV_fragment_shading_rate_enums 1 #define VK_NV_FRAGMENT_SHADING_RATE_ENUMS_SPEC_VERSION 1 #define VK_NV_FRAGMENT_SHADING_RATE_ENUMS_EXTENSION_NAME "VK_NV_fragment_shading_rate_enums" @@ -12384,11 +13449,7 @@ typedef struct VkCopyCommandTransformInfoQCOM { #define VK_EXT_image_robustness 1 #define VK_EXT_IMAGE_ROBUSTNESS_SPEC_VERSION 1 #define VK_EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME "VK_EXT_image_robustness" -typedef struct VkPhysicalDeviceImageRobustnessFeaturesEXT { - VkStructureType sType; - void* pNext; - VkBool32 robustImageAccess; -} VkPhysicalDeviceImageRobustnessFeaturesEXT; +typedef VkPhysicalDeviceImageRobustnessFeatures VkPhysicalDeviceImageRobustnessFeaturesEXT; @@ -12404,6 +13465,30 @@ typedef struct VkPhysicalDevice4444FormatsFeaturesEXT { +#define VK_ARM_rasterization_order_attachment_access 1 +#define VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_SPEC_VERSION 1 +#define VK_ARM_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_EXTENSION_NAME "VK_ARM_rasterization_order_attachment_access" +typedef struct VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM { + VkStructureType sType; + void* pNext; + VkBool32 rasterizationOrderColorAttachmentAccess; + VkBool32 rasterizationOrderDepthAttachmentAccess; + VkBool32 rasterizationOrderStencilAttachmentAccess; +} VkPhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM; + + + +#define VK_EXT_rgba10x6_formats 1 +#define VK_EXT_RGBA10X6_FORMATS_SPEC_VERSION 1 +#define VK_EXT_RGBA10X6_FORMATS_EXTENSION_NAME "VK_EXT_rgba10x6_formats" +typedef struct VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 formatRgba10x6WithoutYCbCrSampler; +} VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT; + + + #define VK_NV_acquire_winrt_display 1 #define VK_NV_ACQUIRE_WINRT_DISPLAY_SPEC_VERSION 1 #define VK_NV_ACQUIRE_WINRT_DISPLAY_EXTENSION_NAME "VK_NV_acquire_winrt_display" @@ -12500,6 +13585,23 @@ typedef struct VkPhysicalDeviceDrmPropertiesEXT { +#define VK_EXT_depth_clip_control 1 +#define VK_EXT_DEPTH_CLIP_CONTROL_SPEC_VERSION 1 +#define VK_EXT_DEPTH_CLIP_CONTROL_EXTENSION_NAME "VK_EXT_depth_clip_control" +typedef struct VkPhysicalDeviceDepthClipControlFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 depthClipControl; +} VkPhysicalDeviceDepthClipControlFeaturesEXT; + +typedef struct VkPipelineViewportDepthClipControlCreateInfoEXT { + VkStructureType sType; + const void* pNext; + VkBool32 negativeOneToOne; +} VkPipelineViewportDepthClipControlCreateInfoEXT; + + + #define VK_EXT_primitive_topology_list_restart 1 #define VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_SPEC_VERSION 1 #define VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME "VK_EXT_primitive_topology_list_restart" @@ -12660,22 +13762,43 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetColorWrite #endif -#define VK_EXT_global_priority_query 1 -#define VK_MAX_GLOBAL_PRIORITY_SIZE_EXT 16U -#define VK_EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION 1 -#define VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME "VK_EXT_global_priority_query" -typedef struct VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT { +#define VK_EXT_primitives_generated_query 1 +#define VK_EXT_PRIMITIVES_GENERATED_QUERY_SPEC_VERSION 1 +#define VK_EXT_PRIMITIVES_GENERATED_QUERY_EXTENSION_NAME "VK_EXT_primitives_generated_query" +typedef struct VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT { VkStructureType sType; void* pNext; - VkBool32 globalPriorityQuery; -} VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT; + VkBool32 primitivesGeneratedQuery; + VkBool32 primitivesGeneratedQueryWithRasterizerDiscard; + VkBool32 primitivesGeneratedQueryWithNonZeroStreams; +} VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT; -typedef struct VkQueueFamilyGlobalPriorityPropertiesEXT { - VkStructureType sType; - void* pNext; - uint32_t priorityCount; - VkQueueGlobalPriorityEXT priorities[VK_MAX_GLOBAL_PRIORITY_SIZE_EXT]; -} VkQueueFamilyGlobalPriorityPropertiesEXT; + + +#define VK_EXT_global_priority_query 1 +#define VK_EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION 1 +#define VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME "VK_EXT_global_priority_query" +#define VK_MAX_GLOBAL_PRIORITY_SIZE_EXT VK_MAX_GLOBAL_PRIORITY_SIZE_KHR +typedef VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT; + +typedef VkQueueFamilyGlobalPriorityPropertiesKHR VkQueueFamilyGlobalPriorityPropertiesEXT; + + + +#define VK_EXT_image_view_min_lod 1 +#define VK_EXT_IMAGE_VIEW_MIN_LOD_SPEC_VERSION 1 +#define VK_EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME "VK_EXT_image_view_min_lod" +typedef struct VkPhysicalDeviceImageViewMinLodFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 minLod; +} VkPhysicalDeviceImageViewMinLodFeaturesEXT; + +typedef struct VkImageViewMinLodCreateInfoEXT { + VkStructureType sType; + const void* pNext; + float minLod; +} VkImageViewMinLodCreateInfoEXT; @@ -12728,11 +13851,42 @@ VKAPI_ATTR void VKAPI_CALL vkCmdDrawMultiIndexedEXT( #endif +#define VK_EXT_image_2d_view_of_3d 1 +#define VK_EXT_IMAGE_2D_VIEW_OF_3D_SPEC_VERSION 1 +#define VK_EXT_IMAGE_2D_VIEW_OF_3D_EXTENSION_NAME "VK_EXT_image_2d_view_of_3d" +typedef struct VkPhysicalDeviceImage2DViewOf3DFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 image2DViewOf3D; + VkBool32 sampler2DViewOf3D; +} VkPhysicalDeviceImage2DViewOf3DFeaturesEXT; + + + #define VK_EXT_load_store_op_none 1 #define VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION 1 #define VK_EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME "VK_EXT_load_store_op_none" +#define VK_EXT_border_color_swizzle 1 +#define VK_EXT_BORDER_COLOR_SWIZZLE_SPEC_VERSION 1 +#define VK_EXT_BORDER_COLOR_SWIZZLE_EXTENSION_NAME "VK_EXT_border_color_swizzle" +typedef struct VkPhysicalDeviceBorderColorSwizzleFeaturesEXT { + VkStructureType sType; + void* pNext; + VkBool32 borderColorSwizzle; + VkBool32 borderColorSwizzleFromImage; +} VkPhysicalDeviceBorderColorSwizzleFeaturesEXT; + +typedef struct VkSamplerBorderColorComponentMappingCreateInfoEXT { + VkStructureType sType; + const void* pNext; + VkComponentMapping components; + VkBool32 srgb; +} VkSamplerBorderColorComponentMappingCreateInfoEXT; + + + #define VK_EXT_pageable_device_local_memory 1 #define VK_EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_SPEC_VERSION 1 #define VK_EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_EXTENSION_NAME "VK_EXT_pageable_device_local_memory" @@ -12752,9 +13906,88 @@ VKAPI_ATTR void VKAPI_CALL vkSetDeviceMemoryPriorityEXT( #endif +#define VK_VALVE_descriptor_set_host_mapping 1 +#define VK_VALVE_DESCRIPTOR_SET_HOST_MAPPING_SPEC_VERSION 1 +#define VK_VALVE_DESCRIPTOR_SET_HOST_MAPPING_EXTENSION_NAME "VK_VALVE_descriptor_set_host_mapping" +typedef struct VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE { + VkStructureType sType; + void* pNext; + VkBool32 descriptorSetHostMapping; +} VkPhysicalDeviceDescriptorSetHostMappingFeaturesVALVE; + +typedef struct VkDescriptorSetBindingReferenceVALVE { + VkStructureType sType; + const void* pNext; + VkDescriptorSetLayout descriptorSetLayout; + uint32_t binding; +} VkDescriptorSetBindingReferenceVALVE; + +typedef struct VkDescriptorSetLayoutHostMappingInfoVALVE { + VkStructureType sType; + void* pNext; + size_t descriptorOffset; + uint32_t descriptorSize; +} VkDescriptorSetLayoutHostMappingInfoVALVE; + +typedef void (VKAPI_PTR *PFN_vkGetDescriptorSetLayoutHostMappingInfoVALVE)(VkDevice device, const VkDescriptorSetBindingReferenceVALVE* pBindingReference, VkDescriptorSetLayoutHostMappingInfoVALVE* pHostMapping); +typedef void (VKAPI_PTR *PFN_vkGetDescriptorSetHostMappingVALVE)(VkDevice device, VkDescriptorSet descriptorSet, void** ppData); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetLayoutHostMappingInfoVALVE( + VkDevice device, + const VkDescriptorSetBindingReferenceVALVE* pBindingReference, + VkDescriptorSetLayoutHostMappingInfoVALVE* pHostMapping); + +VKAPI_ATTR void VKAPI_CALL vkGetDescriptorSetHostMappingVALVE( + VkDevice device, + VkDescriptorSet descriptorSet, + void** ppData); +#endif + + +#define VK_QCOM_fragment_density_map_offset 1 +#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 1 +#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME "VK_QCOM_fragment_density_map_offset" +typedef struct VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM { + VkStructureType sType; + void* pNext; + VkBool32 fragmentDensityMapOffset; +} VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM; + +typedef struct VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM { + VkStructureType sType; + void* pNext; + VkExtent2D fragmentDensityOffsetGranularity; +} VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM; + +typedef struct VkSubpassFragmentDensityMapOffsetEndInfoQCOM { + VkStructureType sType; + const void* pNext; + uint32_t fragmentDensityOffsetCount; + const VkOffset2D* pFragmentDensityOffsets; +} VkSubpassFragmentDensityMapOffsetEndInfoQCOM; + + + +#define VK_NV_linear_color_attachment 1 +#define VK_NV_LINEAR_COLOR_ATTACHMENT_SPEC_VERSION 1 +#define VK_NV_LINEAR_COLOR_ATTACHMENT_EXTENSION_NAME "VK_NV_linear_color_attachment" +typedef struct VkPhysicalDeviceLinearColorAttachmentFeaturesNV { + VkStructureType sType; + void* pNext; + VkBool32 linearColorAttachment; +} VkPhysicalDeviceLinearColorAttachmentFeaturesNV; + + + +#define VK_GOOGLE_surfaceless_query 1 +#define VK_GOOGLE_SURFACELESS_QUERY_SPEC_VERSION 1 +#define VK_GOOGLE_SURFACELESS_QUERY_EXTENSION_NAME "VK_GOOGLE_surfaceless_query" + + #define VK_KHR_acceleration_structure 1 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkAccelerationStructureKHR) -#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 12 +#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13 #define VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_KHR_acceleration_structure" typedef enum VkBuildAccelerationStructureModeKHR { diff --git a/vendor/vulkan/_gen/vulkan_ios.h b/vendor/vulkan/_gen/vulkan_ios.h index 6e7e6afea..579220543 100644 --- a/vendor/vulkan/_gen/vulkan_ios.h +++ b/vendor/vulkan/_gen/vulkan_ios.h @@ -2,7 +2,7 @@ #define VULKAN_IOS_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/vendor/vulkan/_gen/vulkan_macos.h b/vendor/vulkan/_gen/vulkan_macos.h index c49b123d0..8e197c7cf 100644 --- a/vendor/vulkan/_gen/vulkan_macos.h +++ b/vendor/vulkan/_gen/vulkan_macos.h @@ -2,7 +2,7 @@ #define VULKAN_MACOS_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/vendor/vulkan/_gen/vulkan_metal.h b/vendor/vulkan/_gen/vulkan_metal.h index 5cf4a703a..3631f1200 100644 --- a/vendor/vulkan/_gen/vulkan_metal.h +++ b/vendor/vulkan/_gen/vulkan_metal.h @@ -2,7 +2,7 @@ #define VULKAN_METAL_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/vendor/vulkan/_gen/vulkan_win32.h b/vendor/vulkan/_gen/vulkan_win32.h index 1b680f0b1..affe0c02a 100644 --- a/vendor/vulkan/_gen/vulkan_win32.h +++ b/vendor/vulkan/_gen/vulkan_win32.h @@ -2,7 +2,7 @@ #define VULKAN_WIN32_H_ 1 /* -** Copyright 2015-2021 The Khronos Group Inc. +** Copyright 2015-2022 The Khronos Group Inc. ** ** SPDX-License-Identifier: Apache-2.0 */ diff --git a/vendor/vulkan/core.odin b/vendor/vulkan/core.odin index 67ca47553..94c667910 100644 --- a/vendor/vulkan/core.odin +++ b/vendor/vulkan/core.odin @@ -39,18 +39,15 @@ MAX_MEMORY_TYPES :: 32 MAX_MEMORY_HEAPS :: 16 MAX_EXTENSION_NAME_SIZE :: 256 MAX_DESCRIPTION_SIZE :: 256 -MAX_DEVICE_GROUP_SIZE_KHX :: 32 MAX_DEVICE_GROUP_SIZE :: 32 LUID_SIZE_KHX :: 8 -LUID_SIZE_KHR :: 8 LUID_SIZE :: 8 -MAX_DRIVER_NAME_SIZE_KHR :: 256 -MAX_DRIVER_INFO_SIZE_KHR :: 256 -MAX_QUEUE_FAMILY_EXTERNAL :: ~u32(0)-1 +MAX_QUEUE_FAMILY_EXTERNAL :: ~u32(1) MAX_GLOBAL_PRIORITY_SIZE_EXT :: 16 +QUEUE_FAMILY_EXTERNAL :: MAX_QUEUE_FAMILY_EXTERNAL // General Constants -HEADER_VERSION :: 191 +HEADER_VERSION :: 211 MAX_DRIVER_NAME_SIZE :: 256 MAX_DRIVER_INFO_SIZE :: 256 @@ -70,6 +67,9 @@ KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME :: "VK_KHR_display_swapc KHR_sampler_mirror_clamp_to_edge :: 1 KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION :: 3 KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME :: "VK_KHR_sampler_mirror_clamp_to_edge" +KHR_dynamic_rendering :: 1 +KHR_DYNAMIC_RENDERING_SPEC_VERSION :: 1 +KHR_DYNAMIC_RENDERING_EXTENSION_NAME :: "VK_KHR_dynamic_rendering" KHR_multiview :: 1 KHR_MULTIVIEW_SPEC_VERSION :: 1 KHR_MULTIVIEW_EXTENSION_NAME :: "VK_KHR_multiview" @@ -83,17 +83,22 @@ KHR_shader_draw_parameters :: 1 KHR_SHADER_DRAW_PARAMETERS_SPEC_VERSION :: 1 KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME :: "VK_KHR_shader_draw_parameters" KHR_maintenance1 :: 1 -KHR_MAINTENANCE1_SPEC_VERSION :: 2 -KHR_MAINTENANCE1_EXTENSION_NAME :: "VK_KHR_maintenance1" +KHR_MAINTENANCE_1_SPEC_VERSION :: 2 +KHR_MAINTENANCE_1_EXTENSION_NAME :: "VK_KHR_maintenance1" +KHR_MAINTENANCE1_SPEC_VERSION :: KHR_MAINTENANCE_1_SPEC_VERSION +KHR_MAINTENANCE1_EXTENSION_NAME :: KHR_MAINTENANCE_1_EXTENSION_NAME KHR_device_group_creation :: 1 KHR_DEVICE_GROUP_CREATION_SPEC_VERSION :: 1 KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME :: "VK_KHR_device_group_creation" +MAX_DEVICE_GROUP_SIZE_KHR :: MAX_DEVICE_GROUP_SIZE KHR_external_memory_capabilities :: 1 KHR_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION :: 1 KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME :: "VK_KHR_external_memory_capabilities" +LUID_SIZE_KHR :: LUID_SIZE KHR_external_memory :: 1 KHR_EXTERNAL_MEMORY_SPEC_VERSION :: 1 KHR_EXTERNAL_MEMORY_EXTENSION_NAME :: "VK_KHR_external_memory" +QUEUE_FAMILY_EXTERNAL_KHR :: QUEUE_FAMILY_EXTERNAL KHR_external_memory_fd :: 1 KHR_EXTERNAL_MEMORY_FD_SPEC_VERSION :: 1 KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME :: "VK_KHR_external_memory_fd" @@ -143,8 +148,10 @@ KHR_performance_query :: 1 KHR_PERFORMANCE_QUERY_SPEC_VERSION :: 1 KHR_PERFORMANCE_QUERY_EXTENSION_NAME :: "VK_KHR_performance_query" KHR_maintenance2 :: 1 -KHR_MAINTENANCE2_SPEC_VERSION :: 1 -KHR_MAINTENANCE2_EXTENSION_NAME :: "VK_KHR_maintenance2" +KHR_MAINTENANCE_2_SPEC_VERSION :: 1 +KHR_MAINTENANCE_2_EXTENSION_NAME :: "VK_KHR_maintenance2" +KHR_MAINTENANCE2_SPEC_VERSION :: KHR_MAINTENANCE_2_SPEC_VERSION +KHR_MAINTENANCE2_EXTENSION_NAME :: KHR_MAINTENANCE_2_EXTENSION_NAME KHR_get_surface_capabilities2 :: 1 KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION :: 1 KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME :: "VK_KHR_get_surface_capabilities2" @@ -176,8 +183,10 @@ KHR_bind_memory2 :: 1 KHR_BIND_MEMORY_2_SPEC_VERSION :: 1 KHR_BIND_MEMORY_2_EXTENSION_NAME :: "VK_KHR_bind_memory2" KHR_maintenance3 :: 1 -KHR_MAINTENANCE3_SPEC_VERSION :: 1 -KHR_MAINTENANCE3_EXTENSION_NAME :: "VK_KHR_maintenance3" +KHR_MAINTENANCE_3_SPEC_VERSION :: 1 +KHR_MAINTENANCE_3_EXTENSION_NAME :: "VK_KHR_maintenance3" +KHR_MAINTENANCE3_SPEC_VERSION :: KHR_MAINTENANCE_3_SPEC_VERSION +KHR_MAINTENANCE3_EXTENSION_NAME :: KHR_MAINTENANCE_3_EXTENSION_NAME KHR_draw_indirect_count :: 1 KHR_DRAW_INDIRECT_COUNT_SPEC_VERSION :: 1 KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME :: "VK_KHR_draw_indirect_count" @@ -193,9 +202,15 @@ KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME :: "VK_KHR_shader_atomic KHR_shader_clock :: 1 KHR_SHADER_CLOCK_SPEC_VERSION :: 1 KHR_SHADER_CLOCK_EXTENSION_NAME :: "VK_KHR_shader_clock" +KHR_global_priority :: 1 +MAX_GLOBAL_PRIORITY_SIZE_KHR :: 16 +KHR_GLOBAL_PRIORITY_SPEC_VERSION :: 1 +KHR_GLOBAL_PRIORITY_EXTENSION_NAME :: "VK_KHR_global_priority" KHR_driver_properties :: 1 KHR_DRIVER_PROPERTIES_SPEC_VERSION :: 1 KHR_DRIVER_PROPERTIES_EXTENSION_NAME :: "VK_KHR_driver_properties" +MAX_DRIVER_NAME_SIZE_KHR :: MAX_DRIVER_NAME_SIZE +MAX_DRIVER_INFO_SIZE_KHR :: MAX_DRIVER_INFO_SIZE KHR_shader_float_controls :: 1 KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION :: 4 KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME :: "VK_KHR_shader_float_controls" @@ -215,7 +230,7 @@ KHR_shader_terminate_invocation :: 1 KHR_SHADER_TERMINATE_INVOCATION_SPEC_VERSION :: 1 KHR_SHADER_TERMINATE_INVOCATION_EXTENSION_NAME :: "VK_KHR_shader_terminate_invocation" KHR_fragment_shading_rate :: 1 -KHR_FRAGMENT_SHADING_RATE_SPEC_VERSION :: 1 +KHR_FRAGMENT_SHADING_RATE_SPEC_VERSION :: 2 KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME :: "VK_KHR_fragment_shading_rate" KHR_spirv_1_4 :: 1 KHR_SPIRV_1_4_SPEC_VERSION :: 1 @@ -268,6 +283,15 @@ KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME :: "VK_KHR_workgroup_mem KHR_copy_commands2 :: 1 KHR_COPY_COMMANDS_2_SPEC_VERSION :: 1 KHR_COPY_COMMANDS_2_EXTENSION_NAME :: "VK_KHR_copy_commands2" +KHR_format_feature_flags2 :: 1 +KHR_FORMAT_FEATURE_FLAGS_2_SPEC_VERSION :: 1 +KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME :: "VK_KHR_format_feature_flags2" +KHR_portability_enumeration :: 1 +KHR_PORTABILITY_ENUMERATION_SPEC_VERSION :: 1 +KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME :: "VK_KHR_portability_enumeration" +KHR_maintenance4 :: 1 +KHR_MAINTENANCE_4_SPEC_VERSION :: 2 +KHR_MAINTENANCE_4_EXTENSION_NAME :: "VK_KHR_maintenance4" EXT_debug_report :: 1 EXT_DEBUG_REPORT_SPEC_VERSION :: 10 EXT_DEBUG_REPORT_EXTENSION_NAME :: "VK_EXT_debug_report" @@ -374,8 +398,10 @@ NV_geometry_shader_passthrough :: 1 NV_GEOMETRY_SHADER_PASSTHROUGH_SPEC_VERSION :: 1 NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME :: "VK_NV_geometry_shader_passthrough" NV_viewport_array2 :: 1 -NV_VIEWPORT_ARRAY2_SPEC_VERSION :: 1 -NV_VIEWPORT_ARRAY2_EXTENSION_NAME :: "VK_NV_viewport_array2" +NV_VIEWPORT_ARRAY_2_SPEC_VERSION :: 1 +NV_VIEWPORT_ARRAY_2_EXTENSION_NAME :: "VK_NV_viewport_array2" +NV_VIEWPORT_ARRAY2_SPEC_VERSION :: NV_VIEWPORT_ARRAY_2_SPEC_VERSION +NV_VIEWPORT_ARRAY2_EXTENSION_NAME :: NV_VIEWPORT_ARRAY_2_EXTENSION_NAME NVX_multiview_per_view_attributes :: 1 NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_SPEC_VERSION :: 1 NVX_MULTIVIEW_PER_VIEW_ATTRIBUTES_EXTENSION_NAME :: "VK_NVX_multiview_per_view_attributes" @@ -446,7 +472,7 @@ EXT_post_depth_coverage :: 1 EXT_POST_DEPTH_COVERAGE_SPEC_VERSION :: 1 EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME :: "VK_EXT_post_depth_coverage" EXT_image_drm_format_modifier :: 1 -EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION :: 1 +EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION :: 2 EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME :: "VK_EXT_image_drm_format_modifier" EXT_validation_cache :: 1 EXT_VALIDATION_CACHE_SPEC_VERSION :: 1 @@ -463,6 +489,7 @@ NV_SHADING_RATE_IMAGE_EXTENSION_NAME :: "VK_NV_shading_rate_i NV_ray_tracing :: 1 NV_RAY_TRACING_SPEC_VERSION :: 3 NV_RAY_TRACING_EXTENSION_NAME :: "VK_NV_ray_tracing" +SHADER_UNUSED_KHR :: 0 NV_representative_fragment_test :: 1 NV_REPRESENTATIVE_FRAGMENT_TEST_SPEC_VERSION :: 2 NV_REPRESENTATIVE_FRAGMENT_TEST_EXTENSION_NAME :: "VK_NV_representative_fragment_test" @@ -524,14 +551,16 @@ AMD_display_native_hdr :: 1 AMD_DISPLAY_NATIVE_HDR_SPEC_VERSION :: 1 AMD_DISPLAY_NATIVE_HDR_EXTENSION_NAME :: "VK_AMD_display_native_hdr" EXT_fragment_density_map :: 1 -EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION :: 1 +EXT_FRAGMENT_DENSITY_MAP_SPEC_VERSION :: 2 EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME :: "VK_EXT_fragment_density_map" EXT_scalar_block_layout :: 1 EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION :: 1 EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME :: "VK_EXT_scalar_block_layout" GOOGLE_hlsl_functionality1 :: 1 -GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION :: 1 -GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME :: "VK_GOOGLE_hlsl_functionality1" +GOOGLE_HLSL_FUNCTIONALITY_1_SPEC_VERSION :: 1 +GOOGLE_HLSL_FUNCTIONALITY_1_EXTENSION_NAME :: "VK_GOOGLE_hlsl_functionality1" +GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION :: GOOGLE_HLSL_FUNCTIONALITY_1_SPEC_VERSION +GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME :: GOOGLE_HLSL_FUNCTIONALITY_1_EXTENSION_NAME GOOGLE_decorate_string :: 1 GOOGLE_DECORATE_STRING_SPEC_VERSION :: 1 GOOGLE_DECORATE_STRING_EXTENSION_NAME :: "VK_GOOGLE_decorate_string" @@ -640,6 +669,9 @@ EXT_PIPELINE_CREATION_CACHE_CONTROL_EXTENSION_NAME :: "VK_EXT_pipeline_crea NV_device_diagnostics_config :: 1 NV_DEVICE_DIAGNOSTICS_CONFIG_SPEC_VERSION :: 1 NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME :: "VK_NV_device_diagnostics_config" +EXT_graphics_pipeline_library :: 1 +EXT_GRAPHICS_PIPELINE_LIBRARY_SPEC_VERSION :: 1 +EXT_GRAPHICS_PIPELINE_LIBRARY_EXTENSION_NAME :: "VK_EXT_graphics_pipeline_library" NV_fragment_shading_rate_enums :: 1 NV_FRAGMENT_SHADING_RATE_ENUMS_SPEC_VERSION :: 1 NV_FRAGMENT_SHADING_RATE_ENUMS_EXTENSION_NAME :: "VK_NV_fragment_shading_rate_enums" @@ -658,6 +690,9 @@ EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME :: "VK_EXT_image_robustn EXT_4444_formats :: 1 EXT_4444_FORMATS_SPEC_VERSION :: 1 EXT_4444_FORMATS_EXTENSION_NAME :: "VK_EXT_4444_formats" +EXT_rgba10x6_formats :: 1 +EXT_RGBA10X6_FORMATS_SPEC_VERSION :: 1 +EXT_RGBA10X6_FORMATS_EXTENSION_NAME :: "VK_EXT_rgba10x6_formats" NV_acquire_winrt_display :: 1 NV_ACQUIRE_WINRT_DISPLAY_SPEC_VERSION :: 1 NV_ACQUIRE_WINRT_DISPLAY_EXTENSION_NAME :: "VK_NV_acquire_winrt_display" @@ -667,6 +702,9 @@ EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME :: "VK_EXT_vertex_input_ EXT_physical_device_drm :: 1 EXT_PHYSICAL_DEVICE_DRM_SPEC_VERSION :: 1 EXT_PHYSICAL_DEVICE_DRM_EXTENSION_NAME :: "VK_EXT_physical_device_drm" +EXT_depth_clip_control :: 1 +EXT_DEPTH_CLIP_CONTROL_SPEC_VERSION :: 1 +EXT_DEPTH_CLIP_CONTROL_EXTENSION_NAME :: "VK_EXT_depth_clip_control" EXT_primitive_topology_list_restart :: 1 EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_SPEC_VERSION :: 1 EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME :: "VK_EXT_primitive_topology_list_restart" @@ -679,20 +717,38 @@ EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME :: "VK_EXT_extended_dyna EXT_color_write_enable :: 1 EXT_COLOR_WRITE_ENABLE_SPEC_VERSION :: 1 EXT_COLOR_WRITE_ENABLE_EXTENSION_NAME :: "VK_EXT_color_write_enable" +EXT_primitives_generated_query :: 1 +EXT_PRIMITIVES_GENERATED_QUERY_SPEC_VERSION :: 1 +EXT_PRIMITIVES_GENERATED_QUERY_EXTENSION_NAME :: "VK_EXT_primitives_generated_query" EXT_global_priority_query :: 1 EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION :: 1 EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME :: "VK_EXT_global_priority_query" +EXT_image_view_min_lod :: 1 +EXT_IMAGE_VIEW_MIN_LOD_SPEC_VERSION :: 1 +EXT_IMAGE_VIEW_MIN_LOD_EXTENSION_NAME :: "VK_EXT_image_view_min_lod" EXT_multi_draw :: 1 EXT_MULTI_DRAW_SPEC_VERSION :: 1 EXT_MULTI_DRAW_EXTENSION_NAME :: "VK_EXT_multi_draw" +EXT_image_2d_view_of_3d :: 1 +EXT_IMAGE_2D_VIEW_OF_3D_SPEC_VERSION :: 1 +EXT_IMAGE_2D_VIEW_OF_3D_EXTENSION_NAME :: "VK_EXT_image_2d_view_of_3d" EXT_load_store_op_none :: 1 EXT_LOAD_STORE_OP_NONE_SPEC_VERSION :: 1 EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME :: "VK_EXT_load_store_op_none" +EXT_border_color_swizzle :: 1 +EXT_BORDER_COLOR_SWIZZLE_SPEC_VERSION :: 1 +EXT_BORDER_COLOR_SWIZZLE_EXTENSION_NAME :: "VK_EXT_border_color_swizzle" EXT_pageable_device_local_memory :: 1 EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_SPEC_VERSION :: 1 EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_EXTENSION_NAME :: "VK_EXT_pageable_device_local_memory" +NV_linear_color_attachment :: 1 +NV_LINEAR_COLOR_ATTACHMENT_SPEC_VERSION :: 1 +NV_LINEAR_COLOR_ATTACHMENT_EXTENSION_NAME :: "VK_NV_linear_color_attachment" +GOOGLE_surfaceless_query :: 1 +GOOGLE_SURFACELESS_QUERY_SPEC_VERSION :: 1 +GOOGLE_SURFACELESS_QUERY_EXTENSION_NAME :: "VK_GOOGLE_surfaceless_query" KHR_acceleration_structure :: 1 -KHR_ACCELERATION_STRUCTURE_SPEC_VERSION :: 12 +KHR_ACCELERATION_STRUCTURE_SPEC_VERSION :: 13 KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME :: "VK_KHR_acceleration_structure" KHR_ray_tracing_pipeline :: 1 KHR_RAY_TRACING_PIPELINE_SPEC_VERSION :: 1 @@ -756,6 +812,7 @@ Framebuffer :: distinct NonDispatchableHandle CommandPool :: distinct NonDispatchableHandle SamplerYcbcrConversion :: distinct NonDispatchableHandle DescriptorUpdateTemplate :: distinct NonDispatchableHandle +PrivateDataSlot :: distinct NonDispatchableHandle SurfaceKHR :: distinct NonDispatchableHandle SwapchainKHR :: distinct NonDispatchableHandle DisplayKHR :: distinct NonDispatchableHandle @@ -769,7 +826,6 @@ ValidationCacheEXT :: distinct NonDispatchableHandle AccelerationStructureNV :: distinct NonDispatchableHandle PerformanceConfigurationINTEL :: distinct NonDispatchableHandle IndirectCommandsLayoutNV :: distinct NonDispatchableHandle -PrivateDataSlotEXT :: distinct NonDispatchableHandle AccelerationStructureKHR :: distinct NonDispatchableHandle diff --git a/vendor/vulkan/enums.odin b/vendor/vulkan/enums.odin index be6691ab4..b2eec06ab 100644 --- a/vendor/vulkan/enums.odin +++ b/vendor/vulkan/enums.odin @@ -78,7 +78,7 @@ AccessFlag :: enum Flags { ACCELERATION_STRUCTURE_WRITE_NV = ACCELERATION_STRUCTURE_WRITE_KHR, } -AccessFlags_NONE_KHR :: AccessFlags{} +AccessFlags_NONE :: AccessFlags{} AcquireProfilingLockFlagsKHR :: distinct bit_set[AcquireProfilingLockFlagKHR; Flags] @@ -100,8 +100,7 @@ AttachmentLoadOp :: enum c.int { AttachmentStoreOp :: enum c.int { STORE = 0, DONT_CARE = 1, - NONE_EXT = 1000301000, - NONE_QCOM = NONE_EXT, + NONE = 1000301000, } BlendFactor :: enum c.int { @@ -460,6 +459,7 @@ DebugReportObjectTypeEXT :: enum c.int { CU_FUNCTION_NVX = 1000029001, ACCELERATION_STRUCTURE_KHR = 1000150000, ACCELERATION_STRUCTURE_NV = 1000165000, + BUFFER_COLLECTION_FUCHSIA = 1000366000, DEBUG_REPORT = DEBUG_REPORT_CALLBACK_EXT, VALIDATION_CACHE = VALIDATION_CACHE_EXT, DESCRIPTOR_UPDATE_TEMPLATE_KHR = DESCRIPTOR_UPDATE_TEMPLATE, @@ -530,10 +530,11 @@ DescriptorType :: enum c.int { UNIFORM_BUFFER_DYNAMIC = 8, STORAGE_BUFFER_DYNAMIC = 9, INPUT_ATTACHMENT = 10, - INLINE_UNIFORM_BLOCK_EXT = 1000138000, + INLINE_UNIFORM_BLOCK = 1000138000, ACCELERATION_STRUCTURE_KHR = 1000150000, ACCELERATION_STRUCTURE_NV = 1000165000, MUTABLE_VALVE = 1000351000, + INLINE_UNIFORM_BLOCK_EXT = INLINE_UNIFORM_BLOCK, } DescriptorUpdateTemplateType :: enum c.int { @@ -615,6 +616,11 @@ DriverId :: enum c.int { COREAVI_PROPRIETARY = 15, JUICE_PROPRIETARY = 16, VERISILICON_PROPRIETARY = 17, + MESA_TURNIP = 18, + MESA_V3DV = 19, + MESA_PANVK = 20, + SAMSUNG_PROPRIETARY = 21, + MESA_VENUS = 22, AMD_PROPRIETARY_KHR = AMD_PROPRIETARY, AMD_OPEN_SOURCE_KHR = AMD_OPEN_SOURCE, MESA_RADV_KHR = MESA_RADV, @@ -639,6 +645,21 @@ DynamicState :: enum c.int { STENCIL_COMPARE_MASK = 6, STENCIL_WRITE_MASK = 7, STENCIL_REFERENCE = 8, + CULL_MODE = 1000267000, + FRONT_FACE = 1000267001, + PRIMITIVE_TOPOLOGY = 1000267002, + VIEWPORT_WITH_COUNT = 1000267003, + SCISSOR_WITH_COUNT = 1000267004, + VERTEX_INPUT_BINDING_STRIDE = 1000267005, + DEPTH_TEST_ENABLE = 1000267006, + DEPTH_WRITE_ENABLE = 1000267007, + DEPTH_COMPARE_OP = 1000267008, + DEPTH_BOUNDS_TEST_ENABLE = 1000267009, + STENCIL_TEST_ENABLE = 1000267010, + STENCIL_OP = 1000267011, + RASTERIZER_DISCARD_ENABLE = 1000377001, + DEPTH_BIAS_ENABLE = 1000377002, + PRIMITIVE_RESTART_ENABLE = 1000377004, VIEWPORT_W_SCALING_NV = 1000087000, DISCARD_RECTANGLE_EXT = 1000099000, SAMPLE_LOCATIONS_EXT = 1000143000, @@ -648,30 +669,31 @@ DynamicState :: enum c.int { EXCLUSIVE_SCISSOR_NV = 1000205001, FRAGMENT_SHADING_RATE_KHR = 1000226000, LINE_STIPPLE_EXT = 1000259000, - CULL_MODE_EXT = 1000267000, - FRONT_FACE_EXT = 1000267001, - PRIMITIVE_TOPOLOGY_EXT = 1000267002, - VIEWPORT_WITH_COUNT_EXT = 1000267003, - SCISSOR_WITH_COUNT_EXT = 1000267004, - VERTEX_INPUT_BINDING_STRIDE_EXT = 1000267005, - DEPTH_TEST_ENABLE_EXT = 1000267006, - DEPTH_WRITE_ENABLE_EXT = 1000267007, - DEPTH_COMPARE_OP_EXT = 1000267008, - DEPTH_BOUNDS_TEST_ENABLE_EXT = 1000267009, - STENCIL_TEST_ENABLE_EXT = 1000267010, - STENCIL_OP_EXT = 1000267011, VERTEX_INPUT_EXT = 1000352000, PATCH_CONTROL_POINTS_EXT = 1000377000, - RASTERIZER_DISCARD_ENABLE_EXT = 1000377001, - DEPTH_BIAS_ENABLE_EXT = 1000377002, LOGIC_OP_EXT = 1000377003, - PRIMITIVE_RESTART_ENABLE_EXT = 1000377004, COLOR_WRITE_ENABLE_EXT = 1000381000, + CULL_MODE_EXT = CULL_MODE, + FRONT_FACE_EXT = FRONT_FACE, + PRIMITIVE_TOPOLOGY_EXT = PRIMITIVE_TOPOLOGY, + VIEWPORT_WITH_COUNT_EXT = VIEWPORT_WITH_COUNT, + SCISSOR_WITH_COUNT_EXT = SCISSOR_WITH_COUNT, + VERTEX_INPUT_BINDING_STRIDE_EXT = VERTEX_INPUT_BINDING_STRIDE, + DEPTH_TEST_ENABLE_EXT = DEPTH_TEST_ENABLE, + DEPTH_WRITE_ENABLE_EXT = DEPTH_WRITE_ENABLE, + DEPTH_COMPARE_OP_EXT = DEPTH_COMPARE_OP, + DEPTH_BOUNDS_TEST_ENABLE_EXT = DEPTH_BOUNDS_TEST_ENABLE, + STENCIL_TEST_ENABLE_EXT = STENCIL_TEST_ENABLE, + STENCIL_OP_EXT = STENCIL_OP, + RASTERIZER_DISCARD_ENABLE_EXT = RASTERIZER_DISCARD_ENABLE, + DEPTH_BIAS_ENABLE_EXT = DEPTH_BIAS_ENABLE, + PRIMITIVE_RESTART_ENABLE_EXT = PRIMITIVE_RESTART_ENABLE, } EventCreateFlags :: distinct bit_set[EventCreateFlag; Flags] EventCreateFlag :: enum Flags { - DEVICE_ONLY_KHR = 0, + DEVICE_ONLY = 0, + DEVICE_ONLY_KHR = DEVICE_ONLY, } ExternalFenceFeatureFlags :: distinct bit_set[ExternalFenceFeatureFlag; Flags] @@ -1005,6 +1027,26 @@ Format :: enum c.int { G16_B16_R16_3PLANE_422_UNORM = 1000156031, G16_B16R16_2PLANE_422_UNORM = 1000156032, G16_B16_R16_3PLANE_444_UNORM = 1000156033, + G8_B8R8_2PLANE_444_UNORM = 1000330000, + G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16 = 1000330001, + G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16 = 1000330002, + G16_B16R16_2PLANE_444_UNORM = 1000330003, + A4R4G4B4_UNORM_PACK16 = 1000340000, + A4B4G4R4_UNORM_PACK16 = 1000340001, + ASTC_4x4_SFLOAT_BLOCK = 1000066000, + ASTC_5x4_SFLOAT_BLOCK = 1000066001, + ASTC_5x5_SFLOAT_BLOCK = 1000066002, + ASTC_6x5_SFLOAT_BLOCK = 1000066003, + ASTC_6x6_SFLOAT_BLOCK = 1000066004, + ASTC_8x5_SFLOAT_BLOCK = 1000066005, + ASTC_8x6_SFLOAT_BLOCK = 1000066006, + ASTC_8x8_SFLOAT_BLOCK = 1000066007, + ASTC_10x5_SFLOAT_BLOCK = 1000066008, + ASTC_10x6_SFLOAT_BLOCK = 1000066009, + ASTC_10x8_SFLOAT_BLOCK = 1000066010, + ASTC_10x10_SFLOAT_BLOCK = 1000066011, + ASTC_12x10_SFLOAT_BLOCK = 1000066012, + ASTC_12x12_SFLOAT_BLOCK = 1000066013, PVRTC1_2BPP_UNORM_BLOCK_IMG = 1000054000, PVRTC1_4BPP_UNORM_BLOCK_IMG = 1000054001, PVRTC2_2BPP_UNORM_BLOCK_IMG = 1000054002, @@ -1013,26 +1055,20 @@ Format :: enum c.int { PVRTC1_4BPP_SRGB_BLOCK_IMG = 1000054005, PVRTC2_2BPP_SRGB_BLOCK_IMG = 1000054006, PVRTC2_4BPP_SRGB_BLOCK_IMG = 1000054007, - ASTC_4x4_SFLOAT_BLOCK_EXT = 1000066000, - ASTC_5x4_SFLOAT_BLOCK_EXT = 1000066001, - ASTC_5x5_SFLOAT_BLOCK_EXT = 1000066002, - ASTC_6x5_SFLOAT_BLOCK_EXT = 1000066003, - ASTC_6x6_SFLOAT_BLOCK_EXT = 1000066004, - ASTC_8x5_SFLOAT_BLOCK_EXT = 1000066005, - ASTC_8x6_SFLOAT_BLOCK_EXT = 1000066006, - ASTC_8x8_SFLOAT_BLOCK_EXT = 1000066007, - ASTC_10x5_SFLOAT_BLOCK_EXT = 1000066008, - ASTC_10x6_SFLOAT_BLOCK_EXT = 1000066009, - ASTC_10x8_SFLOAT_BLOCK_EXT = 1000066010, - ASTC_10x10_SFLOAT_BLOCK_EXT = 1000066011, - ASTC_12x10_SFLOAT_BLOCK_EXT = 1000066012, - ASTC_12x12_SFLOAT_BLOCK_EXT = 1000066013, - G8_B8R8_2PLANE_444_UNORM_EXT = 1000330000, - G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT = 1000330001, - G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT = 1000330002, - G16_B16R16_2PLANE_444_UNORM_EXT = 1000330003, - A4R4G4B4_UNORM_PACK16_EXT = 1000340000, - A4B4G4R4_UNORM_PACK16_EXT = 1000340001, + ASTC_4x4_SFLOAT_BLOCK_EXT = ASTC_4x4_SFLOAT_BLOCK, + ASTC_5x4_SFLOAT_BLOCK_EXT = ASTC_5x4_SFLOAT_BLOCK, + ASTC_5x5_SFLOAT_BLOCK_EXT = ASTC_5x5_SFLOAT_BLOCK, + ASTC_6x5_SFLOAT_BLOCK_EXT = ASTC_6x5_SFLOAT_BLOCK, + ASTC_6x6_SFLOAT_BLOCK_EXT = ASTC_6x6_SFLOAT_BLOCK, + ASTC_8x5_SFLOAT_BLOCK_EXT = ASTC_8x5_SFLOAT_BLOCK, + ASTC_8x6_SFLOAT_BLOCK_EXT = ASTC_8x6_SFLOAT_BLOCK, + ASTC_8x8_SFLOAT_BLOCK_EXT = ASTC_8x8_SFLOAT_BLOCK, + ASTC_10x5_SFLOAT_BLOCK_EXT = ASTC_10x5_SFLOAT_BLOCK, + ASTC_10x6_SFLOAT_BLOCK_EXT = ASTC_10x6_SFLOAT_BLOCK, + ASTC_10x8_SFLOAT_BLOCK_EXT = ASTC_10x8_SFLOAT_BLOCK, + ASTC_10x10_SFLOAT_BLOCK_EXT = ASTC_10x10_SFLOAT_BLOCK, + ASTC_12x10_SFLOAT_BLOCK_EXT = ASTC_12x10_SFLOAT_BLOCK, + ASTC_12x12_SFLOAT_BLOCK_EXT = ASTC_12x12_SFLOAT_BLOCK, G8B8G8R8_422_UNORM_KHR = G8B8G8R8_422_UNORM, B8G8R8G8_422_UNORM_KHR = B8G8R8G8_422_UNORM, G8_B8_R8_3PLANE_420_UNORM_KHR = G8_B8_R8_3PLANE_420_UNORM, @@ -1067,6 +1103,12 @@ Format :: enum c.int { G16_B16_R16_3PLANE_422_UNORM_KHR = G16_B16_R16_3PLANE_422_UNORM, G16_B16R16_2PLANE_422_UNORM_KHR = G16_B16R16_2PLANE_422_UNORM, G16_B16_R16_3PLANE_444_UNORM_KHR = G16_B16_R16_3PLANE_444_UNORM, + G8_B8R8_2PLANE_444_UNORM_EXT = G8_B8R8_2PLANE_444_UNORM, + G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT = G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16, + G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT = G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16, + G16_B16R16_2PLANE_444_UNORM_EXT = G16_B16R16_2PLANE_444_UNORM, + A4R4G4B4_UNORM_PACK16_EXT = A4R4G4B4_UNORM_PACK16, + A4B4G4R4_UNORM_PACK16_EXT = A4B4G4R4_UNORM_PACK16, } FormatFeatureFlags :: distinct bit_set[FormatFeatureFlag; Flags] @@ -1190,6 +1232,14 @@ GeometryTypeKHR :: enum c.int { AABBS_NV = AABBS, } +GraphicsPipelineLibraryFlagsEXT :: distinct bit_set[GraphicsPipelineLibraryFlagEXT; Flags] +GraphicsPipelineLibraryFlagEXT :: enum Flags { + VERTEX_INPUT_INTERFACE = 0, + PRE_RASTERIZATION_SHADERS = 1, + FRAGMENT_SHADER = 2, + FRAGMENT_OUTPUT_INTERFACE = 3, +} + ImageAspectFlags :: distinct bit_set[ImageAspectFlag; Flags] ImageAspectFlag :: enum Flags { COLOR = 0, @@ -1208,6 +1258,9 @@ ImageAspectFlag :: enum Flags { PLANE_2_KHR = PLANE_2, } +ImageAspectFlags_NONE :: ImageAspectFlags{} + + ImageCreateFlags :: distinct bit_set[ImageCreateFlag; Flags] ImageCreateFlag :: enum Flags { SPARSE_BINDING = 0, @@ -1225,6 +1278,8 @@ ImageCreateFlag :: enum Flags { CORNER_SAMPLED_NV = 13, SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_EXT = 12, SUBSAMPLED_EXT = 14, + D2_VIEW_COMPATIBLE_EXT = 17, + FRAGMENT_DENSITY_MAP_OFFSET_QCOM = 15, SPLIT_INSTANCE_BIND_REGIONS_KHR = SPLIT_INSTANCE_BIND_REGIONS, D2_ARRAY_COMPATIBLE_KHR = D2_ARRAY_COMPATIBLE, BLOCK_TEXEL_VIEW_COMPATIBLE_KHR = BLOCK_TEXEL_VIEW_COMPATIBLE, @@ -1249,6 +1304,8 @@ ImageLayout :: enum c.int { DEPTH_READ_ONLY_OPTIMAL = 1000241001, STENCIL_ATTACHMENT_OPTIMAL = 1000241002, STENCIL_READ_ONLY_OPTIMAL = 1000241003, + READ_ONLY_OPTIMAL = 1000314000, + ATTACHMENT_OPTIMAL = 1000314001, PRESENT_SRC_KHR = 1000001002, VIDEO_DECODE_DST_KHR = 1000024000, VIDEO_DECODE_SRC_KHR = 1000024001, @@ -1259,8 +1316,6 @@ ImageLayout :: enum c.int { VIDEO_ENCODE_DST_KHR = 1000299000, VIDEO_ENCODE_SRC_KHR = 1000299001, VIDEO_ENCODE_DPB_KHR = 1000299002, - READ_ONLY_OPTIMAL_KHR = 1000314000, - ATTACHMENT_OPTIMAL_KHR = 1000314001, DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR = DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR = DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, SHADING_RATE_OPTIMAL_NV = FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR, @@ -1268,6 +1323,8 @@ ImageLayout :: enum c.int { DEPTH_READ_ONLY_OPTIMAL_KHR = DEPTH_READ_ONLY_OPTIMAL, STENCIL_ATTACHMENT_OPTIMAL_KHR = STENCIL_ATTACHMENT_OPTIMAL, STENCIL_READ_ONLY_OPTIMAL_KHR = STENCIL_READ_ONLY_OPTIMAL, + READ_ONLY_OPTIMAL_KHR = READ_ONLY_OPTIMAL, + ATTACHMENT_OPTIMAL_KHR = ATTACHMENT_OPTIMAL, } ImageTiling :: enum c.int { @@ -1351,6 +1408,11 @@ IndirectStateFlagNV :: enum Flags { FLAG_FRONTFACE = 0, } +InstanceCreateFlags :: distinct bit_set[InstanceCreateFlag; Flags] +InstanceCreateFlag :: enum Flags { + ENUMERATE_PORTABILITY_KHR = 0, +} + InternalAllocationType :: enum c.int { EXECUTABLE = 0, } @@ -1446,6 +1508,7 @@ ObjectType :: enum c.int { COMMAND_POOL = 25, SAMPLER_YCBCR_CONVERSION = 1000156000, DESCRIPTOR_UPDATE_TEMPLATE = 1000085000, + PRIVATE_DATA_SLOT = 1000295000, SURFACE_KHR = 1000000000, SWAPCHAIN_KHR = 1000001000, DISPLAY_KHR = 1000002000, @@ -1462,9 +1525,10 @@ ObjectType :: enum c.int { PERFORMANCE_CONFIGURATION_INTEL = 1000210000, DEFERRED_OPERATION_KHR = 1000268000, INDIRECT_COMMANDS_LAYOUT_NV = 1000277000, - PRIVATE_DATA_SLOT_EXT = 1000295000, + BUFFER_COLLECTION_FUCHSIA = 1000366000, DESCRIPTOR_UPDATE_TEMPLATE_KHR = DESCRIPTOR_UPDATE_TEMPLATE, SAMPLER_YCBCR_CONVERSION_KHR = SAMPLER_YCBCR_CONVERSION, + PRIVATE_DATA_SLOT_EXT = PRIVATE_DATA_SLOT, } PeerMemoryFeatureFlags :: distinct bit_set[PeerMemoryFeatureFlag; Flags] @@ -1557,48 +1621,71 @@ PipelineBindPoint :: enum c.int { PipelineCacheCreateFlags :: distinct bit_set[PipelineCacheCreateFlag; Flags] PipelineCacheCreateFlag :: enum Flags { - EXTERNALLY_SYNCHRONIZED_EXT = 0, + EXTERNALLY_SYNCHRONIZED = 0, + EXTERNALLY_SYNCHRONIZED_EXT = EXTERNALLY_SYNCHRONIZED, } PipelineCacheHeaderVersion :: enum c.int { ONE = 1, } +PipelineColorBlendStateCreateFlags :: distinct bit_set[PipelineColorBlendStateCreateFlag; Flags] +PipelineColorBlendStateCreateFlag :: enum Flags { + RASTERIZATION_ORDER_ATTACHMENT_ACCESS_ARM = 0, +} + PipelineCompilerControlFlagsAMD :: distinct bit_set[PipelineCompilerControlFlagAMD; Flags] PipelineCompilerControlFlagAMD :: enum Flags { } PipelineCreateFlags :: distinct bit_set[PipelineCreateFlag; Flags] PipelineCreateFlag :: enum Flags { - DISABLE_OPTIMIZATION = 0, - ALLOW_DERIVATIVES = 1, - DERIVATIVE = 2, - VIEW_INDEX_FROM_DEVICE_INDEX = 3, - DISPATCH_BASE = 4, - RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_KHR = 14, - RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_KHR = 15, - RAY_TRACING_NO_NULL_MISS_SHADERS_KHR = 16, - RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_KHR = 17, - RAY_TRACING_SKIP_TRIANGLES_KHR = 12, - RAY_TRACING_SKIP_AABBS_KHR = 13, - RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_KHR = 19, - DEFER_COMPILE_NV = 5, - CAPTURE_STATISTICS_KHR = 6, - CAPTURE_INTERNAL_REPRESENTATIONS_KHR = 7, - INDIRECT_BINDABLE_NV = 18, - LIBRARY_KHR = 11, - FAIL_ON_PIPELINE_COMPILE_REQUIRED_EXT = 8, - EARLY_RETURN_ON_FAILURE_EXT = 9, - RAY_TRACING_ALLOW_MOTION_NV = 20, - VIEW_INDEX_FROM_DEVICE_INDEX_KHR = VIEW_INDEX_FROM_DEVICE_INDEX, - DISPATCH_BASE_KHR = DISPATCH_BASE, + DISABLE_OPTIMIZATION = 0, + ALLOW_DERIVATIVES = 1, + DERIVATIVE = 2, + VIEW_INDEX_FROM_DEVICE_INDEX = 3, + DISPATCH_BASE = 4, + FAIL_ON_PIPELINE_COMPILE_REQUIRED = 8, + EARLY_RETURN_ON_FAILURE = 9, + RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_KHR = 21, + RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_EXT = 22, + RAY_TRACING_NO_NULL_ANY_HIT_SHADERS_KHR = 14, + RAY_TRACING_NO_NULL_CLOSEST_HIT_SHADERS_KHR = 15, + RAY_TRACING_NO_NULL_MISS_SHADERS_KHR = 16, + RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_KHR = 17, + RAY_TRACING_SKIP_TRIANGLES_KHR = 12, + RAY_TRACING_SKIP_AABBS_KHR = 13, + RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_KHR = 19, + DEFER_COMPILE_NV = 5, + CAPTURE_STATISTICS_KHR = 6, + CAPTURE_INTERNAL_REPRESENTATIONS_KHR = 7, + INDIRECT_BINDABLE_NV = 18, + LIBRARY_KHR = 11, + RETAIN_LINK_TIME_OPTIMIZATION_INFO_EXT = 23, + LINK_TIME_OPTIMIZATION_EXT = 10, + RAY_TRACING_ALLOW_MOTION_NV = 20, + PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_SHADING_RATE_ATTACHMENT_KHR = RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_KHR, + PIPELINE_RASTERIZATION_STATE_CREATE_FRAGMENT_DENSITY_MAP_ATTACHMENT_EXT = RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_EXT, + VIEW_INDEX_FROM_DEVICE_INDEX_KHR = VIEW_INDEX_FROM_DEVICE_INDEX, + DISPATCH_BASE_KHR = DISPATCH_BASE, + FAIL_ON_PIPELINE_COMPILE_REQUIRED_EXT = FAIL_ON_PIPELINE_COMPILE_REQUIRED, + EARLY_RETURN_ON_FAILURE_EXT = EARLY_RETURN_ON_FAILURE, } -PipelineCreationFeedbackFlagsEXT :: distinct bit_set[PipelineCreationFeedbackFlagEXT; Flags] -PipelineCreationFeedbackFlagEXT :: enum Flags { - VALID = 0, - APPLICATION_PIPELINE_CACHE_HIT = 1, - BASE_PIPELINE_ACCELERATION = 2, +PipelineCreationFeedbackFlags :: distinct bit_set[PipelineCreationFeedbackFlag; Flags] +PipelineCreationFeedbackFlag :: enum Flags { + VALID = 0, + APPLICATION_PIPELINE_CACHE_HIT = 1, + BASE_PIPELINE_ACCELERATION = 2, + VALID_EXT = VALID, + APPLICATION_PIPELINE_CACHE_HIT_EXT = APPLICATION_PIPELINE_CACHE_HIT, + BASE_PIPELINE_ACCELERATION_EXT = BASE_PIPELINE_ACCELERATION, +} + +PipelineDepthStencilStateCreateFlags :: distinct bit_set[PipelineDepthStencilStateCreateFlag; Flags] +PipelineDepthStencilStateCreateFlag :: enum Flags { + RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_ARM = 0, + RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_ARM = 1, } PipelineExecutableStatisticFormatKHR :: enum c.int { @@ -1608,10 +1695,17 @@ PipelineExecutableStatisticFormatKHR :: enum c.int { FLOAT64 = 3, } +PipelineLayoutCreateFlags :: distinct bit_set[PipelineLayoutCreateFlag; Flags] +PipelineLayoutCreateFlag :: enum Flags { + INDEPENDENT_SETS_EXT = 1, +} + PipelineShaderStageCreateFlags :: distinct bit_set[PipelineShaderStageCreateFlag; Flags] PipelineShaderStageCreateFlag :: enum Flags { - ALLOW_VARYING_SUBGROUP_SIZE_EXT = 0, - REQUIRE_FULL_SUBGROUPS_EXT = 1, + ALLOW_VARYING_SUBGROUP_SIZE = 0, + REQUIRE_FULL_SUBGROUPS = 1, + ALLOW_VARYING_SUBGROUP_SIZE_EXT = ALLOW_VARYING_SUBGROUP_SIZE, + REQUIRE_FULL_SUBGROUPS_EXT = REQUIRE_FULL_SUBGROUPS, } PipelineStageFlags :: distinct bit_set[PipelineStageFlag; Flags] @@ -1647,7 +1741,7 @@ PipelineStageFlag :: enum Flags { ACCELERATION_STRUCTURE_BUILD_NV = ACCELERATION_STRUCTURE_BUILD_KHR, } -PipelineStageFlags_NONE_KHR :: PipelineStageFlags{} +PipelineStageFlags_NONE :: PipelineStageFlags{} PointClippingBehavior :: enum c.int { @@ -1687,10 +1781,6 @@ PrimitiveTopology :: enum c.int { PATCH_LIST = 10, } -PrivateDataSlotCreateFlagsEXT :: distinct bit_set[PrivateDataSlotCreateFlagEXT; Flags] -PrivateDataSlotCreateFlagEXT :: enum Flags { -} - ProvokingVertexModeEXT :: enum c.int { FIRST_VERTEX = 0, LAST_VERTEX = 1, @@ -1741,6 +1831,7 @@ QueryType :: enum c.int { ACCELERATION_STRUCTURE_COMPACTED_SIZE_NV = 1000165000, PERFORMANCE_QUERY_INTEL = 1000210000, VIDEO_ENCODE_BITSTREAM_BUFFER_RANGE_KHR = 1000299000, + PRIMITIVES_GENERATED_EXT = 1000382000, } QueueFlags :: distinct bit_set[QueueFlag; Flags] @@ -1754,11 +1845,15 @@ QueueFlag :: enum Flags { VIDEO_ENCODE_KHR = 6, } -QueueGlobalPriorityEXT :: enum c.int { - LOW = 128, - MEDIUM = 256, - HIGH = 512, - REALTIME = 1024, +QueueGlobalPriorityKHR :: enum c.int { + LOW = 128, + MEDIUM = 256, + HIGH = 512, + REALTIME = 1024, + LOW_EXT = LOW, + MEDIUM_EXT = MEDIUM, + HIGH_EXT = HIGH, + REALTIME_EXT = REALTIME, } RasterizationOrderAMD :: enum c.int { @@ -1780,6 +1875,16 @@ RenderPassCreateFlag :: enum Flags { TRANSFORM_QCOM = 1, } +RenderingFlags :: distinct bit_set[RenderingFlag; Flags] +RenderingFlag :: enum Flags { + CONTENTS_SECONDARY_COMMAND_BUFFERS = 0, + SUSPENDING = 1, + RESUMING = 2, + CONTENTS_SECONDARY_COMMAND_BUFFERS_KHR = CONTENTS_SECONDARY_COMMAND_BUFFERS, + SUSPENDING_KHR = SUSPENDING, + RESUMING_KHR = RESUMING, +} + ResolveModeFlags :: distinct bit_set[ResolveModeFlag; Flags] ResolveModeFlag :: enum Flags { SAMPLE_ZERO = 0, @@ -1819,6 +1924,7 @@ Result :: enum c.int { ERROR_INVALID_EXTERNAL_HANDLE = -1000072003, ERROR_FRAGMENTATION = -1000161000, ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS = -1000257000, + PIPELINE_COMPILE_REQUIRED = 1000297000, ERROR_SURFACE_LOST_KHR = -1000000000, ERROR_NATIVE_WINDOW_IN_USE_KHR = -1000000001, SUBOPTIMAL_KHR = 1000001003, @@ -1827,19 +1933,20 @@ Result :: enum c.int { ERROR_VALIDATION_FAILED_EXT = -1000011001, ERROR_INVALID_SHADER_NV = -1000012000, ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT = -1000158000, - ERROR_NOT_PERMITTED_EXT = -1000174001, + ERROR_NOT_PERMITTED_KHR = -1000174001, ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT = -1000255000, THREAD_IDLE_KHR = 1000268000, THREAD_DONE_KHR = 1000268001, OPERATION_DEFERRED_KHR = 1000268002, OPERATION_NOT_DEFERRED_KHR = 1000268003, - PIPELINE_COMPILE_REQUIRED_EXT = 1000297000, ERROR_OUT_OF_POOL_MEMORY_KHR = ERROR_OUT_OF_POOL_MEMORY, ERROR_INVALID_EXTERNAL_HANDLE_KHR = ERROR_INVALID_EXTERNAL_HANDLE, ERROR_FRAGMENTATION_EXT = ERROR_FRAGMENTATION, + ERROR_NOT_PERMITTED_EXT = ERROR_NOT_PERMITTED_KHR, ERROR_INVALID_DEVICE_ADDRESS_EXT = ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS, ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS_KHR = ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS, - ERROR_PIPELINE_COMPILE_REQUIRED_EXT = PIPELINE_COMPILE_REQUIRED_EXT, + PIPELINE_COMPILE_REQUIRED_EXT = PIPELINE_COMPILE_REQUIRED, + ERROR_PIPELINE_COMPILE_REQUIRED_EXT = PIPELINE_COMPILE_REQUIRED, } SampleCountFlags :: distinct bit_set[SampleCountFlag; Flags] @@ -2036,692 +2143,809 @@ StencilOp :: enum c.int { } StructureType :: enum c.int { - APPLICATION_INFO = 0, - INSTANCE_CREATE_INFO = 1, - DEVICE_QUEUE_CREATE_INFO = 2, - DEVICE_CREATE_INFO = 3, - SUBMIT_INFO = 4, - MEMORY_ALLOCATE_INFO = 5, - MAPPED_MEMORY_RANGE = 6, - BIND_SPARSE_INFO = 7, - FENCE_CREATE_INFO = 8, - SEMAPHORE_CREATE_INFO = 9, - EVENT_CREATE_INFO = 10, - QUERY_POOL_CREATE_INFO = 11, - BUFFER_CREATE_INFO = 12, - BUFFER_VIEW_CREATE_INFO = 13, - IMAGE_CREATE_INFO = 14, - IMAGE_VIEW_CREATE_INFO = 15, - SHADER_MODULE_CREATE_INFO = 16, - PIPELINE_CACHE_CREATE_INFO = 17, - PIPELINE_SHADER_STAGE_CREATE_INFO = 18, - PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 19, - PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO = 20, - PIPELINE_TESSELLATION_STATE_CREATE_INFO = 21, - PIPELINE_VIEWPORT_STATE_CREATE_INFO = 22, - PIPELINE_RASTERIZATION_STATE_CREATE_INFO = 23, - PIPELINE_MULTISAMPLE_STATE_CREATE_INFO = 24, - PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO = 25, - PIPELINE_COLOR_BLEND_STATE_CREATE_INFO = 26, - PIPELINE_DYNAMIC_STATE_CREATE_INFO = 27, - GRAPHICS_PIPELINE_CREATE_INFO = 28, - COMPUTE_PIPELINE_CREATE_INFO = 29, - PIPELINE_LAYOUT_CREATE_INFO = 30, - SAMPLER_CREATE_INFO = 31, - DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 32, - DESCRIPTOR_POOL_CREATE_INFO = 33, - DESCRIPTOR_SET_ALLOCATE_INFO = 34, - WRITE_DESCRIPTOR_SET = 35, - COPY_DESCRIPTOR_SET = 36, - FRAMEBUFFER_CREATE_INFO = 37, - RENDER_PASS_CREATE_INFO = 38, - COMMAND_POOL_CREATE_INFO = 39, - COMMAND_BUFFER_ALLOCATE_INFO = 40, - COMMAND_BUFFER_INHERITANCE_INFO = 41, - COMMAND_BUFFER_BEGIN_INFO = 42, - RENDER_PASS_BEGIN_INFO = 43, - BUFFER_MEMORY_BARRIER = 44, - IMAGE_MEMORY_BARRIER = 45, - MEMORY_BARRIER = 46, - LOADER_INSTANCE_CREATE_INFO = 47, - LOADER_DEVICE_CREATE_INFO = 48, - PHYSICAL_DEVICE_SUBGROUP_PROPERTIES = 1000094000, - BIND_BUFFER_MEMORY_INFO = 1000157000, - BIND_IMAGE_MEMORY_INFO = 1000157001, - PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES = 1000083000, - MEMORY_DEDICATED_REQUIREMENTS = 1000127000, - MEMORY_DEDICATED_ALLOCATE_INFO = 1000127001, - MEMORY_ALLOCATE_FLAGS_INFO = 1000060000, - DEVICE_GROUP_RENDER_PASS_BEGIN_INFO = 1000060003, - DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO = 1000060004, - DEVICE_GROUP_SUBMIT_INFO = 1000060005, - DEVICE_GROUP_BIND_SPARSE_INFO = 1000060006, - BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO = 1000060013, - BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO = 1000060014, - PHYSICAL_DEVICE_GROUP_PROPERTIES = 1000070000, - DEVICE_GROUP_DEVICE_CREATE_INFO = 1000070001, - BUFFER_MEMORY_REQUIREMENTS_INFO_2 = 1000146000, - IMAGE_MEMORY_REQUIREMENTS_INFO_2 = 1000146001, - IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2 = 1000146002, - MEMORY_REQUIREMENTS_2 = 1000146003, - SPARSE_IMAGE_MEMORY_REQUIREMENTS_2 = 1000146004, - PHYSICAL_DEVICE_FEATURES_2 = 1000059000, - PHYSICAL_DEVICE_PROPERTIES_2 = 1000059001, - FORMAT_PROPERTIES_2 = 1000059002, - IMAGE_FORMAT_PROPERTIES_2 = 1000059003, - PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2 = 1000059004, - QUEUE_FAMILY_PROPERTIES_2 = 1000059005, - PHYSICAL_DEVICE_MEMORY_PROPERTIES_2 = 1000059006, - SPARSE_IMAGE_FORMAT_PROPERTIES_2 = 1000059007, - PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2 = 1000059008, - PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES = 1000117000, - RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO = 1000117001, - IMAGE_VIEW_USAGE_CREATE_INFO = 1000117002, - PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO = 1000117003, - RENDER_PASS_MULTIVIEW_CREATE_INFO = 1000053000, - PHYSICAL_DEVICE_MULTIVIEW_FEATURES = 1000053001, - PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES = 1000053002, - PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES = 1000120000, - PROTECTED_SUBMIT_INFO = 1000145000, - PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES = 1000145001, - PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES = 1000145002, - DEVICE_QUEUE_INFO_2 = 1000145003, - SAMPLER_YCBCR_CONVERSION_CREATE_INFO = 1000156000, - SAMPLER_YCBCR_CONVERSION_INFO = 1000156001, - BIND_IMAGE_PLANE_MEMORY_INFO = 1000156002, - IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO = 1000156003, - PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES = 1000156004, - SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES = 1000156005, - DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO = 1000085000, - PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO = 1000071000, - EXTERNAL_IMAGE_FORMAT_PROPERTIES = 1000071001, - PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO = 1000071002, - EXTERNAL_BUFFER_PROPERTIES = 1000071003, - PHYSICAL_DEVICE_ID_PROPERTIES = 1000071004, - EXTERNAL_MEMORY_BUFFER_CREATE_INFO = 1000072000, - EXTERNAL_MEMORY_IMAGE_CREATE_INFO = 1000072001, - EXPORT_MEMORY_ALLOCATE_INFO = 1000072002, - PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO = 1000112000, - EXTERNAL_FENCE_PROPERTIES = 1000112001, - EXPORT_FENCE_CREATE_INFO = 1000113000, - EXPORT_SEMAPHORE_CREATE_INFO = 1000077000, - PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO = 1000076000, - EXTERNAL_SEMAPHORE_PROPERTIES = 1000076001, - PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES = 1000168000, - DESCRIPTOR_SET_LAYOUT_SUPPORT = 1000168001, - PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES = 1000063000, - PHYSICAL_DEVICE_VULKAN_1_1_FEATURES = 49, - PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES = 50, - PHYSICAL_DEVICE_VULKAN_1_2_FEATURES = 51, - PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES = 52, - IMAGE_FORMAT_LIST_CREATE_INFO = 1000147000, - ATTACHMENT_DESCRIPTION_2 = 1000109000, - ATTACHMENT_REFERENCE_2 = 1000109001, - SUBPASS_DESCRIPTION_2 = 1000109002, - SUBPASS_DEPENDENCY_2 = 1000109003, - RENDER_PASS_CREATE_INFO_2 = 1000109004, - SUBPASS_BEGIN_INFO = 1000109005, - SUBPASS_END_INFO = 1000109006, - PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES = 1000177000, - PHYSICAL_DEVICE_DRIVER_PROPERTIES = 1000196000, - PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES = 1000180000, - PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES = 1000082000, - PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES = 1000197000, - DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO = 1000161000, - PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES = 1000161001, - PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES = 1000161002, - DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO = 1000161003, - DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT = 1000161004, - PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES = 1000199000, - SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE = 1000199001, - PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES = 1000221000, - IMAGE_STENCIL_USAGE_CREATE_INFO = 1000246000, - PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES = 1000130000, - SAMPLER_REDUCTION_MODE_CREATE_INFO = 1000130001, - PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES = 1000211000, - PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES = 1000108000, - FRAMEBUFFER_ATTACHMENTS_CREATE_INFO = 1000108001, - FRAMEBUFFER_ATTACHMENT_IMAGE_INFO = 1000108002, - RENDER_PASS_ATTACHMENT_BEGIN_INFO = 1000108003, - PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000, - PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES = 1000175000, - PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES = 1000241000, - ATTACHMENT_REFERENCE_STENCIL_LAYOUT = 1000241001, - ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT = 1000241002, - PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES = 1000261000, - PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES = 1000207000, - PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES = 1000207001, - SEMAPHORE_TYPE_CREATE_INFO = 1000207002, - TIMELINE_SEMAPHORE_SUBMIT_INFO = 1000207003, - SEMAPHORE_WAIT_INFO = 1000207004, - SEMAPHORE_SIGNAL_INFO = 1000207005, - PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES = 1000257000, - BUFFER_DEVICE_ADDRESS_INFO = 1000244001, - BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002, - MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO = 1000257003, - DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO = 1000257004, - SWAPCHAIN_CREATE_INFO_KHR = 1000001000, - PRESENT_INFO_KHR = 1000001001, - DEVICE_GROUP_PRESENT_CAPABILITIES_KHR = 1000060007, - IMAGE_SWAPCHAIN_CREATE_INFO_KHR = 1000060008, - BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR = 1000060009, - ACQUIRE_NEXT_IMAGE_INFO_KHR = 1000060010, - DEVICE_GROUP_PRESENT_INFO_KHR = 1000060011, - DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR = 1000060012, - DISPLAY_MODE_CREATE_INFO_KHR = 1000002000, - DISPLAY_SURFACE_CREATE_INFO_KHR = 1000002001, - DISPLAY_PRESENT_INFO_KHR = 1000003000, - XLIB_SURFACE_CREATE_INFO_KHR = 1000004000, - XCB_SURFACE_CREATE_INFO_KHR = 1000005000, - WAYLAND_SURFACE_CREATE_INFO_KHR = 1000006000, - ANDROID_SURFACE_CREATE_INFO_KHR = 1000008000, - WIN32_SURFACE_CREATE_INFO_KHR = 1000009000, - DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT = 1000011000, - PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD = 1000018000, - DEBUG_MARKER_OBJECT_NAME_INFO_EXT = 1000022000, - DEBUG_MARKER_OBJECT_TAG_INFO_EXT = 1000022001, - DEBUG_MARKER_MARKER_INFO_EXT = 1000022002, - VIDEO_PROFILE_KHR = 1000023000, - VIDEO_CAPABILITIES_KHR = 1000023001, - VIDEO_PICTURE_RESOURCE_KHR = 1000023002, - VIDEO_GET_MEMORY_PROPERTIES_KHR = 1000023003, - VIDEO_BIND_MEMORY_KHR = 1000023004, - VIDEO_SESSION_CREATE_INFO_KHR = 1000023005, - VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000023006, - VIDEO_SESSION_PARAMETERS_UPDATE_INFO_KHR = 1000023007, - VIDEO_BEGIN_CODING_INFO_KHR = 1000023008, - VIDEO_END_CODING_INFO_KHR = 1000023009, - VIDEO_CODING_CONTROL_INFO_KHR = 1000023010, - VIDEO_REFERENCE_SLOT_KHR = 1000023011, - VIDEO_QUEUE_FAMILY_PROPERTIES_2_KHR = 1000023012, - VIDEO_PROFILES_KHR = 1000023013, - PHYSICAL_DEVICE_VIDEO_FORMAT_INFO_KHR = 1000023014, - VIDEO_FORMAT_PROPERTIES_KHR = 1000023015, - VIDEO_DECODE_INFO_KHR = 1000024000, - DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV = 1000026000, - DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001, - DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 1000026002, - PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT = 1000028000, - PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT = 1000028001, - PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT = 1000028002, - CU_MODULE_CREATE_INFO_NVX = 1000029000, - CU_FUNCTION_CREATE_INFO_NVX = 1000029001, - CU_LAUNCH_INFO_NVX = 1000029002, - IMAGE_VIEW_HANDLE_INFO_NVX = 1000030000, - IMAGE_VIEW_ADDRESS_PROPERTIES_NVX = 1000030001, - VIDEO_ENCODE_H264_CAPABILITIES_EXT = 1000038000, - VIDEO_ENCODE_H264_SESSION_CREATE_INFO_EXT = 1000038001, - VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000038002, - VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000038003, - VIDEO_ENCODE_H264_VCL_FRAME_INFO_EXT = 1000038004, - VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT = 1000038005, - VIDEO_ENCODE_H264_NALU_SLICE_EXT = 1000038006, - VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_EXT = 1000038007, - VIDEO_ENCODE_H264_PROFILE_EXT = 1000038008, - VIDEO_DECODE_H264_CAPABILITIES_EXT = 1000040000, - VIDEO_DECODE_H264_SESSION_CREATE_INFO_EXT = 1000040001, - VIDEO_DECODE_H264_PICTURE_INFO_EXT = 1000040002, - VIDEO_DECODE_H264_MVC_EXT = 1000040003, - VIDEO_DECODE_H264_PROFILE_EXT = 1000040004, - VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000040005, - VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000040006, - VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT = 1000040007, - TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000, - STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP = 1000049000, - PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV = 1000050000, - EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000, - EXPORT_MEMORY_ALLOCATE_INFO_NV = 1000056001, - IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057000, - EXPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057001, - WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000, - VALIDATION_FLAGS_EXT = 1000061000, - VI_SURFACE_CREATE_INFO_NN = 1000062000, - PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT = 1000066000, - IMAGE_VIEW_ASTC_DECODE_MODE_EXT = 1000067000, - PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT = 1000067001, - IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073000, - EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073001, - MEMORY_WIN32_HANDLE_PROPERTIES_KHR = 1000073002, - MEMORY_GET_WIN32_HANDLE_INFO_KHR = 1000073003, - IMPORT_MEMORY_FD_INFO_KHR = 1000074000, - MEMORY_FD_PROPERTIES_KHR = 1000074001, - MEMORY_GET_FD_INFO_KHR = 1000074002, - WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR = 1000075000, - IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR = 1000078000, - EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR = 1000078001, - D3D12_FENCE_SUBMIT_INFO_KHR = 1000078002, - SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR = 1000078003, - IMPORT_SEMAPHORE_FD_INFO_KHR = 1000079000, - SEMAPHORE_GET_FD_INFO_KHR = 1000079001, - PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = 1000080000, - COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT = 1000081000, - PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT = 1000081001, - CONDITIONAL_RENDERING_BEGIN_INFO_EXT = 1000081002, - PRESENT_REGIONS_KHR = 1000084000, - PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV = 1000087000, - SURFACE_CAPABILITIES_2_EXT = 1000090000, - DISPLAY_POWER_INFO_EXT = 1000091000, - DEVICE_EVENT_INFO_EXT = 1000091001, - DISPLAY_EVENT_INFO_EXT = 1000091002, - SWAPCHAIN_COUNTER_CREATE_INFO_EXT = 1000091003, - PRESENT_TIMES_INFO_GOOGLE = 1000092000, - PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX = 1000097000, - PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV = 1000098000, - PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT = 1000099000, - PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT = 1000099001, - PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT = 1000101000, - PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT = 1000101001, - PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT = 1000102000, - PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT = 1000102001, - HDR_METADATA_EXT = 1000105000, - SHARED_PRESENT_SURFACE_CAPABILITIES_KHR = 1000111000, - IMPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114000, - EXPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114001, - FENCE_GET_WIN32_HANDLE_INFO_KHR = 1000114002, - IMPORT_FENCE_FD_INFO_KHR = 1000115000, - FENCE_GET_FD_INFO_KHR = 1000115001, - PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR = 1000116000, - PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR = 1000116001, - QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR = 1000116002, - PERFORMANCE_QUERY_SUBMIT_INFO_KHR = 1000116003, - ACQUIRE_PROFILING_LOCK_INFO_KHR = 1000116004, - PERFORMANCE_COUNTER_KHR = 1000116005, - PERFORMANCE_COUNTER_DESCRIPTION_KHR = 1000116006, - PHYSICAL_DEVICE_SURFACE_INFO_2_KHR = 1000119000, - SURFACE_CAPABILITIES_2_KHR = 1000119001, - SURFACE_FORMAT_2_KHR = 1000119002, - DISPLAY_PROPERTIES_2_KHR = 1000121000, - DISPLAY_PLANE_PROPERTIES_2_KHR = 1000121001, - DISPLAY_MODE_PROPERTIES_2_KHR = 1000121002, - DISPLAY_PLANE_INFO_2_KHR = 1000121003, - DISPLAY_PLANE_CAPABILITIES_2_KHR = 1000121004, - IOS_SURFACE_CREATE_INFO_MVK = 1000122000, - MACOS_SURFACE_CREATE_INFO_MVK = 1000123000, - DEBUG_UTILS_OBJECT_NAME_INFO_EXT = 1000128000, - DEBUG_UTILS_OBJECT_TAG_INFO_EXT = 1000128001, - DEBUG_UTILS_LABEL_EXT = 1000128002, - DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT = 1000128003, - DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT = 1000128004, - ANDROID_HARDWARE_BUFFER_USAGE_ANDROID = 1000129000, - ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID = 1000129001, - ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID = 1000129002, - IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID = 1000129003, - MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID = 1000129004, - EXTERNAL_FORMAT_ANDROID = 1000129005, - PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT = 1000138000, - PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT = 1000138001, - WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT = 1000138002, - DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT = 1000138003, - SAMPLE_LOCATIONS_INFO_EXT = 1000143000, - RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT = 1000143001, - PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT = 1000143002, - PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT = 1000143003, - MULTISAMPLE_PROPERTIES_EXT = 1000143004, - PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT = 1000148000, - PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT = 1000148001, - PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT = 1000148002, - PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV = 1000149000, - WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR = 1000150007, - ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR = 1000150000, - ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR = 1000150002, - ACCELERATION_STRUCTURE_GEOMETRY_AABBS_DATA_KHR = 1000150003, - ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR = 1000150004, - ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR = 1000150005, - ACCELERATION_STRUCTURE_GEOMETRY_KHR = 1000150006, - ACCELERATION_STRUCTURE_VERSION_INFO_KHR = 1000150009, - COPY_ACCELERATION_STRUCTURE_INFO_KHR = 1000150010, - COPY_ACCELERATION_STRUCTURE_TO_MEMORY_INFO_KHR = 1000150011, - COPY_MEMORY_TO_ACCELERATION_STRUCTURE_INFO_KHR = 1000150012, - PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR = 1000150013, - PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR = 1000150014, - ACCELERATION_STRUCTURE_CREATE_INFO_KHR = 1000150017, - ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR = 1000150020, - PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR = 1000347000, - PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR = 1000347001, - RAY_TRACING_PIPELINE_CREATE_INFO_KHR = 1000150015, - RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR = 1000150016, - RAY_TRACING_PIPELINE_INTERFACE_CREATE_INFO_KHR = 1000150018, - PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR = 1000348013, - PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV = 1000152000, - PHYSICAL_DEVICE_SHADER_SM_BUILTINS_FEATURES_NV = 1000154000, - PHYSICAL_DEVICE_SHADER_SM_BUILTINS_PROPERTIES_NV = 1000154001, - DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT = 1000158000, - PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT = 1000158002, - IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT = 1000158003, - IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT = 1000158004, - IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT = 1000158005, - VALIDATION_CACHE_CREATE_INFO_EXT = 1000160000, - SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160001, - PHYSICAL_DEVICE_PORTABILITY_SUBSET_FEATURES_KHR = 1000163000, - PHYSICAL_DEVICE_PORTABILITY_SUBSET_PROPERTIES_KHR = 1000163001, - PIPELINE_VIEWPORT_SHADING_RATE_IMAGE_STATE_CREATE_INFO_NV = 1000164000, - PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV = 1000164001, - PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV = 1000164002, - PIPELINE_VIEWPORT_COARSE_SAMPLE_ORDER_STATE_CREATE_INFO_NV = 1000164005, - RAY_TRACING_PIPELINE_CREATE_INFO_NV = 1000165000, - ACCELERATION_STRUCTURE_CREATE_INFO_NV = 1000165001, - GEOMETRY_NV = 1000165003, - GEOMETRY_TRIANGLES_NV = 1000165004, - GEOMETRY_AABB_NV = 1000165005, - BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV = 1000165006, - WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV = 1000165007, - ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV = 1000165008, - PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV = 1000165009, - RAY_TRACING_SHADER_GROUP_CREATE_INFO_NV = 1000165011, - ACCELERATION_STRUCTURE_INFO_NV = 1000165012, - PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV = 1000166000, - PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV = 1000166001, - PHYSICAL_DEVICE_IMAGE_VIEW_IMAGE_FORMAT_INFO_EXT = 1000170000, - FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT = 1000170001, - DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = 1000174000, - IMPORT_MEMORY_HOST_POINTER_INFO_EXT = 1000178000, - MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, - PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, - PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR = 1000181000, - PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, - CALIBRATED_TIMESTAMP_INFO_EXT = 1000184000, - PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, - VIDEO_DECODE_H265_CAPABILITIES_EXT = 1000187000, - VIDEO_DECODE_H265_SESSION_CREATE_INFO_EXT = 1000187001, - VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000187002, - VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT = 1000187003, - VIDEO_DECODE_H265_PROFILE_EXT = 1000187004, - VIDEO_DECODE_H265_PICTURE_INFO_EXT = 1000187005, - VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT = 1000187006, - DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, - PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, - PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, - PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, - PRESENT_FRAME_TOKEN_GGP = 1000191000, - PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = 1000192000, - PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000, - PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000, - PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV = 1000202001, - PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV = 1000203000, - PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV = 1000204000, - PIPELINE_VIEWPORT_EXCLUSIVE_SCISSOR_STATE_CREATE_INFO_NV = 1000205000, - PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV = 1000205002, - CHECKPOINT_DATA_NV = 1000206000, - QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV = 1000206001, - PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL = 1000209000, - QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL = 1000210000, - INITIALIZE_PERFORMANCE_API_INFO_INTEL = 1000210001, - PERFORMANCE_MARKER_INFO_INTEL = 1000210002, - PERFORMANCE_STREAM_MARKER_INFO_INTEL = 1000210003, - PERFORMANCE_OVERRIDE_INFO_INTEL = 1000210004, - PERFORMANCE_CONFIGURATION_ACQUIRE_INFO_INTEL = 1000210005, - PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT = 1000212000, - DISPLAY_NATIVE_HDR_SURFACE_CAPABILITIES_AMD = 1000213000, - SWAPCHAIN_DISPLAY_NATIVE_HDR_CREATE_INFO_AMD = 1000213001, - IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000, - PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR = 1000215000, - METAL_SURFACE_CREATE_INFO_EXT = 1000217000, - PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000, - PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001, - RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002, - PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT = 1000225000, - PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = 1000225001, - PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = 1000225002, - FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000226000, - PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR = 1000226001, - PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR = 1000226002, - PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR = 1000226003, - PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR = 1000226004, - PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000, - PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000, - PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT = 1000234000, - PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, - PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, - MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, - SURFACE_PROTECTED_CAPABILITIES_KHR = 1000239000, - PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV = 1000240000, - PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT = 1000244000, - BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, - PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT = 1000245000, - VALIDATION_FEATURES_EXT = 1000247000, - PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR = 1000248000, - PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV = 1000249000, - COOPERATIVE_MATRIX_PROPERTIES_NV = 1000249001, - PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_NV = 1000249002, - PHYSICAL_DEVICE_COVERAGE_REDUCTION_MODE_FEATURES_NV = 1000250000, - PIPELINE_COVERAGE_REDUCTION_STATE_CREATE_INFO_NV = 1000250001, - FRAMEBUFFER_MIXED_SAMPLES_COMBINATION_NV = 1000250002, - PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT = 1000251000, - PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000, - PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT = 1000254000, - PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT = 1000254001, - PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT = 1000254002, - SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT = 1000255000, - SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT = 1000255002, - SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT = 1000255001, - HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000, - PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = 1000259000, - PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = 1000259001, - PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT = 1000259002, - PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT = 1000260000, - PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT = 1000265000, - PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT = 1000267000, - PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR = 1000269000, - PIPELINE_INFO_KHR = 1000269001, - PIPELINE_EXECUTABLE_PROPERTIES_KHR = 1000269002, - PIPELINE_EXECUTABLE_INFO_KHR = 1000269003, - PIPELINE_EXECUTABLE_STATISTIC_KHR = 1000269004, - PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR = 1000269005, - PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000, - PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = 1000276000, - PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV = 1000277000, - GRAPHICS_SHADER_GROUP_CREATE_INFO_NV = 1000277001, - GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV = 1000277002, - INDIRECT_COMMANDS_LAYOUT_TOKEN_NV = 1000277003, - INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NV = 1000277004, - GENERATED_COMMANDS_INFO_NV = 1000277005, - GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_NV = 1000277006, - PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV = 1000277007, - PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV = 1000278000, - COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV = 1000278001, - PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = 1000280000, - PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = 1000280001, - PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT = 1000281000, - PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = 1000281001, - COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM = 1000282000, - RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM = 1000282001, - PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT = 1000284000, - DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT = 1000284001, - DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT = 1000284002, - PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT = 1000286000, - PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT = 1000286001, - SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT = 1000287000, - PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT = 1000287001, - PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT = 1000287002, - PIPELINE_LIBRARY_CREATE_INFO_KHR = 1000290000, - PRESENT_ID_KHR = 1000294000, - PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR = 1000294001, - PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT = 1000295000, - DEVICE_PRIVATE_DATA_CREATE_INFO_EXT = 1000295001, - PRIVATE_DATA_SLOT_CREATE_INFO_EXT = 1000295002, - PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, - VIDEO_ENCODE_INFO_KHR = 1000299000, - VIDEO_ENCODE_RATE_CONTROL_INFO_KHR = 1000299001, - PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, - DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, - MEMORY_BARRIER_2_KHR = 1000314000, - BUFFER_MEMORY_BARRIER_2_KHR = 1000314001, - IMAGE_MEMORY_BARRIER_2_KHR = 1000314002, - DEPENDENCY_INFO_KHR = 1000314003, - SUBMIT_INFO_2_KHR = 1000314004, - SEMAPHORE_SUBMIT_INFO_KHR = 1000314005, - COMMAND_BUFFER_SUBMIT_INFO_KHR = 1000314006, - PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR = 1000314007, - QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV = 1000314008, - CHECKPOINT_DATA_2_NV = 1000314009, - PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR = 1000323000, - PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = 1000325000, - PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV = 1000326000, - PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV = 1000326001, - PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV = 1000326002, - ACCELERATION_STRUCTURE_GEOMETRY_MOTION_TRIANGLES_DATA_NV = 1000327000, - PHYSICAL_DEVICE_RAY_TRACING_MOTION_BLUR_FEATURES_NV = 1000327001, - ACCELERATION_STRUCTURE_MOTION_INFO_NV = 1000327002, - PHYSICAL_DEVICE_YCBCR_2_PLANE_444_FORMATS_FEATURES_EXT = 1000330000, - PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT = 1000332000, - PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, - COPY_COMMAND_TRANSFORM_INFO_QCOM = 1000333000, - PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = 1000335000, - PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR = 1000336000, - COPY_BUFFER_INFO_2_KHR = 1000337000, - COPY_IMAGE_INFO_2_KHR = 1000337001, - COPY_BUFFER_TO_IMAGE_INFO_2_KHR = 1000337002, - COPY_IMAGE_TO_BUFFER_INFO_2_KHR = 1000337003, - BLIT_IMAGE_INFO_2_KHR = 1000337004, - RESOLVE_IMAGE_INFO_2_KHR = 1000337005, - BUFFER_COPY_2_KHR = 1000337006, - IMAGE_COPY_2_KHR = 1000337007, - IMAGE_BLIT_2_KHR = 1000337008, - BUFFER_IMAGE_COPY_2_KHR = 1000337009, - IMAGE_RESOLVE_2_KHR = 1000337010, - PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT = 1000340000, - DIRECTFB_SURFACE_CREATE_INFO_EXT = 1000346000, - PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE = 1000351000, - MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE = 1000351002, - PHYSICAL_DEVICE_VERTEX_INPUT_DYNAMIC_STATE_FEATURES_EXT = 1000352000, - VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT = 1000352001, - VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT = 1000352002, - PHYSICAL_DEVICE_DRM_PROPERTIES_EXT = 1000353000, - PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT = 1000356000, - IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364000, - MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA = 1000364001, - MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364002, - IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA = 1000365000, - SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000365001, - SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI = 1000369000, - PHYSICAL_DEVICE_SUBPASS_SHADING_FEATURES_HUAWEI = 1000369001, - PHYSICAL_DEVICE_SUBPASS_SHADING_PROPERTIES_HUAWEI = 1000369002, - PHYSICAL_DEVICE_INVOCATION_MASK_FEATURES_HUAWEI = 1000370000, - MEMORY_GET_REMOTE_ADDRESS_INFO_NV = 1000371000, - PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV = 1000371001, - PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT = 1000377000, - SCREEN_SURFACE_CREATE_INFO_QNX = 1000378000, - PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT = 1000381000, - PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001, - PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = 1000388000, - QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = 1000388001, - PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT = 1000392000, - PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT = 1000392001, - PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, - PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, - PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, - DEBUG_REPORT_CREATE_INFO_EXT = DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, - RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = RENDER_PASS_MULTIVIEW_CREATE_INFO, - PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = PHYSICAL_DEVICE_MULTIVIEW_FEATURES, - PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES, - PHYSICAL_DEVICE_FEATURES_2_KHR = PHYSICAL_DEVICE_FEATURES_2, - PHYSICAL_DEVICE_PROPERTIES_2_KHR = PHYSICAL_DEVICE_PROPERTIES_2, - FORMAT_PROPERTIES_2_KHR = FORMAT_PROPERTIES_2, - IMAGE_FORMAT_PROPERTIES_2_KHR = IMAGE_FORMAT_PROPERTIES_2, - PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR = PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, - QUEUE_FAMILY_PROPERTIES_2_KHR = QUEUE_FAMILY_PROPERTIES_2, - PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR = PHYSICAL_DEVICE_MEMORY_PROPERTIES_2, - SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR = SPARSE_IMAGE_FORMAT_PROPERTIES_2, - PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR = PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2, - MEMORY_ALLOCATE_FLAGS_INFO_KHR = MEMORY_ALLOCATE_FLAGS_INFO, - DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHR = DEVICE_GROUP_RENDER_PASS_BEGIN_INFO, - DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHR = DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO, - DEVICE_GROUP_SUBMIT_INFO_KHR = DEVICE_GROUP_SUBMIT_INFO, - DEVICE_GROUP_BIND_SPARSE_INFO_KHR = DEVICE_GROUP_BIND_SPARSE_INFO, - BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO_KHR = BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO, - BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO_KHR = BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO, - PHYSICAL_DEVICE_GROUP_PROPERTIES_KHR = PHYSICAL_DEVICE_GROUP_PROPERTIES, - DEVICE_GROUP_DEVICE_CREATE_INFO_KHR = DEVICE_GROUP_DEVICE_CREATE_INFO, - PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO, - EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHR = EXTERNAL_IMAGE_FORMAT_PROPERTIES, - PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO, - EXTERNAL_BUFFER_PROPERTIES_KHR = EXTERNAL_BUFFER_PROPERTIES, - PHYSICAL_DEVICE_ID_PROPERTIES_KHR = PHYSICAL_DEVICE_ID_PROPERTIES, - EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR = EXTERNAL_MEMORY_BUFFER_CREATE_INFO, - EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR = EXTERNAL_MEMORY_IMAGE_CREATE_INFO, - EXPORT_MEMORY_ALLOCATE_INFO_KHR = EXPORT_MEMORY_ALLOCATE_INFO, - PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO, - EXTERNAL_SEMAPHORE_PROPERTIES_KHR = EXTERNAL_SEMAPHORE_PROPERTIES, - EXPORT_SEMAPHORE_CREATE_INFO_KHR = EXPORT_SEMAPHORE_CREATE_INFO, - PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES, - PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES, - PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR = PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES, - DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR = DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO, - SURFACE_CAPABILITIES2_EXT = SURFACE_CAPABILITIES_2_EXT, - PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES_KHR = PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES, - FRAMEBUFFER_ATTACHMENTS_CREATE_INFO_KHR = FRAMEBUFFER_ATTACHMENTS_CREATE_INFO, - FRAMEBUFFER_ATTACHMENT_IMAGE_INFO_KHR = FRAMEBUFFER_ATTACHMENT_IMAGE_INFO, - RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR = RENDER_PASS_ATTACHMENT_BEGIN_INFO, - ATTACHMENT_DESCRIPTION_2_KHR = ATTACHMENT_DESCRIPTION_2, - ATTACHMENT_REFERENCE_2_KHR = ATTACHMENT_REFERENCE_2, - SUBPASS_DESCRIPTION_2_KHR = SUBPASS_DESCRIPTION_2, - SUBPASS_DEPENDENCY_2_KHR = SUBPASS_DEPENDENCY_2, - RENDER_PASS_CREATE_INFO_2_KHR = RENDER_PASS_CREATE_INFO_2, - SUBPASS_BEGIN_INFO_KHR = SUBPASS_BEGIN_INFO, - SUBPASS_END_INFO_KHR = SUBPASS_END_INFO, - PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO, - EXTERNAL_FENCE_PROPERTIES_KHR = EXTERNAL_FENCE_PROPERTIES, - EXPORT_FENCE_CREATE_INFO_KHR = EXPORT_FENCE_CREATE_INFO, - PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR = PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES, - RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO_KHR = RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO, - IMAGE_VIEW_USAGE_CREATE_INFO_KHR = IMAGE_VIEW_USAGE_CREATE_INFO, - PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO_KHR = PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO, - PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR = PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, - PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR = PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR, - MEMORY_DEDICATED_REQUIREMENTS_KHR = MEMORY_DEDICATED_REQUIREMENTS, - MEMORY_DEDICATED_ALLOCATE_INFO_KHR = MEMORY_DEDICATED_ALLOCATE_INFO, - PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT = PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES, - SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT = SAMPLER_REDUCTION_MODE_CREATE_INFO, - BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR = BUFFER_MEMORY_REQUIREMENTS_INFO_2, - IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR = IMAGE_MEMORY_REQUIREMENTS_INFO_2, - IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR = IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2, - MEMORY_REQUIREMENTS_2_KHR = MEMORY_REQUIREMENTS_2, - SPARSE_IMAGE_MEMORY_REQUIREMENTS_2_KHR = SPARSE_IMAGE_MEMORY_REQUIREMENTS_2, - IMAGE_FORMAT_LIST_CREATE_INFO_KHR = IMAGE_FORMAT_LIST_CREATE_INFO, - SAMPLER_YCBCR_CONVERSION_CREATE_INFO_KHR = SAMPLER_YCBCR_CONVERSION_CREATE_INFO, - SAMPLER_YCBCR_CONVERSION_INFO_KHR = SAMPLER_YCBCR_CONVERSION_INFO, - BIND_IMAGE_PLANE_MEMORY_INFO_KHR = BIND_IMAGE_PLANE_MEMORY_INFO, - IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO_KHR = IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO, - PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR = PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES, - SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES_KHR = SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES, - BIND_BUFFER_MEMORY_INFO_KHR = BIND_BUFFER_MEMORY_INFO, - BIND_IMAGE_MEMORY_INFO_KHR = BIND_IMAGE_MEMORY_INFO, - DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT = DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO, - PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT = PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES, - PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT = PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES, - DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT = DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO, - DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT = DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT, - PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR = PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES, - DESCRIPTOR_SET_LAYOUT_SUPPORT_KHR = DESCRIPTOR_SET_LAYOUT_SUPPORT, - PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, - PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, - PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES, - PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = PHYSICAL_DEVICE_DRIVER_PROPERTIES, - PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, - PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES, - SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR = SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE, - PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR = PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, - PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR = PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES, - SEMAPHORE_TYPE_CREATE_INFO_KHR = SEMAPHORE_TYPE_CREATE_INFO, - TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR = TIMELINE_SEMAPHORE_SUBMIT_INFO, - SEMAPHORE_WAIT_INFO_KHR = SEMAPHORE_WAIT_INFO, - SEMAPHORE_SIGNAL_INFO_KHR = SEMAPHORE_SIGNAL_INFO, - QUERY_POOL_CREATE_INFO_INTEL = QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL, - PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES, - PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES, - PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR = PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES, - ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR = ATTACHMENT_REFERENCE_STENCIL_LAYOUT, - ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR = ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT, - PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT, - BUFFER_DEVICE_ADDRESS_INFO_EXT = BUFFER_DEVICE_ADDRESS_INFO, - IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = IMAGE_STENCIL_USAGE_CREATE_INFO, - PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR = PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES, - PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR = PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES, - BUFFER_DEVICE_ADDRESS_INFO_KHR = BUFFER_DEVICE_ADDRESS_INFO, - BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO_KHR = BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO, - MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO_KHR = MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO, - DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO_KHR = DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO, - PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES, + APPLICATION_INFO = 0, + INSTANCE_CREATE_INFO = 1, + DEVICE_QUEUE_CREATE_INFO = 2, + DEVICE_CREATE_INFO = 3, + SUBMIT_INFO = 4, + MEMORY_ALLOCATE_INFO = 5, + MAPPED_MEMORY_RANGE = 6, + BIND_SPARSE_INFO = 7, + FENCE_CREATE_INFO = 8, + SEMAPHORE_CREATE_INFO = 9, + EVENT_CREATE_INFO = 10, + QUERY_POOL_CREATE_INFO = 11, + BUFFER_CREATE_INFO = 12, + BUFFER_VIEW_CREATE_INFO = 13, + IMAGE_CREATE_INFO = 14, + IMAGE_VIEW_CREATE_INFO = 15, + SHADER_MODULE_CREATE_INFO = 16, + PIPELINE_CACHE_CREATE_INFO = 17, + PIPELINE_SHADER_STAGE_CREATE_INFO = 18, + PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 19, + PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO = 20, + PIPELINE_TESSELLATION_STATE_CREATE_INFO = 21, + PIPELINE_VIEWPORT_STATE_CREATE_INFO = 22, + PIPELINE_RASTERIZATION_STATE_CREATE_INFO = 23, + PIPELINE_MULTISAMPLE_STATE_CREATE_INFO = 24, + PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO = 25, + PIPELINE_COLOR_BLEND_STATE_CREATE_INFO = 26, + PIPELINE_DYNAMIC_STATE_CREATE_INFO = 27, + GRAPHICS_PIPELINE_CREATE_INFO = 28, + COMPUTE_PIPELINE_CREATE_INFO = 29, + PIPELINE_LAYOUT_CREATE_INFO = 30, + SAMPLER_CREATE_INFO = 31, + DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 32, + DESCRIPTOR_POOL_CREATE_INFO = 33, + DESCRIPTOR_SET_ALLOCATE_INFO = 34, + WRITE_DESCRIPTOR_SET = 35, + COPY_DESCRIPTOR_SET = 36, + FRAMEBUFFER_CREATE_INFO = 37, + RENDER_PASS_CREATE_INFO = 38, + COMMAND_POOL_CREATE_INFO = 39, + COMMAND_BUFFER_ALLOCATE_INFO = 40, + COMMAND_BUFFER_INHERITANCE_INFO = 41, + COMMAND_BUFFER_BEGIN_INFO = 42, + RENDER_PASS_BEGIN_INFO = 43, + BUFFER_MEMORY_BARRIER = 44, + IMAGE_MEMORY_BARRIER = 45, + MEMORY_BARRIER = 46, + LOADER_INSTANCE_CREATE_INFO = 47, + LOADER_DEVICE_CREATE_INFO = 48, + PHYSICAL_DEVICE_SUBGROUP_PROPERTIES = 1000094000, + BIND_BUFFER_MEMORY_INFO = 1000157000, + BIND_IMAGE_MEMORY_INFO = 1000157001, + PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES = 1000083000, + MEMORY_DEDICATED_REQUIREMENTS = 1000127000, + MEMORY_DEDICATED_ALLOCATE_INFO = 1000127001, + MEMORY_ALLOCATE_FLAGS_INFO = 1000060000, + DEVICE_GROUP_RENDER_PASS_BEGIN_INFO = 1000060003, + DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO = 1000060004, + DEVICE_GROUP_SUBMIT_INFO = 1000060005, + DEVICE_GROUP_BIND_SPARSE_INFO = 1000060006, + BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO = 1000060013, + BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO = 1000060014, + PHYSICAL_DEVICE_GROUP_PROPERTIES = 1000070000, + DEVICE_GROUP_DEVICE_CREATE_INFO = 1000070001, + BUFFER_MEMORY_REQUIREMENTS_INFO_2 = 1000146000, + IMAGE_MEMORY_REQUIREMENTS_INFO_2 = 1000146001, + IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2 = 1000146002, + MEMORY_REQUIREMENTS_2 = 1000146003, + SPARSE_IMAGE_MEMORY_REQUIREMENTS_2 = 1000146004, + PHYSICAL_DEVICE_FEATURES_2 = 1000059000, + PHYSICAL_DEVICE_PROPERTIES_2 = 1000059001, + FORMAT_PROPERTIES_2 = 1000059002, + IMAGE_FORMAT_PROPERTIES_2 = 1000059003, + PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2 = 1000059004, + QUEUE_FAMILY_PROPERTIES_2 = 1000059005, + PHYSICAL_DEVICE_MEMORY_PROPERTIES_2 = 1000059006, + SPARSE_IMAGE_FORMAT_PROPERTIES_2 = 1000059007, + PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2 = 1000059008, + PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES = 1000117000, + RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO = 1000117001, + IMAGE_VIEW_USAGE_CREATE_INFO = 1000117002, + PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO = 1000117003, + RENDER_PASS_MULTIVIEW_CREATE_INFO = 1000053000, + PHYSICAL_DEVICE_MULTIVIEW_FEATURES = 1000053001, + PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES = 1000053002, + PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES = 1000120000, + PROTECTED_SUBMIT_INFO = 1000145000, + PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES = 1000145001, + PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES = 1000145002, + DEVICE_QUEUE_INFO_2 = 1000145003, + SAMPLER_YCBCR_CONVERSION_CREATE_INFO = 1000156000, + SAMPLER_YCBCR_CONVERSION_INFO = 1000156001, + BIND_IMAGE_PLANE_MEMORY_INFO = 1000156002, + IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO = 1000156003, + PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES = 1000156004, + SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES = 1000156005, + DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO = 1000085000, + PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO = 1000071000, + EXTERNAL_IMAGE_FORMAT_PROPERTIES = 1000071001, + PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO = 1000071002, + EXTERNAL_BUFFER_PROPERTIES = 1000071003, + PHYSICAL_DEVICE_ID_PROPERTIES = 1000071004, + EXTERNAL_MEMORY_BUFFER_CREATE_INFO = 1000072000, + EXTERNAL_MEMORY_IMAGE_CREATE_INFO = 1000072001, + EXPORT_MEMORY_ALLOCATE_INFO = 1000072002, + PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO = 1000112000, + EXTERNAL_FENCE_PROPERTIES = 1000112001, + EXPORT_FENCE_CREATE_INFO = 1000113000, + EXPORT_SEMAPHORE_CREATE_INFO = 1000077000, + PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO = 1000076000, + EXTERNAL_SEMAPHORE_PROPERTIES = 1000076001, + PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES = 1000168000, + DESCRIPTOR_SET_LAYOUT_SUPPORT = 1000168001, + PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES = 1000063000, + PHYSICAL_DEVICE_VULKAN_1_1_FEATURES = 49, + PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES = 50, + PHYSICAL_DEVICE_VULKAN_1_2_FEATURES = 51, + PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES = 52, + IMAGE_FORMAT_LIST_CREATE_INFO = 1000147000, + ATTACHMENT_DESCRIPTION_2 = 1000109000, + ATTACHMENT_REFERENCE_2 = 1000109001, + SUBPASS_DESCRIPTION_2 = 1000109002, + SUBPASS_DEPENDENCY_2 = 1000109003, + RENDER_PASS_CREATE_INFO_2 = 1000109004, + SUBPASS_BEGIN_INFO = 1000109005, + SUBPASS_END_INFO = 1000109006, + PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES = 1000177000, + PHYSICAL_DEVICE_DRIVER_PROPERTIES = 1000196000, + PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES = 1000180000, + PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES = 1000082000, + PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES = 1000197000, + DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO = 1000161000, + PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES = 1000161001, + PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES = 1000161002, + DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO = 1000161003, + DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT = 1000161004, + PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES = 1000199000, + SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE = 1000199001, + PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES = 1000221000, + IMAGE_STENCIL_USAGE_CREATE_INFO = 1000246000, + PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES = 1000130000, + SAMPLER_REDUCTION_MODE_CREATE_INFO = 1000130001, + PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES = 1000211000, + PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES = 1000108000, + FRAMEBUFFER_ATTACHMENTS_CREATE_INFO = 1000108001, + FRAMEBUFFER_ATTACHMENT_IMAGE_INFO = 1000108002, + RENDER_PASS_ATTACHMENT_BEGIN_INFO = 1000108003, + PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000, + PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES = 1000175000, + PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES = 1000241000, + ATTACHMENT_REFERENCE_STENCIL_LAYOUT = 1000241001, + ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT = 1000241002, + PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES = 1000261000, + PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES = 1000207000, + PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES = 1000207001, + SEMAPHORE_TYPE_CREATE_INFO = 1000207002, + TIMELINE_SEMAPHORE_SUBMIT_INFO = 1000207003, + SEMAPHORE_WAIT_INFO = 1000207004, + SEMAPHORE_SIGNAL_INFO = 1000207005, + PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES = 1000257000, + BUFFER_DEVICE_ADDRESS_INFO = 1000244001, + BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002, + MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO = 1000257003, + DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO = 1000257004, + PHYSICAL_DEVICE_VULKAN_1_3_FEATURES = 53, + PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES = 54, + PIPELINE_CREATION_FEEDBACK_CREATE_INFO = 1000192000, + PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES = 1000215000, + PHYSICAL_DEVICE_TOOL_PROPERTIES = 1000245000, + PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES = 1000276000, + PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES = 1000295000, + DEVICE_PRIVATE_DATA_CREATE_INFO = 1000295001, + PRIVATE_DATA_SLOT_CREATE_INFO = 1000295002, + PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES = 1000297000, + MEMORY_BARRIER_2 = 1000314000, + BUFFER_MEMORY_BARRIER_2 = 1000314001, + IMAGE_MEMORY_BARRIER_2 = 1000314002, + DEPENDENCY_INFO = 1000314003, + SUBMIT_INFO_2 = 1000314004, + SEMAPHORE_SUBMIT_INFO = 1000314005, + COMMAND_BUFFER_SUBMIT_INFO = 1000314006, + PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES = 1000314007, + PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES = 1000325000, + PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES = 1000335000, + COPY_BUFFER_INFO_2 = 1000337000, + COPY_IMAGE_INFO_2 = 1000337001, + COPY_BUFFER_TO_IMAGE_INFO_2 = 1000337002, + COPY_IMAGE_TO_BUFFER_INFO_2 = 1000337003, + BLIT_IMAGE_INFO_2 = 1000337004, + RESOLVE_IMAGE_INFO_2 = 1000337005, + BUFFER_COPY_2 = 1000337006, + IMAGE_COPY_2 = 1000337007, + IMAGE_BLIT_2 = 1000337008, + BUFFER_IMAGE_COPY_2 = 1000337009, + IMAGE_RESOLVE_2 = 1000337010, + PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES = 1000225000, + PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO = 1000225001, + PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES = 1000225002, + PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES = 1000138000, + PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES = 1000138001, + WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK = 1000138002, + DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO = 1000138003, + PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES = 1000066000, + RENDERING_INFO = 1000044000, + RENDERING_ATTACHMENT_INFO = 1000044001, + PIPELINE_RENDERING_CREATE_INFO = 1000044002, + PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES = 1000044003, + COMMAND_BUFFER_INHERITANCE_RENDERING_INFO = 1000044004, + PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES = 1000280000, + PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES = 1000280001, + PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES = 1000281001, + FORMAT_PROPERTIES_3 = 1000360000, + PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES = 1000413000, + PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES = 1000413001, + DEVICE_BUFFER_MEMORY_REQUIREMENTS = 1000413002, + DEVICE_IMAGE_MEMORY_REQUIREMENTS = 1000413003, + SWAPCHAIN_CREATE_INFO_KHR = 1000001000, + PRESENT_INFO_KHR = 1000001001, + DEVICE_GROUP_PRESENT_CAPABILITIES_KHR = 1000060007, + IMAGE_SWAPCHAIN_CREATE_INFO_KHR = 1000060008, + BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR = 1000060009, + ACQUIRE_NEXT_IMAGE_INFO_KHR = 1000060010, + DEVICE_GROUP_PRESENT_INFO_KHR = 1000060011, + DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR = 1000060012, + DISPLAY_MODE_CREATE_INFO_KHR = 1000002000, + DISPLAY_SURFACE_CREATE_INFO_KHR = 1000002001, + DISPLAY_PRESENT_INFO_KHR = 1000003000, + XLIB_SURFACE_CREATE_INFO_KHR = 1000004000, + XCB_SURFACE_CREATE_INFO_KHR = 1000005000, + WAYLAND_SURFACE_CREATE_INFO_KHR = 1000006000, + ANDROID_SURFACE_CREATE_INFO_KHR = 1000008000, + WIN32_SURFACE_CREATE_INFO_KHR = 1000009000, + DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT = 1000011000, + PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD = 1000018000, + DEBUG_MARKER_OBJECT_NAME_INFO_EXT = 1000022000, + DEBUG_MARKER_OBJECT_TAG_INFO_EXT = 1000022001, + DEBUG_MARKER_MARKER_INFO_EXT = 1000022002, + VIDEO_PROFILE_KHR = 1000023000, + VIDEO_CAPABILITIES_KHR = 1000023001, + VIDEO_PICTURE_RESOURCE_KHR = 1000023002, + VIDEO_GET_MEMORY_PROPERTIES_KHR = 1000023003, + VIDEO_BIND_MEMORY_KHR = 1000023004, + VIDEO_SESSION_CREATE_INFO_KHR = 1000023005, + VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR = 1000023006, + VIDEO_SESSION_PARAMETERS_UPDATE_INFO_KHR = 1000023007, + VIDEO_BEGIN_CODING_INFO_KHR = 1000023008, + VIDEO_END_CODING_INFO_KHR = 1000023009, + VIDEO_CODING_CONTROL_INFO_KHR = 1000023010, + VIDEO_REFERENCE_SLOT_KHR = 1000023011, + VIDEO_QUEUE_FAMILY_PROPERTIES_2_KHR = 1000023012, + VIDEO_PROFILES_KHR = 1000023013, + PHYSICAL_DEVICE_VIDEO_FORMAT_INFO_KHR = 1000023014, + VIDEO_FORMAT_PROPERTIES_KHR = 1000023015, + QUEUE_FAMILY_QUERY_RESULT_STATUS_PROPERTIES_2_KHR = 1000023016, + VIDEO_DECODE_INFO_KHR = 1000024000, + VIDEO_DECODE_CAPABILITIES_KHR = 1000024001, + DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV = 1000026000, + DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001, + DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 1000026002, + PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT = 1000028000, + PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT = 1000028001, + PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT = 1000028002, + CU_MODULE_CREATE_INFO_NVX = 1000029000, + CU_FUNCTION_CREATE_INFO_NVX = 1000029001, + CU_LAUNCH_INFO_NVX = 1000029002, + IMAGE_VIEW_HANDLE_INFO_NVX = 1000030000, + IMAGE_VIEW_ADDRESS_PROPERTIES_NVX = 1000030001, + VIDEO_ENCODE_H264_CAPABILITIES_EXT = 1000038000, + VIDEO_ENCODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000038001, + VIDEO_ENCODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000038002, + VIDEO_ENCODE_H264_VCL_FRAME_INFO_EXT = 1000038003, + VIDEO_ENCODE_H264_DPB_SLOT_INFO_EXT = 1000038004, + VIDEO_ENCODE_H264_NALU_SLICE_EXT = 1000038005, + VIDEO_ENCODE_H264_EMIT_PICTURE_PARAMETERS_EXT = 1000038006, + VIDEO_ENCODE_H264_PROFILE_EXT = 1000038007, + VIDEO_ENCODE_H264_RATE_CONTROL_INFO_EXT = 1000038008, + VIDEO_ENCODE_H264_RATE_CONTROL_LAYER_INFO_EXT = 1000038009, + VIDEO_ENCODE_H264_REFERENCE_LISTS_EXT = 1000038010, + VIDEO_ENCODE_H265_CAPABILITIES_EXT = 1000039000, + VIDEO_ENCODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000039001, + VIDEO_ENCODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT = 1000039002, + VIDEO_ENCODE_H265_VCL_FRAME_INFO_EXT = 1000039003, + VIDEO_ENCODE_H265_DPB_SLOT_INFO_EXT = 1000039004, + VIDEO_ENCODE_H265_NALU_SLICE_SEGMENT_EXT = 1000039005, + VIDEO_ENCODE_H265_EMIT_PICTURE_PARAMETERS_EXT = 1000039006, + VIDEO_ENCODE_H265_PROFILE_EXT = 1000039007, + VIDEO_ENCODE_H265_REFERENCE_LISTS_EXT = 1000039008, + VIDEO_ENCODE_H265_RATE_CONTROL_INFO_EXT = 1000039009, + VIDEO_ENCODE_H265_RATE_CONTROL_LAYER_INFO_EXT = 1000039010, + VIDEO_DECODE_H264_CAPABILITIES_EXT = 1000040000, + VIDEO_DECODE_H264_PICTURE_INFO_EXT = 1000040001, + VIDEO_DECODE_H264_MVC_EXT = 1000040002, + VIDEO_DECODE_H264_PROFILE_EXT = 1000040003, + VIDEO_DECODE_H264_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000040004, + VIDEO_DECODE_H264_SESSION_PARAMETERS_ADD_INFO_EXT = 1000040005, + VIDEO_DECODE_H264_DPB_SLOT_INFO_EXT = 1000040006, + TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000, + RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000044006, + RENDERING_FRAGMENT_DENSITY_MAP_ATTACHMENT_INFO_EXT = 1000044007, + ATTACHMENT_SAMPLE_COUNT_INFO_AMD = 1000044008, + MULTIVIEW_PER_VIEW_ATTRIBUTES_INFO_NVX = 1000044009, + STREAM_DESCRIPTOR_SURFACE_CREATE_INFO_GGP = 1000049000, + PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV = 1000050000, + EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000, + EXPORT_MEMORY_ALLOCATE_INFO_NV = 1000056001, + IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057000, + EXPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057001, + WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000, + VALIDATION_FLAGS_EXT = 1000061000, + VI_SURFACE_CREATE_INFO_NN = 1000062000, + IMAGE_VIEW_ASTC_DECODE_MODE_EXT = 1000067000, + PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT = 1000067001, + IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073000, + EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR = 1000073001, + MEMORY_WIN32_HANDLE_PROPERTIES_KHR = 1000073002, + MEMORY_GET_WIN32_HANDLE_INFO_KHR = 1000073003, + IMPORT_MEMORY_FD_INFO_KHR = 1000074000, + MEMORY_FD_PROPERTIES_KHR = 1000074001, + MEMORY_GET_FD_INFO_KHR = 1000074002, + WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR = 1000075000, + IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR = 1000078000, + EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR = 1000078001, + D3D12_FENCE_SUBMIT_INFO_KHR = 1000078002, + SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR = 1000078003, + IMPORT_SEMAPHORE_FD_INFO_KHR = 1000079000, + SEMAPHORE_GET_FD_INFO_KHR = 1000079001, + PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = 1000080000, + COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT = 1000081000, + PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT = 1000081001, + CONDITIONAL_RENDERING_BEGIN_INFO_EXT = 1000081002, + PRESENT_REGIONS_KHR = 1000084000, + PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV = 1000087000, + SURFACE_CAPABILITIES_2_EXT = 1000090000, + DISPLAY_POWER_INFO_EXT = 1000091000, + DEVICE_EVENT_INFO_EXT = 1000091001, + DISPLAY_EVENT_INFO_EXT = 1000091002, + SWAPCHAIN_COUNTER_CREATE_INFO_EXT = 1000091003, + PRESENT_TIMES_INFO_GOOGLE = 1000092000, + PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX = 1000097000, + PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV = 1000098000, + PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT = 1000099000, + PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT = 1000099001, + PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT = 1000101000, + PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT = 1000101001, + PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT = 1000102000, + PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT = 1000102001, + HDR_METADATA_EXT = 1000105000, + SHARED_PRESENT_SURFACE_CAPABILITIES_KHR = 1000111000, + IMPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114000, + EXPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114001, + FENCE_GET_WIN32_HANDLE_INFO_KHR = 1000114002, + IMPORT_FENCE_FD_INFO_KHR = 1000115000, + FENCE_GET_FD_INFO_KHR = 1000115001, + PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR = 1000116000, + PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR = 1000116001, + QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR = 1000116002, + PERFORMANCE_QUERY_SUBMIT_INFO_KHR = 1000116003, + ACQUIRE_PROFILING_LOCK_INFO_KHR = 1000116004, + PERFORMANCE_COUNTER_KHR = 1000116005, + PERFORMANCE_COUNTER_DESCRIPTION_KHR = 1000116006, + PHYSICAL_DEVICE_SURFACE_INFO_2_KHR = 1000119000, + SURFACE_CAPABILITIES_2_KHR = 1000119001, + SURFACE_FORMAT_2_KHR = 1000119002, + DISPLAY_PROPERTIES_2_KHR = 1000121000, + DISPLAY_PLANE_PROPERTIES_2_KHR = 1000121001, + DISPLAY_MODE_PROPERTIES_2_KHR = 1000121002, + DISPLAY_PLANE_INFO_2_KHR = 1000121003, + DISPLAY_PLANE_CAPABILITIES_2_KHR = 1000121004, + IOS_SURFACE_CREATE_INFO_MVK = 1000122000, + MACOS_SURFACE_CREATE_INFO_MVK = 1000123000, + DEBUG_UTILS_OBJECT_NAME_INFO_EXT = 1000128000, + DEBUG_UTILS_OBJECT_TAG_INFO_EXT = 1000128001, + DEBUG_UTILS_LABEL_EXT = 1000128002, + DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT = 1000128003, + DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT = 1000128004, + ANDROID_HARDWARE_BUFFER_USAGE_ANDROID = 1000129000, + ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID = 1000129001, + ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID = 1000129002, + IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID = 1000129003, + MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID = 1000129004, + EXTERNAL_FORMAT_ANDROID = 1000129005, + ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_2_ANDROID = 1000129006, + SAMPLE_LOCATIONS_INFO_EXT = 1000143000, + RENDER_PASS_SAMPLE_LOCATIONS_BEGIN_INFO_EXT = 1000143001, + PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT = 1000143002, + PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT = 1000143003, + MULTISAMPLE_PROPERTIES_EXT = 1000143004, + PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_FEATURES_EXT = 1000148000, + PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT = 1000148001, + PIPELINE_COLOR_BLEND_ADVANCED_STATE_CREATE_INFO_EXT = 1000148002, + PIPELINE_COVERAGE_TO_COLOR_STATE_CREATE_INFO_NV = 1000149000, + WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR = 1000150007, + ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR = 1000150000, + ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR = 1000150002, + ACCELERATION_STRUCTURE_GEOMETRY_AABBS_DATA_KHR = 1000150003, + ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR = 1000150004, + ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR = 1000150005, + ACCELERATION_STRUCTURE_GEOMETRY_KHR = 1000150006, + ACCELERATION_STRUCTURE_VERSION_INFO_KHR = 1000150009, + COPY_ACCELERATION_STRUCTURE_INFO_KHR = 1000150010, + COPY_ACCELERATION_STRUCTURE_TO_MEMORY_INFO_KHR = 1000150011, + COPY_MEMORY_TO_ACCELERATION_STRUCTURE_INFO_KHR = 1000150012, + PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_FEATURES_KHR = 1000150013, + PHYSICAL_DEVICE_ACCELERATION_STRUCTURE_PROPERTIES_KHR = 1000150014, + ACCELERATION_STRUCTURE_CREATE_INFO_KHR = 1000150017, + ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR = 1000150020, + PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR = 1000347000, + PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_PROPERTIES_KHR = 1000347001, + RAY_TRACING_PIPELINE_CREATE_INFO_KHR = 1000150015, + RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR = 1000150016, + RAY_TRACING_PIPELINE_INTERFACE_CREATE_INFO_KHR = 1000150018, + PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR = 1000348013, + PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV = 1000152000, + PHYSICAL_DEVICE_SHADER_SM_BUILTINS_FEATURES_NV = 1000154000, + PHYSICAL_DEVICE_SHADER_SM_BUILTINS_PROPERTIES_NV = 1000154001, + DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT = 1000158000, + PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT = 1000158002, + IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT = 1000158003, + IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT = 1000158004, + IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT = 1000158005, + DRM_FORMAT_MODIFIER_PROPERTIES_LIST_2_EXT = 1000158006, + VALIDATION_CACHE_CREATE_INFO_EXT = 1000160000, + SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160001, + PHYSICAL_DEVICE_PORTABILITY_SUBSET_FEATURES_KHR = 1000163000, + PHYSICAL_DEVICE_PORTABILITY_SUBSET_PROPERTIES_KHR = 1000163001, + PIPELINE_VIEWPORT_SHADING_RATE_IMAGE_STATE_CREATE_INFO_NV = 1000164000, + PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV = 1000164001, + PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV = 1000164002, + PIPELINE_VIEWPORT_COARSE_SAMPLE_ORDER_STATE_CREATE_INFO_NV = 1000164005, + RAY_TRACING_PIPELINE_CREATE_INFO_NV = 1000165000, + ACCELERATION_STRUCTURE_CREATE_INFO_NV = 1000165001, + GEOMETRY_NV = 1000165003, + GEOMETRY_TRIANGLES_NV = 1000165004, + GEOMETRY_AABB_NV = 1000165005, + BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV = 1000165006, + WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV = 1000165007, + ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV = 1000165008, + PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV = 1000165009, + RAY_TRACING_SHADER_GROUP_CREATE_INFO_NV = 1000165011, + ACCELERATION_STRUCTURE_INFO_NV = 1000165012, + PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV = 1000166000, + PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV = 1000166001, + PHYSICAL_DEVICE_IMAGE_VIEW_IMAGE_FORMAT_INFO_EXT = 1000170000, + FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT = 1000170001, + IMPORT_MEMORY_HOST_POINTER_INFO_EXT = 1000178000, + MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, + PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, + PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR = 1000181000, + PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, + CALIBRATED_TIMESTAMP_INFO_EXT = 1000184000, + PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, + VIDEO_DECODE_H265_CAPABILITIES_EXT = 1000187000, + VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_EXT = 1000187001, + VIDEO_DECODE_H265_SESSION_PARAMETERS_ADD_INFO_EXT = 1000187002, + VIDEO_DECODE_H265_PROFILE_EXT = 1000187003, + VIDEO_DECODE_H265_PICTURE_INFO_EXT = 1000187004, + VIDEO_DECODE_H265_DPB_SLOT_INFO_EXT = 1000187005, + DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR = 1000174000, + PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR = 1000388000, + QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR = 1000388001, + DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, + PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, + PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, + PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, + PRESENT_FRAME_TOKEN_GGP = 1000191000, + PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000, + PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000, + PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV = 1000202001, + PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV = 1000203000, + PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV = 1000204000, + PIPELINE_VIEWPORT_EXCLUSIVE_SCISSOR_STATE_CREATE_INFO_NV = 1000205000, + PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV = 1000205002, + CHECKPOINT_DATA_NV = 1000206000, + QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV = 1000206001, + PHYSICAL_DEVICE_SHADER_INTEGER_FUNCTIONS_2_FEATURES_INTEL = 1000209000, + QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL = 1000210000, + INITIALIZE_PERFORMANCE_API_INFO_INTEL = 1000210001, + PERFORMANCE_MARKER_INFO_INTEL = 1000210002, + PERFORMANCE_STREAM_MARKER_INFO_INTEL = 1000210003, + PERFORMANCE_OVERRIDE_INFO_INTEL = 1000210004, + PERFORMANCE_CONFIGURATION_ACQUIRE_INFO_INTEL = 1000210005, + PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT = 1000212000, + DISPLAY_NATIVE_HDR_SURFACE_CAPABILITIES_AMD = 1000213000, + SWAPCHAIN_DISPLAY_NATIVE_HDR_CREATE_INFO_AMD = 1000213001, + IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000, + METAL_SURFACE_CREATE_INFO_EXT = 1000217000, + PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT = 1000218000, + PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT = 1000218001, + RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002, + FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR = 1000226000, + PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR = 1000226001, + PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR = 1000226002, + PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR = 1000226003, + PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_KHR = 1000226004, + PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000, + PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000, + PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT = 1000234000, + PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, + PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, + MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, + SURFACE_PROTECTED_CAPABILITIES_KHR = 1000239000, + PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV = 1000240000, + PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT = 1000244000, + BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, + VALIDATION_FEATURES_EXT = 1000247000, + PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR = 1000248000, + PHYSICAL_DEVICE_COOPERATIVE_MATRIX_FEATURES_NV = 1000249000, + COOPERATIVE_MATRIX_PROPERTIES_NV = 1000249001, + PHYSICAL_DEVICE_COOPERATIVE_MATRIX_PROPERTIES_NV = 1000249002, + PHYSICAL_DEVICE_COVERAGE_REDUCTION_MODE_FEATURES_NV = 1000250000, + PIPELINE_COVERAGE_REDUCTION_STATE_CREATE_INFO_NV = 1000250001, + FRAMEBUFFER_MIXED_SAMPLES_COMBINATION_NV = 1000250002, + PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT = 1000251000, + PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000, + PHYSICAL_DEVICE_PROVOKING_VERTEX_FEATURES_EXT = 1000254000, + PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT = 1000254001, + PHYSICAL_DEVICE_PROVOKING_VERTEX_PROPERTIES_EXT = 1000254002, + SURFACE_FULL_SCREEN_EXCLUSIVE_INFO_EXT = 1000255000, + SURFACE_CAPABILITIES_FULL_SCREEN_EXCLUSIVE_EXT = 1000255002, + SURFACE_FULL_SCREEN_EXCLUSIVE_WIN32_INFO_EXT = 1000255001, + HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000, + PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT = 1000259000, + PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT = 1000259001, + PHYSICAL_DEVICE_LINE_RASTERIZATION_PROPERTIES_EXT = 1000259002, + PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_FEATURES_EXT = 1000260000, + PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT = 1000265000, + PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT = 1000267000, + PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR = 1000269000, + PIPELINE_INFO_KHR = 1000269001, + PIPELINE_EXECUTABLE_PROPERTIES_KHR = 1000269002, + PIPELINE_EXECUTABLE_INFO_KHR = 1000269003, + PIPELINE_EXECUTABLE_STATISTIC_KHR = 1000269004, + PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR = 1000269005, + PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT_2_FEATURES_EXT = 1000273000, + PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV = 1000277000, + GRAPHICS_SHADER_GROUP_CREATE_INFO_NV = 1000277001, + GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV = 1000277002, + INDIRECT_COMMANDS_LAYOUT_TOKEN_NV = 1000277003, + INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NV = 1000277004, + GENERATED_COMMANDS_INFO_NV = 1000277005, + GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_NV = 1000277006, + PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV = 1000277007, + PHYSICAL_DEVICE_INHERITED_VIEWPORT_SCISSOR_FEATURES_NV = 1000278000, + COMMAND_BUFFER_INHERITANCE_VIEWPORT_SCISSOR_INFO_NV = 1000278001, + PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT = 1000281000, + COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM = 1000282000, + RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM = 1000282001, + PHYSICAL_DEVICE_DEVICE_MEMORY_REPORT_FEATURES_EXT = 1000284000, + DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT = 1000284001, + DEVICE_MEMORY_REPORT_CALLBACK_DATA_EXT = 1000284002, + PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT = 1000286000, + PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT = 1000286001, + SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT = 1000287000, + PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT = 1000287001, + PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT = 1000287002, + PIPELINE_LIBRARY_CREATE_INFO_KHR = 1000290000, + PRESENT_ID_KHR = 1000294000, + PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR = 1000294001, + VIDEO_ENCODE_INFO_KHR = 1000299000, + VIDEO_ENCODE_RATE_CONTROL_INFO_KHR = 1000299001, + VIDEO_ENCODE_RATE_CONTROL_LAYER_INFO_KHR = 1000299002, + VIDEO_ENCODE_CAPABILITIES_KHR = 1000299003, + PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, + DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, + QUEUE_FAMILY_CHECKPOINT_PROPERTIES_2_NV = 1000314008, + CHECKPOINT_DATA_2_NV = 1000314009, + PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT = 1000320000, + PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_PROPERTIES_EXT = 1000320001, + GRAPHICS_PIPELINE_LIBRARY_CREATE_INFO_EXT = 1000320002, + PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR = 1000323000, + PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV = 1000326000, + PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV = 1000326001, + PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV = 1000326002, + ACCELERATION_STRUCTURE_GEOMETRY_MOTION_TRIANGLES_DATA_NV = 1000327000, + PHYSICAL_DEVICE_RAY_TRACING_MOTION_BLUR_FEATURES_NV = 1000327001, + ACCELERATION_STRUCTURE_MOTION_INFO_NV = 1000327002, + PHYSICAL_DEVICE_YCBCR_2_PLANE_444_FORMATS_FEATURES_EXT = 1000330000, + PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT = 1000332000, + PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, + COPY_COMMAND_TRANSFORM_INFO_QCOM = 1000333000, + PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR = 1000336000, + PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT = 1000340000, + PHYSICAL_DEVICE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_FEATURES_ARM = 1000342000, + PHYSICAL_DEVICE_RGBA10X6_FORMATS_FEATURES_EXT = 1000344000, + DIRECTFB_SURFACE_CREATE_INFO_EXT = 1000346000, + PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE = 1000351000, + MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE = 1000351002, + PHYSICAL_DEVICE_VERTEX_INPUT_DYNAMIC_STATE_FEATURES_EXT = 1000352000, + VERTEX_INPUT_BINDING_DESCRIPTION_2_EXT = 1000352001, + VERTEX_INPUT_ATTRIBUTE_DESCRIPTION_2_EXT = 1000352002, + PHYSICAL_DEVICE_DRM_PROPERTIES_EXT = 1000353000, + PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT = 1000355000, + PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT = 1000355001, + PHYSICAL_DEVICE_PRIMITIVE_TOPOLOGY_LIST_RESTART_FEATURES_EXT = 1000356000, + IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364000, + MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA = 1000364001, + MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000364002, + IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA = 1000365000, + SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA = 1000365001, + BUFFER_COLLECTION_CREATE_INFO_FUCHSIA = 1000366000, + IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA = 1000366001, + BUFFER_COLLECTION_IMAGE_CREATE_INFO_FUCHSIA = 1000366002, + BUFFER_COLLECTION_PROPERTIES_FUCHSIA = 1000366003, + BUFFER_CONSTRAINTS_INFO_FUCHSIA = 1000366004, + BUFFER_COLLECTION_BUFFER_CREATE_INFO_FUCHSIA = 1000366005, + IMAGE_CONSTRAINTS_INFO_FUCHSIA = 1000366006, + IMAGE_FORMAT_CONSTRAINTS_INFO_FUCHSIA = 1000366007, + SYSMEM_COLOR_SPACE_FUCHSIA = 1000366008, + BUFFER_COLLECTION_CONSTRAINTS_INFO_FUCHSIA = 1000366009, + SUBPASS_SHADING_PIPELINE_CREATE_INFO_HUAWEI = 1000369000, + PHYSICAL_DEVICE_SUBPASS_SHADING_FEATURES_HUAWEI = 1000369001, + PHYSICAL_DEVICE_SUBPASS_SHADING_PROPERTIES_HUAWEI = 1000369002, + PHYSICAL_DEVICE_INVOCATION_MASK_FEATURES_HUAWEI = 1000370000, + MEMORY_GET_REMOTE_ADDRESS_INFO_NV = 1000371000, + PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV = 1000371001, + PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT = 1000377000, + SCREEN_SURFACE_CREATE_INFO_QNX = 1000378000, + PHYSICAL_DEVICE_COLOR_WRITE_ENABLE_FEATURES_EXT = 1000381000, + PIPELINE_COLOR_WRITE_CREATE_INFO_EXT = 1000381001, + PHYSICAL_DEVICE_PRIMITIVES_GENERATED_QUERY_FEATURES_EXT = 1000382000, + PHYSICAL_DEVICE_IMAGE_VIEW_MIN_LOD_FEATURES_EXT = 1000391000, + IMAGE_VIEW_MIN_LOD_CREATE_INFO_EXT = 1000391001, + PHYSICAL_DEVICE_MULTI_DRAW_FEATURES_EXT = 1000392000, + PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT = 1000392001, + PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT = 1000393000, + PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT = 1000411000, + SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT = 1000411001, + PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, + PHYSICAL_DEVICE_DESCRIPTOR_SET_HOST_MAPPING_FEATURES_VALVE = 1000420000, + DESCRIPTOR_SET_BINDING_REFERENCE_VALVE = 1000420001, + DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE = 1000420002, + PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = 1000425000, + PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = 1000425001, + SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = 1000425002, + PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV = 1000430000, + PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, + PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, + DEBUG_REPORT_CREATE_INFO_EXT = DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, + RENDERING_INFO_KHR = RENDERING_INFO, + RENDERING_ATTACHMENT_INFO_KHR = RENDERING_ATTACHMENT_INFO, + PIPELINE_RENDERING_CREATE_INFO_KHR = PIPELINE_RENDERING_CREATE_INFO, + PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR = PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES, + COMMAND_BUFFER_INHERITANCE_RENDERING_INFO_KHR = COMMAND_BUFFER_INHERITANCE_RENDERING_INFO, + ATTACHMENT_SAMPLE_COUNT_INFO_NV = ATTACHMENT_SAMPLE_COUNT_INFO_AMD, + RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = RENDER_PASS_MULTIVIEW_CREATE_INFO, + PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = PHYSICAL_DEVICE_MULTIVIEW_FEATURES, + PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES, + PHYSICAL_DEVICE_FEATURES_2_KHR = PHYSICAL_DEVICE_FEATURES_2, + PHYSICAL_DEVICE_PROPERTIES_2_KHR = PHYSICAL_DEVICE_PROPERTIES_2, + FORMAT_PROPERTIES_2_KHR = FORMAT_PROPERTIES_2, + IMAGE_FORMAT_PROPERTIES_2_KHR = IMAGE_FORMAT_PROPERTIES_2, + PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR = PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, + QUEUE_FAMILY_PROPERTIES_2_KHR = QUEUE_FAMILY_PROPERTIES_2, + PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR = PHYSICAL_DEVICE_MEMORY_PROPERTIES_2, + SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR = SPARSE_IMAGE_FORMAT_PROPERTIES_2, + PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR = PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2, + MEMORY_ALLOCATE_FLAGS_INFO_KHR = MEMORY_ALLOCATE_FLAGS_INFO, + DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHR = DEVICE_GROUP_RENDER_PASS_BEGIN_INFO, + DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHR = DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO, + DEVICE_GROUP_SUBMIT_INFO_KHR = DEVICE_GROUP_SUBMIT_INFO, + DEVICE_GROUP_BIND_SPARSE_INFO_KHR = DEVICE_GROUP_BIND_SPARSE_INFO, + BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO_KHR = BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO, + BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO_KHR = BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO, + PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT = PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES, + PHYSICAL_DEVICE_GROUP_PROPERTIES_KHR = PHYSICAL_DEVICE_GROUP_PROPERTIES, + DEVICE_GROUP_DEVICE_CREATE_INFO_KHR = DEVICE_GROUP_DEVICE_CREATE_INFO, + PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO, + EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHR = EXTERNAL_IMAGE_FORMAT_PROPERTIES, + PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO, + EXTERNAL_BUFFER_PROPERTIES_KHR = EXTERNAL_BUFFER_PROPERTIES, + PHYSICAL_DEVICE_ID_PROPERTIES_KHR = PHYSICAL_DEVICE_ID_PROPERTIES, + EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR = EXTERNAL_MEMORY_BUFFER_CREATE_INFO, + EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR = EXTERNAL_MEMORY_IMAGE_CREATE_INFO, + EXPORT_MEMORY_ALLOCATE_INFO_KHR = EXPORT_MEMORY_ALLOCATE_INFO, + PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO, + EXTERNAL_SEMAPHORE_PROPERTIES_KHR = EXTERNAL_SEMAPHORE_PROPERTIES, + EXPORT_SEMAPHORE_CREATE_INFO_KHR = EXPORT_SEMAPHORE_CREATE_INFO, + PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES, + PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES, + PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR = PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES, + DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR = DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO, + SURFACE_CAPABILITIES2_EXT = SURFACE_CAPABILITIES_2_EXT, + PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES_KHR = PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES, + FRAMEBUFFER_ATTACHMENTS_CREATE_INFO_KHR = FRAMEBUFFER_ATTACHMENTS_CREATE_INFO, + FRAMEBUFFER_ATTACHMENT_IMAGE_INFO_KHR = FRAMEBUFFER_ATTACHMENT_IMAGE_INFO, + RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR = RENDER_PASS_ATTACHMENT_BEGIN_INFO, + ATTACHMENT_DESCRIPTION_2_KHR = ATTACHMENT_DESCRIPTION_2, + ATTACHMENT_REFERENCE_2_KHR = ATTACHMENT_REFERENCE_2, + SUBPASS_DESCRIPTION_2_KHR = SUBPASS_DESCRIPTION_2, + SUBPASS_DEPENDENCY_2_KHR = SUBPASS_DEPENDENCY_2, + RENDER_PASS_CREATE_INFO_2_KHR = RENDER_PASS_CREATE_INFO_2, + SUBPASS_BEGIN_INFO_KHR = SUBPASS_BEGIN_INFO, + SUBPASS_END_INFO_KHR = SUBPASS_END_INFO, + PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO_KHR = PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO, + EXTERNAL_FENCE_PROPERTIES_KHR = EXTERNAL_FENCE_PROPERTIES, + EXPORT_FENCE_CREATE_INFO_KHR = EXPORT_FENCE_CREATE_INFO, + PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR = PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES, + RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO_KHR = RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO, + IMAGE_VIEW_USAGE_CREATE_INFO_KHR = IMAGE_VIEW_USAGE_CREATE_INFO, + PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO_KHR = PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO, + PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR = PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, + PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR = PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES_KHR, + MEMORY_DEDICATED_REQUIREMENTS_KHR = MEMORY_DEDICATED_REQUIREMENTS, + MEMORY_DEDICATED_ALLOCATE_INFO_KHR = MEMORY_DEDICATED_ALLOCATE_INFO, + PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT = PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES, + SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT = SAMPLER_REDUCTION_MODE_CREATE_INFO, + PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT = PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES, + PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT = PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES, + WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT = WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK, + DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT = DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO, + BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR = BUFFER_MEMORY_REQUIREMENTS_INFO_2, + IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR = IMAGE_MEMORY_REQUIREMENTS_INFO_2, + IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR = IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2, + MEMORY_REQUIREMENTS_2_KHR = MEMORY_REQUIREMENTS_2, + SPARSE_IMAGE_MEMORY_REQUIREMENTS_2_KHR = SPARSE_IMAGE_MEMORY_REQUIREMENTS_2, + IMAGE_FORMAT_LIST_CREATE_INFO_KHR = IMAGE_FORMAT_LIST_CREATE_INFO, + SAMPLER_YCBCR_CONVERSION_CREATE_INFO_KHR = SAMPLER_YCBCR_CONVERSION_CREATE_INFO, + SAMPLER_YCBCR_CONVERSION_INFO_KHR = SAMPLER_YCBCR_CONVERSION_INFO, + BIND_IMAGE_PLANE_MEMORY_INFO_KHR = BIND_IMAGE_PLANE_MEMORY_INFO, + IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO_KHR = IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO, + PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR = PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES, + SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES_KHR = SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES, + BIND_BUFFER_MEMORY_INFO_KHR = BIND_BUFFER_MEMORY_INFO, + BIND_IMAGE_MEMORY_INFO_KHR = BIND_IMAGE_MEMORY_INFO, + DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT = DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO, + PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT = PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES, + PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT = PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES, + DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT = DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO, + DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT = DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT, + PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES_KHR = PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES, + DESCRIPTOR_SET_LAYOUT_SUPPORT_KHR = DESCRIPTOR_SET_LAYOUT_SUPPORT, + DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_KHR, + PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, + PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, + PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES, + PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = PIPELINE_CREATION_FEEDBACK_CREATE_INFO, + PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = PHYSICAL_DEVICE_DRIVER_PROPERTIES, + PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, + PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES, + SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR = SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE, + PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR = PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, + PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR = PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES, + SEMAPHORE_TYPE_CREATE_INFO_KHR = SEMAPHORE_TYPE_CREATE_INFO, + TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR = TIMELINE_SEMAPHORE_SUBMIT_INFO, + SEMAPHORE_WAIT_INFO_KHR = SEMAPHORE_WAIT_INFO, + SEMAPHORE_SIGNAL_INFO_KHR = SEMAPHORE_SIGNAL_INFO, + QUERY_POOL_CREATE_INFO_INTEL = QUERY_POOL_PERFORMANCE_QUERY_CREATE_INFO_INTEL, + PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES, + PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_TERMINATE_INVOCATION_FEATURES, + PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES, + PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES_EXT = PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES, + PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT = PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO, + PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES, + PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR = PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES, + ATTACHMENT_REFERENCE_STENCIL_LAYOUT_KHR = ATTACHMENT_REFERENCE_STENCIL_LAYOUT, + ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT_KHR = ATTACHMENT_DESCRIPTION_STENCIL_LAYOUT, + PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT, + BUFFER_DEVICE_ADDRESS_INFO_EXT = BUFFER_DEVICE_ADDRESS_INFO, + PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT = PHYSICAL_DEVICE_TOOL_PROPERTIES, + IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = IMAGE_STENCIL_USAGE_CREATE_INFO, + PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR = PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES, + PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR = PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES, + BUFFER_DEVICE_ADDRESS_INFO_KHR = BUFFER_DEVICE_ADDRESS_INFO, + BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO_KHR = BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO, + MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO_KHR = MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO, + DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO_KHR = DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO, + PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES, + PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT = PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES, + PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR = PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES, + PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES_KHR = PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_PROPERTIES, + PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT = PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES, + PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES_EXT = PHYSICAL_DEVICE_PRIVATE_DATA_FEATURES, + DEVICE_PRIVATE_DATA_CREATE_INFO_EXT = DEVICE_PRIVATE_DATA_CREATE_INFO, + PRIVATE_DATA_SLOT_CREATE_INFO_EXT = PRIVATE_DATA_SLOT_CREATE_INFO, + PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES, + MEMORY_BARRIER_2_KHR = MEMORY_BARRIER_2, + BUFFER_MEMORY_BARRIER_2_KHR = BUFFER_MEMORY_BARRIER_2, + IMAGE_MEMORY_BARRIER_2_KHR = IMAGE_MEMORY_BARRIER_2, + DEPENDENCY_INFO_KHR = DEPENDENCY_INFO, + SUBMIT_INFO_2_KHR = SUBMIT_INFO_2, + SEMAPHORE_SUBMIT_INFO_KHR = SEMAPHORE_SUBMIT_INFO, + COMMAND_BUFFER_SUBMIT_INFO_KHR = COMMAND_BUFFER_SUBMIT_INFO, + PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES_KHR = PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES, + PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES, + PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES, + COPY_BUFFER_INFO_2_KHR = COPY_BUFFER_INFO_2, + COPY_IMAGE_INFO_2_KHR = COPY_IMAGE_INFO_2, + COPY_BUFFER_TO_IMAGE_INFO_2_KHR = COPY_BUFFER_TO_IMAGE_INFO_2, + COPY_IMAGE_TO_BUFFER_INFO_2_KHR = COPY_IMAGE_TO_BUFFER_INFO_2, + BLIT_IMAGE_INFO_2_KHR = BLIT_IMAGE_INFO_2, + RESOLVE_IMAGE_INFO_2_KHR = RESOLVE_IMAGE_INFO_2, + BUFFER_COPY_2_KHR = BUFFER_COPY_2, + IMAGE_COPY_2_KHR = IMAGE_COPY_2, + IMAGE_BLIT_2_KHR = IMAGE_BLIT_2, + BUFFER_IMAGE_COPY_2_KHR = BUFFER_IMAGE_COPY_2, + IMAGE_RESOLVE_2_KHR = IMAGE_RESOLVE_2, + FORMAT_PROPERTIES_3_KHR = FORMAT_PROPERTIES_3, + PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_EXT = PHYSICAL_DEVICE_GLOBAL_PRIORITY_QUERY_FEATURES_KHR, + QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_EXT = QUEUE_FAMILY_GLOBAL_PRIORITY_PROPERTIES_KHR, + PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR = PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES, + PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES, + DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = DEVICE_BUFFER_MEMORY_REQUIREMENTS, + DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = DEVICE_IMAGE_MEMORY_REQUIREMENTS, } SubgroupFeatureFlags :: distinct bit_set[SubgroupFeatureFlag; Flags] @@ -2737,9 +2961,10 @@ SubgroupFeatureFlag :: enum Flags { PARTITIONED_NV = 8, } -SubmitFlagsKHR :: distinct bit_set[SubmitFlagKHR; Flags] -SubmitFlagKHR :: enum Flags { - PROTECTED = 0, +SubmitFlags :: distinct bit_set[SubmitFlag; Flags] +SubmitFlag :: enum Flags { + PROTECTED = 0, + PROTECTED_KHR = PROTECTED, } SubpassContents :: enum c.int { @@ -2749,10 +2974,13 @@ SubpassContents :: enum c.int { SubpassDescriptionFlags :: distinct bit_set[SubpassDescriptionFlag; Flags] SubpassDescriptionFlag :: enum Flags { - PER_VIEW_ATTRIBUTES_NVX = 0, - PER_VIEW_POSITION_X_ONLY_NVX = 1, - FRAGMENT_REGION_QCOM = 2, - SHADER_RESOLVE_QCOM = 3, + PER_VIEW_ATTRIBUTES_NVX = 0, + PER_VIEW_POSITION_X_ONLY_NVX = 1, + FRAGMENT_REGION_QCOM = 2, + SHADER_RESOLVE_QCOM = 3, + RASTERIZATION_ORDER_ATTACHMENT_COLOR_ACCESS_ARM = 4, + RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_ARM = 5, + RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_ARM = 6, } SurfaceCounterFlagsEXT :: distinct bit_set[SurfaceCounterFlagEXT; Flags] @@ -2802,15 +3030,20 @@ TimeDomainEXT :: enum c.int { QUERY_PERFORMANCE_COUNTER = 3, } -ToolPurposeFlagsEXT :: distinct bit_set[ToolPurposeFlagEXT; Flags] -ToolPurposeFlagEXT :: enum Flags { - VALIDATION = 0, - PROFILING = 1, - TRACING = 2, - ADDITIONAL_FEATURES = 3, - MODIFYING_FEATURES = 4, - DEBUG_REPORTING = 5, - DEBUG_MARKERS = 6, +ToolPurposeFlags :: distinct bit_set[ToolPurposeFlag; Flags] +ToolPurposeFlag :: enum Flags { + VALIDATION = 0, + PROFILING = 1, + TRACING = 2, + ADDITIONAL_FEATURES = 3, + MODIFYING_FEATURES = 4, + DEBUG_REPORTING_EXT = 5, + DEBUG_MARKERS_EXT = 6, + VALIDATION_EXT = VALIDATION, + PROFILING_EXT = PROFILING, + TRACING_EXT = TRACING, + ADDITIONAL_FEATURES_EXT = ADDITIONAL_FEATURES, + MODIFYING_FEATURES_EXT = MODIFYING_FEATURES, } ValidationCacheHeaderVersionEXT :: enum c.int { @@ -2894,32 +3127,24 @@ HeadlessSurfaceCreateFlagsEXT :: distinct bit_set[Headles HeadlessSurfaceCreateFlagEXT :: enum u32 {} IOSSurfaceCreateFlagsMVK :: distinct bit_set[IOSSurfaceCreateFlagMVK; Flags] IOSSurfaceCreateFlagMVK :: enum u32 {} -InstanceCreateFlags :: distinct bit_set[InstanceCreateFlag; Flags] -InstanceCreateFlag :: enum u32 {} MacOSSurfaceCreateFlagsMVK :: distinct bit_set[MacOSSurfaceCreateFlagMVK; Flags] MacOSSurfaceCreateFlagMVK :: enum u32 {} MemoryMapFlags :: distinct bit_set[MemoryMapFlag; Flags] MemoryMapFlag :: enum u32 {} MetalSurfaceCreateFlagsEXT :: distinct bit_set[MetalSurfaceCreateFlagEXT; Flags] MetalSurfaceCreateFlagEXT :: enum u32 {} -PipelineColorBlendStateCreateFlags :: distinct bit_set[PipelineColorBlendStateCreateFlag; Flags] -PipelineColorBlendStateCreateFlag :: enum u32 {} PipelineCoverageModulationStateCreateFlagsNV :: distinct bit_set[PipelineCoverageModulationStateCreateFlagNV; Flags] PipelineCoverageModulationStateCreateFlagNV :: enum u32 {} PipelineCoverageReductionStateCreateFlagsNV :: distinct bit_set[PipelineCoverageReductionStateCreateFlagNV; Flags] PipelineCoverageReductionStateCreateFlagNV :: enum u32 {} PipelineCoverageToColorStateCreateFlagsNV :: distinct bit_set[PipelineCoverageToColorStateCreateFlagNV; Flags] PipelineCoverageToColorStateCreateFlagNV :: enum u32 {} -PipelineDepthStencilStateCreateFlags :: distinct bit_set[PipelineDepthStencilStateCreateFlag; Flags] -PipelineDepthStencilStateCreateFlag :: enum u32 {} PipelineDiscardRectangleStateCreateFlagsEXT :: distinct bit_set[PipelineDiscardRectangleStateCreateFlagEXT; Flags] PipelineDiscardRectangleStateCreateFlagEXT :: enum u32 {} PipelineDynamicStateCreateFlags :: distinct bit_set[PipelineDynamicStateCreateFlag; Flags] PipelineDynamicStateCreateFlag :: enum u32 {} PipelineInputAssemblyStateCreateFlags :: distinct bit_set[PipelineInputAssemblyStateCreateFlag; Flags] PipelineInputAssemblyStateCreateFlag :: enum u32 {} -PipelineLayoutCreateFlags :: distinct bit_set[PipelineLayoutCreateFlag; Flags] -PipelineLayoutCreateFlag :: enum u32 {} PipelineMultisampleStateCreateFlags :: distinct bit_set[PipelineMultisampleStateCreateFlag; Flags] PipelineMultisampleStateCreateFlag :: enum u32 {} PipelineRasterizationConservativeStateCreateFlagsEXT :: distinct bit_set[PipelineRasterizationConservativeStateCreateFlagEXT; Flags] @@ -2938,6 +3163,8 @@ PipelineViewportStateCreateFlags :: distinct bit_set[Pipelin PipelineViewportStateCreateFlag :: enum u32 {} PipelineViewportSwizzleStateCreateFlagsNV :: distinct bit_set[PipelineViewportSwizzleStateCreateFlagNV; Flags] PipelineViewportSwizzleStateCreateFlagNV :: enum u32 {} +PrivateDataSlotCreateFlags :: distinct bit_set[PrivateDataSlotCreateFlag; Flags] +PrivateDataSlotCreateFlag :: enum u32 {} QueryPoolCreateFlags :: distinct bit_set[QueryPoolCreateFlag; Flags] QueryPoolCreateFlag :: enum u32 {} SemaphoreCreateFlags :: distinct bit_set[SemaphoreCreateFlag; Flags] diff --git a/vendor/vulkan/procedures.odin b/vendor/vulkan/procedures.odin index 7557d3c36..227f02a87 100644 --- a/vendor/vulkan/procedures.odin +++ b/vendor/vulkan/procedures.odin @@ -100,7 +100,8 @@ ProcGetPhysicalDeviceSurfaceFormatsKHR :: #type pro ProcGetPhysicalDeviceSurfacePresentModes2EXT :: #type proc "system" (physicalDevice: PhysicalDevice, pSurfaceInfo: ^PhysicalDeviceSurfaceInfo2KHR, pPresentModeCount: ^u32, pPresentModes: [^]PresentModeKHR) -> Result ProcGetPhysicalDeviceSurfacePresentModesKHR :: #type proc "system" (physicalDevice: PhysicalDevice, surface: SurfaceKHR, pPresentModeCount: ^u32, pPresentModes: [^]PresentModeKHR) -> Result ProcGetPhysicalDeviceSurfaceSupportKHR :: #type proc "system" (physicalDevice: PhysicalDevice, queueFamilyIndex: u32, surface: SurfaceKHR, pSupported: ^b32) -> Result -ProcGetPhysicalDeviceToolPropertiesEXT :: #type proc "system" (physicalDevice: PhysicalDevice, pToolCount: ^u32, pToolProperties: [^]PhysicalDeviceToolPropertiesEXT) -> Result +ProcGetPhysicalDeviceToolProperties :: #type proc "system" (physicalDevice: PhysicalDevice, pToolCount: ^u32, pToolProperties: [^]PhysicalDeviceToolProperties) -> Result +ProcGetPhysicalDeviceToolPropertiesEXT :: #type proc "system" (physicalDevice: PhysicalDevice, pToolCount: ^u32, pToolProperties: [^]PhysicalDeviceToolProperties) -> Result ProcGetPhysicalDeviceWin32PresentationSupportKHR :: #type proc "system" (physicalDevice: PhysicalDevice, queueFamilyIndex: u32) -> b32 ProcGetWinrtDisplayNV :: #type proc "system" (physicalDevice: PhysicalDevice, deviceRelativeId: u32, pDisplay: ^DisplayKHR) -> Result ProcReleaseDisplayEXT :: #type proc "system" (physicalDevice: PhysicalDevice, display: DisplayKHR) -> Result @@ -131,6 +132,8 @@ ProcCmdBeginQueryIndexedEXT :: #type proc "system" (comm ProcCmdBeginRenderPass :: #type proc "system" (commandBuffer: CommandBuffer, pRenderPassBegin: ^RenderPassBeginInfo, contents: SubpassContents) ProcCmdBeginRenderPass2 :: #type proc "system" (commandBuffer: CommandBuffer, pRenderPassBegin: ^RenderPassBeginInfo, pSubpassBeginInfo: ^SubpassBeginInfo) ProcCmdBeginRenderPass2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pRenderPassBegin: ^RenderPassBeginInfo, pSubpassBeginInfo: ^SubpassBeginInfo) +ProcCmdBeginRendering :: #type proc "system" (commandBuffer: CommandBuffer, pRenderingInfo: ^RenderingInfo) +ProcCmdBeginRenderingKHR :: #type proc "system" (commandBuffer: CommandBuffer, pRenderingInfo: ^RenderingInfo) ProcCmdBeginTransformFeedbackEXT :: #type proc "system" (commandBuffer: CommandBuffer, firstCounterBuffer: u32, counterBufferCount: u32, pCounterBuffers: [^]Buffer, pCounterBufferOffsets: [^]DeviceSize) ProcCmdBindDescriptorSets :: #type proc "system" (commandBuffer: CommandBuffer, pipelineBindPoint: PipelineBindPoint, layout: PipelineLayout, firstSet: u32, descriptorSetCount: u32, pDescriptorSets: [^]DescriptorSet, dynamicOffsetCount: u32, pDynamicOffsets: [^]u32) ProcCmdBindIndexBuffer :: #type proc "system" (commandBuffer: CommandBuffer, buffer: Buffer, offset: DeviceSize, indexType: IndexType) @@ -140,9 +143,11 @@ ProcCmdBindPipelineShaderGroupNV :: #type proc "system" (comm ProcCmdBindShadingRateImageNV :: #type proc "system" (commandBuffer: CommandBuffer, imageView: ImageView, imageLayout: ImageLayout) ProcCmdBindTransformFeedbackBuffersEXT :: #type proc "system" (commandBuffer: CommandBuffer, firstBinding: u32, bindingCount: u32, pBuffers: [^]Buffer, pOffsets: [^]DeviceSize, pSizes: [^]DeviceSize) ProcCmdBindVertexBuffers :: #type proc "system" (commandBuffer: CommandBuffer, firstBinding: u32, bindingCount: u32, pBuffers: [^]Buffer, pOffsets: [^]DeviceSize) +ProcCmdBindVertexBuffers2 :: #type proc "system" (commandBuffer: CommandBuffer, firstBinding: u32, bindingCount: u32, pBuffers: [^]Buffer, pOffsets: [^]DeviceSize, pSizes: [^]DeviceSize, pStrides: [^]DeviceSize) ProcCmdBindVertexBuffers2EXT :: #type proc "system" (commandBuffer: CommandBuffer, firstBinding: u32, bindingCount: u32, pBuffers: [^]Buffer, pOffsets: [^]DeviceSize, pSizes: [^]DeviceSize, pStrides: [^]DeviceSize) ProcCmdBlitImage :: #type proc "system" (commandBuffer: CommandBuffer, srcImage: Image, srcImageLayout: ImageLayout, dstImage: Image, dstImageLayout: ImageLayout, regionCount: u32, pRegions: [^]ImageBlit, filter: Filter) -ProcCmdBlitImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pBlitImageInfo: ^BlitImageInfo2KHR) +ProcCmdBlitImage2 :: #type proc "system" (commandBuffer: CommandBuffer, pBlitImageInfo: ^BlitImageInfo2) +ProcCmdBlitImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pBlitImageInfo: ^BlitImageInfo2) ProcCmdBuildAccelerationStructureNV :: #type proc "system" (commandBuffer: CommandBuffer, pInfo: ^AccelerationStructureInfoNV, instanceData: Buffer, instanceOffset: DeviceSize, update: b32, dst: AccelerationStructureNV, src: AccelerationStructureNV, scratch: Buffer, scratchOffset: DeviceSize) ProcCmdBuildAccelerationStructuresIndirectKHR :: #type proc "system" (commandBuffer: CommandBuffer, infoCount: u32, pInfos: [^]AccelerationStructureBuildGeometryInfoKHR, pIndirectDeviceAddresses: [^]DeviceAddress, pIndirectStrides: [^]u32, ppMaxPrimitiveCounts: ^[^]u32) ProcCmdBuildAccelerationStructuresKHR :: #type proc "system" (commandBuffer: CommandBuffer, infoCount: u32, pInfos: [^]AccelerationStructureBuildGeometryInfoKHR, ppBuildRangeInfos: ^[^]AccelerationStructureBuildRangeInfoKHR) @@ -153,13 +158,17 @@ ProcCmdCopyAccelerationStructureKHR :: #type proc "system" (comm ProcCmdCopyAccelerationStructureNV :: #type proc "system" (commandBuffer: CommandBuffer, dst: AccelerationStructureNV, src: AccelerationStructureNV, mode: CopyAccelerationStructureModeKHR) ProcCmdCopyAccelerationStructureToMemoryKHR :: #type proc "system" (commandBuffer: CommandBuffer, pInfo: ^CopyAccelerationStructureToMemoryInfoKHR) ProcCmdCopyBuffer :: #type proc "system" (commandBuffer: CommandBuffer, srcBuffer: Buffer, dstBuffer: Buffer, regionCount: u32, pRegions: [^]BufferCopy) -ProcCmdCopyBuffer2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyBufferInfo: ^CopyBufferInfo2KHR) +ProcCmdCopyBuffer2 :: #type proc "system" (commandBuffer: CommandBuffer, pCopyBufferInfo: ^CopyBufferInfo2) +ProcCmdCopyBuffer2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyBufferInfo: ^CopyBufferInfo2) ProcCmdCopyBufferToImage :: #type proc "system" (commandBuffer: CommandBuffer, srcBuffer: Buffer, dstImage: Image, dstImageLayout: ImageLayout, regionCount: u32, pRegions: [^]BufferImageCopy) -ProcCmdCopyBufferToImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyBufferToImageInfo: ^CopyBufferToImageInfo2KHR) +ProcCmdCopyBufferToImage2 :: #type proc "system" (commandBuffer: CommandBuffer, pCopyBufferToImageInfo: ^CopyBufferToImageInfo2) +ProcCmdCopyBufferToImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyBufferToImageInfo: ^CopyBufferToImageInfo2) ProcCmdCopyImage :: #type proc "system" (commandBuffer: CommandBuffer, srcImage: Image, srcImageLayout: ImageLayout, dstImage: Image, dstImageLayout: ImageLayout, regionCount: u32, pRegions: [^]ImageCopy) -ProcCmdCopyImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyImageInfo: ^CopyImageInfo2KHR) +ProcCmdCopyImage2 :: #type proc "system" (commandBuffer: CommandBuffer, pCopyImageInfo: ^CopyImageInfo2) +ProcCmdCopyImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyImageInfo: ^CopyImageInfo2) ProcCmdCopyImageToBuffer :: #type proc "system" (commandBuffer: CommandBuffer, srcImage: Image, srcImageLayout: ImageLayout, dstBuffer: Buffer, regionCount: u32, pRegions: [^]BufferImageCopy) -ProcCmdCopyImageToBuffer2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyImageToBufferInfo: ^CopyImageToBufferInfo2KHR) +ProcCmdCopyImageToBuffer2 :: #type proc "system" (commandBuffer: CommandBuffer, pCopyImageToBufferInfo: ^CopyImageToBufferInfo2) +ProcCmdCopyImageToBuffer2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pCopyImageToBufferInfo: ^CopyImageToBufferInfo2) ProcCmdCopyMemoryToAccelerationStructureKHR :: #type proc "system" (commandBuffer: CommandBuffer, pInfo: ^CopyMemoryToAccelerationStructureInfoKHR) ProcCmdCopyQueryPoolResults :: #type proc "system" (commandBuffer: CommandBuffer, queryPool: QueryPool, firstQuery: u32, queryCount: u32, dstBuffer: Buffer, dstOffset: DeviceSize, stride: DeviceSize, flags: QueryResultFlags) ProcCmdCuLaunchKernelNVX :: #type proc "system" (commandBuffer: CommandBuffer, pLaunchInfo: ^CuLaunchInfoNVX) @@ -193,6 +202,8 @@ ProcCmdEndQueryIndexedEXT :: #type proc "system" (comm ProcCmdEndRenderPass :: #type proc "system" (commandBuffer: CommandBuffer) ProcCmdEndRenderPass2 :: #type proc "system" (commandBuffer: CommandBuffer, pSubpassEndInfo: ^SubpassEndInfo) ProcCmdEndRenderPass2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pSubpassEndInfo: ^SubpassEndInfo) +ProcCmdEndRendering :: #type proc "system" (commandBuffer: CommandBuffer) +ProcCmdEndRenderingKHR :: #type proc "system" (commandBuffer: CommandBuffer) ProcCmdEndTransformFeedbackEXT :: #type proc "system" (commandBuffer: CommandBuffer, firstCounterBuffer: u32, counterBufferCount: u32, pCounterBuffers: [^]Buffer, pCounterBufferOffsets: [^]DeviceSize) ProcCmdExecuteCommands :: #type proc "system" (commandBuffer: CommandBuffer, commandBufferCount: u32, pCommandBuffers: [^]CommandBuffer) ProcCmdExecuteGeneratedCommandsNV :: #type proc "system" (commandBuffer: CommandBuffer, isPreprocessed: b32, pGeneratedCommandsInfo: ^GeneratedCommandsInfoNV) @@ -202,35 +213,46 @@ ProcCmdNextSubpass :: #type proc "system" (comm ProcCmdNextSubpass2 :: #type proc "system" (commandBuffer: CommandBuffer, pSubpassBeginInfo: ^SubpassBeginInfo, pSubpassEndInfo: ^SubpassEndInfo) ProcCmdNextSubpass2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pSubpassBeginInfo: ^SubpassBeginInfo, pSubpassEndInfo: ^SubpassEndInfo) ProcCmdPipelineBarrier :: #type proc "system" (commandBuffer: CommandBuffer, srcStageMask: PipelineStageFlags, dstStageMask: PipelineStageFlags, dependencyFlags: DependencyFlags, memoryBarrierCount: u32, pMemoryBarriers: [^]MemoryBarrier, bufferMemoryBarrierCount: u32, pBufferMemoryBarriers: [^]BufferMemoryBarrier, imageMemoryBarrierCount: u32, pImageMemoryBarriers: [^]ImageMemoryBarrier) -ProcCmdPipelineBarrier2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pDependencyInfo: ^DependencyInfoKHR) +ProcCmdPipelineBarrier2 :: #type proc "system" (commandBuffer: CommandBuffer, pDependencyInfo: ^DependencyInfo) +ProcCmdPipelineBarrier2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pDependencyInfo: ^DependencyInfo) ProcCmdPreprocessGeneratedCommandsNV :: #type proc "system" (commandBuffer: CommandBuffer, pGeneratedCommandsInfo: ^GeneratedCommandsInfoNV) ProcCmdPushConstants :: #type proc "system" (commandBuffer: CommandBuffer, layout: PipelineLayout, stageFlags: ShaderStageFlags, offset: u32, size: u32, pValues: rawptr) ProcCmdPushDescriptorSetKHR :: #type proc "system" (commandBuffer: CommandBuffer, pipelineBindPoint: PipelineBindPoint, layout: PipelineLayout, set: u32, descriptorWriteCount: u32, pDescriptorWrites: [^]WriteDescriptorSet) ProcCmdPushDescriptorSetWithTemplateKHR :: #type proc "system" (commandBuffer: CommandBuffer, descriptorUpdateTemplate: DescriptorUpdateTemplate, layout: PipelineLayout, set: u32, pData: rawptr) ProcCmdResetEvent :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, stageMask: PipelineStageFlags) -ProcCmdResetEvent2KHR :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, stageMask: PipelineStageFlags2KHR) +ProcCmdResetEvent2 :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, stageMask: PipelineStageFlags2) +ProcCmdResetEvent2KHR :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, stageMask: PipelineStageFlags2) ProcCmdResetQueryPool :: #type proc "system" (commandBuffer: CommandBuffer, queryPool: QueryPool, firstQuery: u32, queryCount: u32) ProcCmdResolveImage :: #type proc "system" (commandBuffer: CommandBuffer, srcImage: Image, srcImageLayout: ImageLayout, dstImage: Image, dstImageLayout: ImageLayout, regionCount: u32, pRegions: [^]ImageResolve) -ProcCmdResolveImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pResolveImageInfo: ^ResolveImageInfo2KHR) +ProcCmdResolveImage2 :: #type proc "system" (commandBuffer: CommandBuffer, pResolveImageInfo: ^ResolveImageInfo2) +ProcCmdResolveImage2KHR :: #type proc "system" (commandBuffer: CommandBuffer, pResolveImageInfo: ^ResolveImageInfo2) ProcCmdSetBlendConstants :: #type proc "system" (commandBuffer: CommandBuffer) ProcCmdSetCheckpointNV :: #type proc "system" (commandBuffer: CommandBuffer, pCheckpointMarker: rawptr) ProcCmdSetCoarseSampleOrderNV :: #type proc "system" (commandBuffer: CommandBuffer, sampleOrderType: CoarseSampleOrderTypeNV, customSampleOrderCount: u32, pCustomSampleOrders: [^]CoarseSampleOrderCustomNV) +ProcCmdSetCullMode :: #type proc "system" (commandBuffer: CommandBuffer, cullMode: CullModeFlags) ProcCmdSetCullModeEXT :: #type proc "system" (commandBuffer: CommandBuffer, cullMode: CullModeFlags) ProcCmdSetDepthBias :: #type proc "system" (commandBuffer: CommandBuffer, depthBiasConstantFactor: f32, depthBiasClamp: f32, depthBiasSlopeFactor: f32) +ProcCmdSetDepthBiasEnable :: #type proc "system" (commandBuffer: CommandBuffer, depthBiasEnable: b32) ProcCmdSetDepthBiasEnableEXT :: #type proc "system" (commandBuffer: CommandBuffer, depthBiasEnable: b32) ProcCmdSetDepthBounds :: #type proc "system" (commandBuffer: CommandBuffer, minDepthBounds: f32, maxDepthBounds: f32) +ProcCmdSetDepthBoundsTestEnable :: #type proc "system" (commandBuffer: CommandBuffer, depthBoundsTestEnable: b32) ProcCmdSetDepthBoundsTestEnableEXT :: #type proc "system" (commandBuffer: CommandBuffer, depthBoundsTestEnable: b32) +ProcCmdSetDepthCompareOp :: #type proc "system" (commandBuffer: CommandBuffer, depthCompareOp: CompareOp) ProcCmdSetDepthCompareOpEXT :: #type proc "system" (commandBuffer: CommandBuffer, depthCompareOp: CompareOp) +ProcCmdSetDepthTestEnable :: #type proc "system" (commandBuffer: CommandBuffer, depthTestEnable: b32) ProcCmdSetDepthTestEnableEXT :: #type proc "system" (commandBuffer: CommandBuffer, depthTestEnable: b32) +ProcCmdSetDepthWriteEnable :: #type proc "system" (commandBuffer: CommandBuffer, depthWriteEnable: b32) ProcCmdSetDepthWriteEnableEXT :: #type proc "system" (commandBuffer: CommandBuffer, depthWriteEnable: b32) ProcCmdSetDeviceMask :: #type proc "system" (commandBuffer: CommandBuffer, deviceMask: u32) ProcCmdSetDeviceMaskKHR :: #type proc "system" (commandBuffer: CommandBuffer, deviceMask: u32) ProcCmdSetDiscardRectangleEXT :: #type proc "system" (commandBuffer: CommandBuffer, firstDiscardRectangle: u32, discardRectangleCount: u32, pDiscardRectangles: [^]Rect2D) ProcCmdSetEvent :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, stageMask: PipelineStageFlags) -ProcCmdSetEvent2KHR :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, pDependencyInfo: ^DependencyInfoKHR) +ProcCmdSetEvent2 :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, pDependencyInfo: ^DependencyInfo) +ProcCmdSetEvent2KHR :: #type proc "system" (commandBuffer: CommandBuffer, event: Event, pDependencyInfo: ^DependencyInfo) ProcCmdSetExclusiveScissorNV :: #type proc "system" (commandBuffer: CommandBuffer, firstExclusiveScissor: u32, exclusiveScissorCount: u32, pExclusiveScissors: [^]Rect2D) ProcCmdSetFragmentShadingRateEnumNV :: #type proc "system" (commandBuffer: CommandBuffer, shadingRate: FragmentShadingRateNV) ProcCmdSetFragmentShadingRateKHR :: #type proc "system" (commandBuffer: CommandBuffer, pFragmentSize: ^Extent2D) +ProcCmdSetFrontFace :: #type proc "system" (commandBuffer: CommandBuffer, frontFace: FrontFace) ProcCmdSetFrontFaceEXT :: #type proc "system" (commandBuffer: CommandBuffer, frontFace: FrontFace) ProcCmdSetLineStippleEXT :: #type proc "system" (commandBuffer: CommandBuffer, lineStippleFactor: u32, lineStipplePattern: u16) ProcCmdSetLineWidth :: #type proc "system" (commandBuffer: CommandBuffer, lineWidth: f32) @@ -239,22 +261,29 @@ ProcCmdSetPatchControlPointsEXT :: #type proc "system" (comm ProcCmdSetPerformanceMarkerINTEL :: #type proc "system" (commandBuffer: CommandBuffer, pMarkerInfo: ^PerformanceMarkerInfoINTEL) -> Result ProcCmdSetPerformanceOverrideINTEL :: #type proc "system" (commandBuffer: CommandBuffer, pOverrideInfo: ^PerformanceOverrideInfoINTEL) -> Result ProcCmdSetPerformanceStreamMarkerINTEL :: #type proc "system" (commandBuffer: CommandBuffer, pMarkerInfo: ^PerformanceStreamMarkerInfoINTEL) -> Result +ProcCmdSetPrimitiveRestartEnable :: #type proc "system" (commandBuffer: CommandBuffer, primitiveRestartEnable: b32) ProcCmdSetPrimitiveRestartEnableEXT :: #type proc "system" (commandBuffer: CommandBuffer, primitiveRestartEnable: b32) +ProcCmdSetPrimitiveTopology :: #type proc "system" (commandBuffer: CommandBuffer, primitiveTopology: PrimitiveTopology) ProcCmdSetPrimitiveTopologyEXT :: #type proc "system" (commandBuffer: CommandBuffer, primitiveTopology: PrimitiveTopology) +ProcCmdSetRasterizerDiscardEnable :: #type proc "system" (commandBuffer: CommandBuffer, rasterizerDiscardEnable: b32) ProcCmdSetRasterizerDiscardEnableEXT :: #type proc "system" (commandBuffer: CommandBuffer, rasterizerDiscardEnable: b32) ProcCmdSetRayTracingPipelineStackSizeKHR :: #type proc "system" (commandBuffer: CommandBuffer, pipelineStackSize: u32) ProcCmdSetSampleLocationsEXT :: #type proc "system" (commandBuffer: CommandBuffer, pSampleLocationsInfo: ^SampleLocationsInfoEXT) ProcCmdSetScissor :: #type proc "system" (commandBuffer: CommandBuffer, firstScissor: u32, scissorCount: u32, pScissors: [^]Rect2D) +ProcCmdSetScissorWithCount :: #type proc "system" (commandBuffer: CommandBuffer, scissorCount: u32, pScissors: [^]Rect2D) ProcCmdSetScissorWithCountEXT :: #type proc "system" (commandBuffer: CommandBuffer, scissorCount: u32, pScissors: [^]Rect2D) ProcCmdSetStencilCompareMask :: #type proc "system" (commandBuffer: CommandBuffer, faceMask: StencilFaceFlags, compareMask: u32) +ProcCmdSetStencilOp :: #type proc "system" (commandBuffer: CommandBuffer, faceMask: StencilFaceFlags, failOp: StencilOp, passOp: StencilOp, depthFailOp: StencilOp, compareOp: CompareOp) ProcCmdSetStencilOpEXT :: #type proc "system" (commandBuffer: CommandBuffer, faceMask: StencilFaceFlags, failOp: StencilOp, passOp: StencilOp, depthFailOp: StencilOp, compareOp: CompareOp) ProcCmdSetStencilReference :: #type proc "system" (commandBuffer: CommandBuffer, faceMask: StencilFaceFlags, reference: u32) +ProcCmdSetStencilTestEnable :: #type proc "system" (commandBuffer: CommandBuffer, stencilTestEnable: b32) ProcCmdSetStencilTestEnableEXT :: #type proc "system" (commandBuffer: CommandBuffer, stencilTestEnable: b32) ProcCmdSetStencilWriteMask :: #type proc "system" (commandBuffer: CommandBuffer, faceMask: StencilFaceFlags, writeMask: u32) ProcCmdSetVertexInputEXT :: #type proc "system" (commandBuffer: CommandBuffer, vertexBindingDescriptionCount: u32, pVertexBindingDescriptions: [^]VertexInputBindingDescription2EXT, vertexAttributeDescriptionCount: u32, pVertexAttributeDescriptions: [^]VertexInputAttributeDescription2EXT) ProcCmdSetViewport :: #type proc "system" (commandBuffer: CommandBuffer, firstViewport: u32, viewportCount: u32, pViewports: [^]Viewport) ProcCmdSetViewportShadingRatePaletteNV :: #type proc "system" (commandBuffer: CommandBuffer, firstViewport: u32, viewportCount: u32, pShadingRatePalettes: [^]ShadingRatePaletteNV) ProcCmdSetViewportWScalingNV :: #type proc "system" (commandBuffer: CommandBuffer, firstViewport: u32, viewportCount: u32, pViewportWScalings: [^]ViewportWScalingNV) +ProcCmdSetViewportWithCount :: #type proc "system" (commandBuffer: CommandBuffer, viewportCount: u32, pViewports: [^]Viewport) ProcCmdSetViewportWithCountEXT :: #type proc "system" (commandBuffer: CommandBuffer, viewportCount: u32, pViewports: [^]Viewport) ProcCmdSubpassShadingHUAWEI :: #type proc "system" (commandBuffer: CommandBuffer) ProcCmdTraceRaysIndirectKHR :: #type proc "system" (commandBuffer: CommandBuffer, pRaygenShaderBindingTable: [^]StridedDeviceAddressRegionKHR, pMissShaderBindingTable: [^]StridedDeviceAddressRegionKHR, pHitShaderBindingTable: [^]StridedDeviceAddressRegionKHR, pCallableShaderBindingTable: [^]StridedDeviceAddressRegionKHR, indirectDeviceAddress: DeviceAddress) @@ -262,13 +291,15 @@ ProcCmdTraceRaysKHR :: #type proc "system" (comm ProcCmdTraceRaysNV :: #type proc "system" (commandBuffer: CommandBuffer, raygenShaderBindingTableBuffer: Buffer, raygenShaderBindingOffset: DeviceSize, missShaderBindingTableBuffer: Buffer, missShaderBindingOffset: DeviceSize, missShaderBindingStride: DeviceSize, hitShaderBindingTableBuffer: Buffer, hitShaderBindingOffset: DeviceSize, hitShaderBindingStride: DeviceSize, callableShaderBindingTableBuffer: Buffer, callableShaderBindingOffset: DeviceSize, callableShaderBindingStride: DeviceSize, width: u32, height: u32, depth: u32) ProcCmdUpdateBuffer :: #type proc "system" (commandBuffer: CommandBuffer, dstBuffer: Buffer, dstOffset: DeviceSize, dataSize: DeviceSize, pData: rawptr) ProcCmdWaitEvents :: #type proc "system" (commandBuffer: CommandBuffer, eventCount: u32, pEvents: [^]Event, srcStageMask: PipelineStageFlags, dstStageMask: PipelineStageFlags, memoryBarrierCount: u32, pMemoryBarriers: [^]MemoryBarrier, bufferMemoryBarrierCount: u32, pBufferMemoryBarriers: [^]BufferMemoryBarrier, imageMemoryBarrierCount: u32, pImageMemoryBarriers: [^]ImageMemoryBarrier) -ProcCmdWaitEvents2KHR :: #type proc "system" (commandBuffer: CommandBuffer, eventCount: u32, pEvents: [^]Event, pDependencyInfos: [^]DependencyInfoKHR) +ProcCmdWaitEvents2 :: #type proc "system" (commandBuffer: CommandBuffer, eventCount: u32, pEvents: [^]Event, pDependencyInfos: [^]DependencyInfo) +ProcCmdWaitEvents2KHR :: #type proc "system" (commandBuffer: CommandBuffer, eventCount: u32, pEvents: [^]Event, pDependencyInfos: [^]DependencyInfo) ProcCmdWriteAccelerationStructuresPropertiesKHR :: #type proc "system" (commandBuffer: CommandBuffer, accelerationStructureCount: u32, pAccelerationStructures: [^]AccelerationStructureKHR, queryType: QueryType, queryPool: QueryPool, firstQuery: u32) ProcCmdWriteAccelerationStructuresPropertiesNV :: #type proc "system" (commandBuffer: CommandBuffer, accelerationStructureCount: u32, pAccelerationStructures: [^]AccelerationStructureNV, queryType: QueryType, queryPool: QueryPool, firstQuery: u32) -ProcCmdWriteBufferMarker2AMD :: #type proc "system" (commandBuffer: CommandBuffer, stage: PipelineStageFlags2KHR, dstBuffer: Buffer, dstOffset: DeviceSize, marker: u32) +ProcCmdWriteBufferMarker2AMD :: #type proc "system" (commandBuffer: CommandBuffer, stage: PipelineStageFlags2, dstBuffer: Buffer, dstOffset: DeviceSize, marker: u32) ProcCmdWriteBufferMarkerAMD :: #type proc "system" (commandBuffer: CommandBuffer, pipelineStage: PipelineStageFlags, dstBuffer: Buffer, dstOffset: DeviceSize, marker: u32) ProcCmdWriteTimestamp :: #type proc "system" (commandBuffer: CommandBuffer, pipelineStage: PipelineStageFlags, queryPool: QueryPool, query: u32) -ProcCmdWriteTimestamp2KHR :: #type proc "system" (commandBuffer: CommandBuffer, stage: PipelineStageFlags2KHR, queryPool: QueryPool, query: u32) +ProcCmdWriteTimestamp2 :: #type proc "system" (commandBuffer: CommandBuffer, stage: PipelineStageFlags2, queryPool: QueryPool, query: u32) +ProcCmdWriteTimestamp2KHR :: #type proc "system" (commandBuffer: CommandBuffer, stage: PipelineStageFlags2, queryPool: QueryPool, query: u32) ProcCompileDeferredNV :: #type proc "system" (device: Device, pipeline: Pipeline, shader: u32) -> Result ProcCopyAccelerationStructureKHR :: #type proc "system" (device: Device, deferredOperation: DeferredOperationKHR, pInfo: ^CopyAccelerationStructureInfoKHR) -> Result ProcCopyAccelerationStructureToMemoryKHR :: #type proc "system" (device: Device, deferredOperation: DeferredOperationKHR, pInfo: ^CopyAccelerationStructureToMemoryInfoKHR) -> Result @@ -295,7 +326,8 @@ ProcCreateImageView :: #type proc "system" (devi ProcCreateIndirectCommandsLayoutNV :: #type proc "system" (device: Device, pCreateInfo: ^IndirectCommandsLayoutCreateInfoNV, pAllocator: ^AllocationCallbacks, pIndirectCommandsLayout: ^IndirectCommandsLayoutNV) -> Result ProcCreatePipelineCache :: #type proc "system" (device: Device, pCreateInfo: ^PipelineCacheCreateInfo, pAllocator: ^AllocationCallbacks, pPipelineCache: ^PipelineCache) -> Result ProcCreatePipelineLayout :: #type proc "system" (device: Device, pCreateInfo: ^PipelineLayoutCreateInfo, pAllocator: ^AllocationCallbacks, pPipelineLayout: ^PipelineLayout) -> Result -ProcCreatePrivateDataSlotEXT :: #type proc "system" (device: Device, pCreateInfo: ^PrivateDataSlotCreateInfoEXT, pAllocator: ^AllocationCallbacks, pPrivateDataSlot: ^PrivateDataSlotEXT) -> Result +ProcCreatePrivateDataSlot :: #type proc "system" (device: Device, pCreateInfo: ^PrivateDataSlotCreateInfo, pAllocator: ^AllocationCallbacks, pPrivateDataSlot: ^PrivateDataSlot) -> Result +ProcCreatePrivateDataSlotEXT :: #type proc "system" (device: Device, pCreateInfo: ^PrivateDataSlotCreateInfo, pAllocator: ^AllocationCallbacks, pPrivateDataSlot: ^PrivateDataSlot) -> Result ProcCreateQueryPool :: #type proc "system" (device: Device, pCreateInfo: ^QueryPoolCreateInfo, pAllocator: ^AllocationCallbacks, pQueryPool: ^QueryPool) -> Result ProcCreateRayTracingPipelinesKHR :: #type proc "system" (device: Device, deferredOperation: DeferredOperationKHR, pipelineCache: PipelineCache, createInfoCount: u32, pCreateInfos: [^]RayTracingPipelineCreateInfoKHR, pAllocator: ^AllocationCallbacks, pPipelines: [^]Pipeline) -> Result ProcCreateRayTracingPipelinesNV :: #type proc "system" (device: Device, pipelineCache: PipelineCache, createInfoCount: u32, pCreateInfos: [^]RayTracingPipelineCreateInfoNV, pAllocator: ^AllocationCallbacks, pPipelines: [^]Pipeline) -> Result @@ -335,7 +367,8 @@ ProcDestroyIndirectCommandsLayoutNV :: #type proc "system" (devi ProcDestroyPipeline :: #type proc "system" (device: Device, pipeline: Pipeline, pAllocator: ^AllocationCallbacks) ProcDestroyPipelineCache :: #type proc "system" (device: Device, pipelineCache: PipelineCache, pAllocator: ^AllocationCallbacks) ProcDestroyPipelineLayout :: #type proc "system" (device: Device, pipelineLayout: PipelineLayout, pAllocator: ^AllocationCallbacks) -ProcDestroyPrivateDataSlotEXT :: #type proc "system" (device: Device, privateDataSlot: PrivateDataSlotEXT, pAllocator: ^AllocationCallbacks) +ProcDestroyPrivateDataSlot :: #type proc "system" (device: Device, privateDataSlot: PrivateDataSlot, pAllocator: ^AllocationCallbacks) +ProcDestroyPrivateDataSlotEXT :: #type proc "system" (device: Device, privateDataSlot: PrivateDataSlot, pAllocator: ^AllocationCallbacks) ProcDestroyQueryPool :: #type proc "system" (device: Device, queryPool: QueryPool, pAllocator: ^AllocationCallbacks) ProcDestroyRenderPass :: #type proc "system" (device: Device, renderPass: RenderPass, pAllocator: ^AllocationCallbacks) ProcDestroySampler :: #type proc "system" (device: Device, sampler: Sampler, pAllocator: ^AllocationCallbacks) @@ -367,14 +400,22 @@ ProcGetBufferOpaqueCaptureAddressKHR :: #type proc "system" (devi ProcGetCalibratedTimestampsEXT :: #type proc "system" (device: Device, timestampCount: u32, pTimestampInfos: [^]CalibratedTimestampInfoEXT, pTimestamps: [^]u64, pMaxDeviation: ^u64) -> Result ProcGetDeferredOperationMaxConcurrencyKHR :: #type proc "system" (device: Device, operation: DeferredOperationKHR) -> u32 ProcGetDeferredOperationResultKHR :: #type proc "system" (device: Device, operation: DeferredOperationKHR) -> Result +ProcGetDescriptorSetHostMappingVALVE :: #type proc "system" (device: Device, descriptorSet: DescriptorSet, ppData: ^rawptr) +ProcGetDescriptorSetLayoutHostMappingInfoVALVE :: #type proc "system" (device: Device, pBindingReference: ^DescriptorSetBindingReferenceVALVE, pHostMapping: ^DescriptorSetLayoutHostMappingInfoVALVE) ProcGetDescriptorSetLayoutSupport :: #type proc "system" (device: Device, pCreateInfo: ^DescriptorSetLayoutCreateInfo, pSupport: ^DescriptorSetLayoutSupport) ProcGetDescriptorSetLayoutSupportKHR :: #type proc "system" (device: Device, pCreateInfo: ^DescriptorSetLayoutCreateInfo, pSupport: ^DescriptorSetLayoutSupport) ProcGetDeviceAccelerationStructureCompatibilityKHR :: #type proc "system" (device: Device, pVersionInfo: ^AccelerationStructureVersionInfoKHR, pCompatibility: ^AccelerationStructureCompatibilityKHR) +ProcGetDeviceBufferMemoryRequirements :: #type proc "system" (device: Device, pInfo: ^DeviceBufferMemoryRequirements, pMemoryRequirements: [^]MemoryRequirements2) +ProcGetDeviceBufferMemoryRequirementsKHR :: #type proc "system" (device: Device, pInfo: ^DeviceBufferMemoryRequirements, pMemoryRequirements: [^]MemoryRequirements2) ProcGetDeviceGroupPeerMemoryFeatures :: #type proc "system" (device: Device, heapIndex: u32, localDeviceIndex: u32, remoteDeviceIndex: u32, pPeerMemoryFeatures: [^]PeerMemoryFeatureFlags) ProcGetDeviceGroupPeerMemoryFeaturesKHR :: #type proc "system" (device: Device, heapIndex: u32, localDeviceIndex: u32, remoteDeviceIndex: u32, pPeerMemoryFeatures: [^]PeerMemoryFeatureFlags) ProcGetDeviceGroupPresentCapabilitiesKHR :: #type proc "system" (device: Device, pDeviceGroupPresentCapabilities: [^]DeviceGroupPresentCapabilitiesKHR) -> Result ProcGetDeviceGroupSurfacePresentModes2EXT :: #type proc "system" (device: Device, pSurfaceInfo: ^PhysicalDeviceSurfaceInfo2KHR, pModes: [^]DeviceGroupPresentModeFlagsKHR) -> Result ProcGetDeviceGroupSurfacePresentModesKHR :: #type proc "system" (device: Device, surface: SurfaceKHR, pModes: [^]DeviceGroupPresentModeFlagsKHR) -> Result +ProcGetDeviceImageMemoryRequirements :: #type proc "system" (device: Device, pInfo: ^DeviceImageMemoryRequirements, pMemoryRequirements: [^]MemoryRequirements2) +ProcGetDeviceImageMemoryRequirementsKHR :: #type proc "system" (device: Device, pInfo: ^DeviceImageMemoryRequirements, pMemoryRequirements: [^]MemoryRequirements2) +ProcGetDeviceImageSparseMemoryRequirements :: #type proc "system" (device: Device, pInfo: ^DeviceImageMemoryRequirements, pSparseMemoryRequirementCount: ^u32, pSparseMemoryRequirements: [^]SparseImageMemoryRequirements2) +ProcGetDeviceImageSparseMemoryRequirementsKHR :: #type proc "system" (device: Device, pInfo: ^DeviceImageMemoryRequirements, pSparseMemoryRequirementCount: ^u32, pSparseMemoryRequirements: [^]SparseImageMemoryRequirements2) ProcGetDeviceMemoryCommitment :: #type proc "system" (device: Device, memory: DeviceMemory, pCommittedMemoryInBytes: [^]DeviceSize) ProcGetDeviceMemoryOpaqueCaptureAddress :: #type proc "system" (device: Device, pInfo: ^DeviceMemoryOpaqueCaptureAddressInfo) -> u64 ProcGetDeviceMemoryOpaqueCaptureAddressKHR :: #type proc "system" (device: Device, pInfo: ^DeviceMemoryOpaqueCaptureAddressInfo) -> u64 @@ -410,7 +451,8 @@ ProcGetPipelineCacheData :: #type proc "system" (devi ProcGetPipelineExecutableInternalRepresentationsKHR :: #type proc "system" (device: Device, pExecutableInfo: ^PipelineExecutableInfoKHR, pInternalRepresentationCount: ^u32, pInternalRepresentations: [^]PipelineExecutableInternalRepresentationKHR) -> Result ProcGetPipelineExecutablePropertiesKHR :: #type proc "system" (device: Device, pPipelineInfo: ^PipelineInfoKHR, pExecutableCount: ^u32, pProperties: [^]PipelineExecutablePropertiesKHR) -> Result ProcGetPipelineExecutableStatisticsKHR :: #type proc "system" (device: Device, pExecutableInfo: ^PipelineExecutableInfoKHR, pStatisticCount: ^u32, pStatistics: [^]PipelineExecutableStatisticKHR) -> Result -ProcGetPrivateDataEXT :: #type proc "system" (device: Device, objectType: ObjectType, objectHandle: u64, privateDataSlot: PrivateDataSlotEXT, pData: ^u64) +ProcGetPrivateData :: #type proc "system" (device: Device, objectType: ObjectType, objectHandle: u64, privateDataSlot: PrivateDataSlot, pData: ^u64) +ProcGetPrivateDataEXT :: #type proc "system" (device: Device, objectType: ObjectType, objectHandle: u64, privateDataSlot: PrivateDataSlot, pData: ^u64) ProcGetQueryPoolResults :: #type proc "system" (device: Device, queryPool: QueryPool, firstQuery: u32, queryCount: u32, dataSize: int, pData: rawptr, stride: DeviceSize, flags: QueryResultFlags) -> Result ProcGetQueueCheckpointData2NV :: #type proc "system" (queue: Queue, pCheckpointDataCount: ^u32, pCheckpointData: ^CheckpointData2NV) ProcGetQueueCheckpointDataNV :: #type proc "system" (queue: Queue, pCheckpointDataCount: ^u32, pCheckpointData: ^CheckpointDataNV) @@ -445,7 +487,8 @@ ProcQueueInsertDebugUtilsLabelEXT :: #type proc "system" (queu ProcQueuePresentKHR :: #type proc "system" (queue: Queue, pPresentInfo: ^PresentInfoKHR) -> Result ProcQueueSetPerformanceConfigurationINTEL :: #type proc "system" (queue: Queue, configuration: PerformanceConfigurationINTEL) -> Result ProcQueueSubmit :: #type proc "system" (queue: Queue, submitCount: u32, pSubmits: [^]SubmitInfo, fence: Fence) -> Result -ProcQueueSubmit2KHR :: #type proc "system" (queue: Queue, submitCount: u32, pSubmits: [^]SubmitInfo2KHR, fence: Fence) -> Result +ProcQueueSubmit2 :: #type proc "system" (queue: Queue, submitCount: u32, pSubmits: [^]SubmitInfo2, fence: Fence) -> Result +ProcQueueSubmit2KHR :: #type proc "system" (queue: Queue, submitCount: u32, pSubmits: [^]SubmitInfo2, fence: Fence) -> Result ProcQueueWaitIdle :: #type proc "system" (queue: Queue) -> Result ProcRegisterDeviceEventEXT :: #type proc "system" (device: Device, pDeviceEventInfo: ^DeviceEventInfoEXT, pAllocator: ^AllocationCallbacks, pFence: ^Fence) -> Result ProcRegisterDisplayEventEXT :: #type proc "system" (device: Device, display: DisplayKHR, pDisplayEventInfo: ^DisplayEventInfoEXT, pAllocator: ^AllocationCallbacks, pFence: ^Fence) -> Result @@ -465,7 +508,8 @@ ProcSetDeviceMemoryPriorityEXT :: #type proc "system" (devi ProcSetEvent :: #type proc "system" (device: Device, event: Event) -> Result ProcSetHdrMetadataEXT :: #type proc "system" (device: Device, swapchainCount: u32, pSwapchains: [^]SwapchainKHR, pMetadata: ^HdrMetadataEXT) ProcSetLocalDimmingAMD :: #type proc "system" (device: Device, swapChain: SwapchainKHR, localDimmingEnable: b32) -ProcSetPrivateDataEXT :: #type proc "system" (device: Device, objectType: ObjectType, objectHandle: u64, privateDataSlot: PrivateDataSlotEXT, data: u64) -> Result +ProcSetPrivateData :: #type proc "system" (device: Device, objectType: ObjectType, objectHandle: u64, privateDataSlot: PrivateDataSlot, data: u64) -> Result +ProcSetPrivateDataEXT :: #type proc "system" (device: Device, objectType: ObjectType, objectHandle: u64, privateDataSlot: PrivateDataSlot, data: u64) -> Result ProcSignalSemaphore :: #type proc "system" (device: Device, pSignalInfo: ^SemaphoreSignalInfo) -> Result ProcSignalSemaphoreKHR :: #type proc "system" (device: Device, pSignalInfo: ^SemaphoreSignalInfo) -> Result ProcTrimCommandPool :: #type proc "system" (device: Device, commandPool: CommandPool, flags: CommandPoolTrimFlags) @@ -568,6 +612,7 @@ GetPhysicalDeviceSurfaceFormatsKHR: ProcGetPhysical GetPhysicalDeviceSurfacePresentModes2EXT: ProcGetPhysicalDeviceSurfacePresentModes2EXT GetPhysicalDeviceSurfacePresentModesKHR: ProcGetPhysicalDeviceSurfacePresentModesKHR GetPhysicalDeviceSurfaceSupportKHR: ProcGetPhysicalDeviceSurfaceSupportKHR +GetPhysicalDeviceToolProperties: ProcGetPhysicalDeviceToolProperties GetPhysicalDeviceToolPropertiesEXT: ProcGetPhysicalDeviceToolPropertiesEXT GetPhysicalDeviceWin32PresentationSupportKHR: ProcGetPhysicalDeviceWin32PresentationSupportKHR GetWinrtDisplayNV: ProcGetWinrtDisplayNV @@ -599,6 +644,8 @@ CmdBeginQueryIndexedEXT: ProcCmdBeginQueryIndexedEXT CmdBeginRenderPass: ProcCmdBeginRenderPass CmdBeginRenderPass2: ProcCmdBeginRenderPass2 CmdBeginRenderPass2KHR: ProcCmdBeginRenderPass2KHR +CmdBeginRendering: ProcCmdBeginRendering +CmdBeginRenderingKHR: ProcCmdBeginRenderingKHR CmdBeginTransformFeedbackEXT: ProcCmdBeginTransformFeedbackEXT CmdBindDescriptorSets: ProcCmdBindDescriptorSets CmdBindIndexBuffer: ProcCmdBindIndexBuffer @@ -608,8 +655,10 @@ CmdBindPipelineShaderGroupNV: ProcCmdBindPipelineShaderGroupN CmdBindShadingRateImageNV: ProcCmdBindShadingRateImageNV CmdBindTransformFeedbackBuffersEXT: ProcCmdBindTransformFeedbackBuffersEXT CmdBindVertexBuffers: ProcCmdBindVertexBuffers +CmdBindVertexBuffers2: ProcCmdBindVertexBuffers2 CmdBindVertexBuffers2EXT: ProcCmdBindVertexBuffers2EXT CmdBlitImage: ProcCmdBlitImage +CmdBlitImage2: ProcCmdBlitImage2 CmdBlitImage2KHR: ProcCmdBlitImage2KHR CmdBuildAccelerationStructureNV: ProcCmdBuildAccelerationStructureNV CmdBuildAccelerationStructuresIndirectKHR: ProcCmdBuildAccelerationStructuresIndirectKHR @@ -621,12 +670,16 @@ CmdCopyAccelerationStructureKHR: ProcCmdCopyAccelerationStructur CmdCopyAccelerationStructureNV: ProcCmdCopyAccelerationStructureNV CmdCopyAccelerationStructureToMemoryKHR: ProcCmdCopyAccelerationStructureToMemoryKHR CmdCopyBuffer: ProcCmdCopyBuffer +CmdCopyBuffer2: ProcCmdCopyBuffer2 CmdCopyBuffer2KHR: ProcCmdCopyBuffer2KHR CmdCopyBufferToImage: ProcCmdCopyBufferToImage +CmdCopyBufferToImage2: ProcCmdCopyBufferToImage2 CmdCopyBufferToImage2KHR: ProcCmdCopyBufferToImage2KHR CmdCopyImage: ProcCmdCopyImage +CmdCopyImage2: ProcCmdCopyImage2 CmdCopyImage2KHR: ProcCmdCopyImage2KHR CmdCopyImageToBuffer: ProcCmdCopyImageToBuffer +CmdCopyImageToBuffer2: ProcCmdCopyImageToBuffer2 CmdCopyImageToBuffer2KHR: ProcCmdCopyImageToBuffer2KHR CmdCopyMemoryToAccelerationStructureKHR: ProcCmdCopyMemoryToAccelerationStructureKHR CmdCopyQueryPoolResults: ProcCmdCopyQueryPoolResults @@ -661,6 +714,8 @@ CmdEndQueryIndexedEXT: ProcCmdEndQueryIndexedEXT CmdEndRenderPass: ProcCmdEndRenderPass CmdEndRenderPass2: ProcCmdEndRenderPass2 CmdEndRenderPass2KHR: ProcCmdEndRenderPass2KHR +CmdEndRendering: ProcCmdEndRendering +CmdEndRenderingKHR: ProcCmdEndRenderingKHR CmdEndTransformFeedbackEXT: ProcCmdEndTransformFeedbackEXT CmdExecuteCommands: ProcCmdExecuteCommands CmdExecuteGeneratedCommandsNV: ProcCmdExecuteGeneratedCommandsNV @@ -670,35 +725,46 @@ CmdNextSubpass: ProcCmdNextSubpass CmdNextSubpass2: ProcCmdNextSubpass2 CmdNextSubpass2KHR: ProcCmdNextSubpass2KHR CmdPipelineBarrier: ProcCmdPipelineBarrier +CmdPipelineBarrier2: ProcCmdPipelineBarrier2 CmdPipelineBarrier2KHR: ProcCmdPipelineBarrier2KHR CmdPreprocessGeneratedCommandsNV: ProcCmdPreprocessGeneratedCommandsNV CmdPushConstants: ProcCmdPushConstants CmdPushDescriptorSetKHR: ProcCmdPushDescriptorSetKHR CmdPushDescriptorSetWithTemplateKHR: ProcCmdPushDescriptorSetWithTemplateKHR CmdResetEvent: ProcCmdResetEvent +CmdResetEvent2: ProcCmdResetEvent2 CmdResetEvent2KHR: ProcCmdResetEvent2KHR CmdResetQueryPool: ProcCmdResetQueryPool CmdResolveImage: ProcCmdResolveImage +CmdResolveImage2: ProcCmdResolveImage2 CmdResolveImage2KHR: ProcCmdResolveImage2KHR CmdSetBlendConstants: ProcCmdSetBlendConstants CmdSetCheckpointNV: ProcCmdSetCheckpointNV CmdSetCoarseSampleOrderNV: ProcCmdSetCoarseSampleOrderNV +CmdSetCullMode: ProcCmdSetCullMode CmdSetCullModeEXT: ProcCmdSetCullModeEXT CmdSetDepthBias: ProcCmdSetDepthBias +CmdSetDepthBiasEnable: ProcCmdSetDepthBiasEnable CmdSetDepthBiasEnableEXT: ProcCmdSetDepthBiasEnableEXT CmdSetDepthBounds: ProcCmdSetDepthBounds +CmdSetDepthBoundsTestEnable: ProcCmdSetDepthBoundsTestEnable CmdSetDepthBoundsTestEnableEXT: ProcCmdSetDepthBoundsTestEnableEXT +CmdSetDepthCompareOp: ProcCmdSetDepthCompareOp CmdSetDepthCompareOpEXT: ProcCmdSetDepthCompareOpEXT +CmdSetDepthTestEnable: ProcCmdSetDepthTestEnable CmdSetDepthTestEnableEXT: ProcCmdSetDepthTestEnableEXT +CmdSetDepthWriteEnable: ProcCmdSetDepthWriteEnable CmdSetDepthWriteEnableEXT: ProcCmdSetDepthWriteEnableEXT CmdSetDeviceMask: ProcCmdSetDeviceMask CmdSetDeviceMaskKHR: ProcCmdSetDeviceMaskKHR CmdSetDiscardRectangleEXT: ProcCmdSetDiscardRectangleEXT CmdSetEvent: ProcCmdSetEvent +CmdSetEvent2: ProcCmdSetEvent2 CmdSetEvent2KHR: ProcCmdSetEvent2KHR CmdSetExclusiveScissorNV: ProcCmdSetExclusiveScissorNV CmdSetFragmentShadingRateEnumNV: ProcCmdSetFragmentShadingRateEnumNV CmdSetFragmentShadingRateKHR: ProcCmdSetFragmentShadingRateKHR +CmdSetFrontFace: ProcCmdSetFrontFace CmdSetFrontFaceEXT: ProcCmdSetFrontFaceEXT CmdSetLineStippleEXT: ProcCmdSetLineStippleEXT CmdSetLineWidth: ProcCmdSetLineWidth @@ -707,22 +773,29 @@ CmdSetPatchControlPointsEXT: ProcCmdSetPatchControlPointsEXT CmdSetPerformanceMarkerINTEL: ProcCmdSetPerformanceMarkerINTEL CmdSetPerformanceOverrideINTEL: ProcCmdSetPerformanceOverrideINTEL CmdSetPerformanceStreamMarkerINTEL: ProcCmdSetPerformanceStreamMarkerINTEL +CmdSetPrimitiveRestartEnable: ProcCmdSetPrimitiveRestartEnable CmdSetPrimitiveRestartEnableEXT: ProcCmdSetPrimitiveRestartEnableEXT +CmdSetPrimitiveTopology: ProcCmdSetPrimitiveTopology CmdSetPrimitiveTopologyEXT: ProcCmdSetPrimitiveTopologyEXT +CmdSetRasterizerDiscardEnable: ProcCmdSetRasterizerDiscardEnable CmdSetRasterizerDiscardEnableEXT: ProcCmdSetRasterizerDiscardEnableEXT CmdSetRayTracingPipelineStackSizeKHR: ProcCmdSetRayTracingPipelineStackSizeKHR CmdSetSampleLocationsEXT: ProcCmdSetSampleLocationsEXT CmdSetScissor: ProcCmdSetScissor +CmdSetScissorWithCount: ProcCmdSetScissorWithCount CmdSetScissorWithCountEXT: ProcCmdSetScissorWithCountEXT CmdSetStencilCompareMask: ProcCmdSetStencilCompareMask +CmdSetStencilOp: ProcCmdSetStencilOp CmdSetStencilOpEXT: ProcCmdSetStencilOpEXT CmdSetStencilReference: ProcCmdSetStencilReference +CmdSetStencilTestEnable: ProcCmdSetStencilTestEnable CmdSetStencilTestEnableEXT: ProcCmdSetStencilTestEnableEXT CmdSetStencilWriteMask: ProcCmdSetStencilWriteMask CmdSetVertexInputEXT: ProcCmdSetVertexInputEXT CmdSetViewport: ProcCmdSetViewport CmdSetViewportShadingRatePaletteNV: ProcCmdSetViewportShadingRatePaletteNV CmdSetViewportWScalingNV: ProcCmdSetViewportWScalingNV +CmdSetViewportWithCount: ProcCmdSetViewportWithCount CmdSetViewportWithCountEXT: ProcCmdSetViewportWithCountEXT CmdSubpassShadingHUAWEI: ProcCmdSubpassShadingHUAWEI CmdTraceRaysIndirectKHR: ProcCmdTraceRaysIndirectKHR @@ -730,12 +803,14 @@ CmdTraceRaysKHR: ProcCmdTraceRaysKHR CmdTraceRaysNV: ProcCmdTraceRaysNV CmdUpdateBuffer: ProcCmdUpdateBuffer CmdWaitEvents: ProcCmdWaitEvents +CmdWaitEvents2: ProcCmdWaitEvents2 CmdWaitEvents2KHR: ProcCmdWaitEvents2KHR CmdWriteAccelerationStructuresPropertiesKHR: ProcCmdWriteAccelerationStructuresPropertiesKHR CmdWriteAccelerationStructuresPropertiesNV: ProcCmdWriteAccelerationStructuresPropertiesNV CmdWriteBufferMarker2AMD: ProcCmdWriteBufferMarker2AMD CmdWriteBufferMarkerAMD: ProcCmdWriteBufferMarkerAMD CmdWriteTimestamp: ProcCmdWriteTimestamp +CmdWriteTimestamp2: ProcCmdWriteTimestamp2 CmdWriteTimestamp2KHR: ProcCmdWriteTimestamp2KHR CompileDeferredNV: ProcCompileDeferredNV CopyAccelerationStructureKHR: ProcCopyAccelerationStructureKHR @@ -763,6 +838,7 @@ CreateImageView: ProcCreateImageView CreateIndirectCommandsLayoutNV: ProcCreateIndirectCommandsLayoutNV CreatePipelineCache: ProcCreatePipelineCache CreatePipelineLayout: ProcCreatePipelineLayout +CreatePrivateDataSlot: ProcCreatePrivateDataSlot CreatePrivateDataSlotEXT: ProcCreatePrivateDataSlotEXT CreateQueryPool: ProcCreateQueryPool CreateRayTracingPipelinesKHR: ProcCreateRayTracingPipelinesKHR @@ -803,6 +879,7 @@ DestroyIndirectCommandsLayoutNV: ProcDestroyIndirectCommandsLayo DestroyPipeline: ProcDestroyPipeline DestroyPipelineCache: ProcDestroyPipelineCache DestroyPipelineLayout: ProcDestroyPipelineLayout +DestroyPrivateDataSlot: ProcDestroyPrivateDataSlot DestroyPrivateDataSlotEXT: ProcDestroyPrivateDataSlotEXT DestroyQueryPool: ProcDestroyQueryPool DestroyRenderPass: ProcDestroyRenderPass @@ -835,14 +912,22 @@ GetBufferOpaqueCaptureAddressKHR: ProcGetBufferOpaqueCaptureAddre GetCalibratedTimestampsEXT: ProcGetCalibratedTimestampsEXT GetDeferredOperationMaxConcurrencyKHR: ProcGetDeferredOperationMaxConcurrencyKHR GetDeferredOperationResultKHR: ProcGetDeferredOperationResultKHR +GetDescriptorSetHostMappingVALVE: ProcGetDescriptorSetHostMappingVALVE +GetDescriptorSetLayoutHostMappingInfoVALVE: ProcGetDescriptorSetLayoutHostMappingInfoVALVE GetDescriptorSetLayoutSupport: ProcGetDescriptorSetLayoutSupport GetDescriptorSetLayoutSupportKHR: ProcGetDescriptorSetLayoutSupportKHR GetDeviceAccelerationStructureCompatibilityKHR: ProcGetDeviceAccelerationStructureCompatibilityKHR +GetDeviceBufferMemoryRequirements: ProcGetDeviceBufferMemoryRequirements +GetDeviceBufferMemoryRequirementsKHR: ProcGetDeviceBufferMemoryRequirementsKHR GetDeviceGroupPeerMemoryFeatures: ProcGetDeviceGroupPeerMemoryFeatures GetDeviceGroupPeerMemoryFeaturesKHR: ProcGetDeviceGroupPeerMemoryFeaturesKHR GetDeviceGroupPresentCapabilitiesKHR: ProcGetDeviceGroupPresentCapabilitiesKHR GetDeviceGroupSurfacePresentModes2EXT: ProcGetDeviceGroupSurfacePresentModes2EXT GetDeviceGroupSurfacePresentModesKHR: ProcGetDeviceGroupSurfacePresentModesKHR +GetDeviceImageMemoryRequirements: ProcGetDeviceImageMemoryRequirements +GetDeviceImageMemoryRequirementsKHR: ProcGetDeviceImageMemoryRequirementsKHR +GetDeviceImageSparseMemoryRequirements: ProcGetDeviceImageSparseMemoryRequirements +GetDeviceImageSparseMemoryRequirementsKHR: ProcGetDeviceImageSparseMemoryRequirementsKHR GetDeviceMemoryCommitment: ProcGetDeviceMemoryCommitment GetDeviceMemoryOpaqueCaptureAddress: ProcGetDeviceMemoryOpaqueCaptureAddress GetDeviceMemoryOpaqueCaptureAddressKHR: ProcGetDeviceMemoryOpaqueCaptureAddressKHR @@ -878,6 +963,7 @@ GetPipelineCacheData: ProcGetPipelineCacheData GetPipelineExecutableInternalRepresentationsKHR: ProcGetPipelineExecutableInternalRepresentationsKHR GetPipelineExecutablePropertiesKHR: ProcGetPipelineExecutablePropertiesKHR GetPipelineExecutableStatisticsKHR: ProcGetPipelineExecutableStatisticsKHR +GetPrivateData: ProcGetPrivateData GetPrivateDataEXT: ProcGetPrivateDataEXT GetQueryPoolResults: ProcGetQueryPoolResults GetQueueCheckpointData2NV: ProcGetQueueCheckpointData2NV @@ -913,6 +999,7 @@ QueueInsertDebugUtilsLabelEXT: ProcQueueInsertDebugUtilsLabelE QueuePresentKHR: ProcQueuePresentKHR QueueSetPerformanceConfigurationINTEL: ProcQueueSetPerformanceConfigurationINTEL QueueSubmit: ProcQueueSubmit +QueueSubmit2: ProcQueueSubmit2 QueueSubmit2KHR: ProcQueueSubmit2KHR QueueWaitIdle: ProcQueueWaitIdle RegisterDeviceEventEXT: ProcRegisterDeviceEventEXT @@ -933,6 +1020,7 @@ SetDeviceMemoryPriorityEXT: ProcSetDeviceMemoryPriorityEXT SetEvent: ProcSetEvent SetHdrMetadataEXT: ProcSetHdrMetadataEXT SetLocalDimmingAMD: ProcSetLocalDimmingAMD +SetPrivateData: ProcSetPrivateData SetPrivateDataEXT: ProcSetPrivateDataEXT SignalSemaphore: ProcSignalSemaphore SignalSemaphoreKHR: ProcSignalSemaphoreKHR @@ -1036,6 +1124,7 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&GetPhysicalDeviceSurfacePresentModes2EXT, "vkGetPhysicalDeviceSurfacePresentModes2EXT") set_proc_address(&GetPhysicalDeviceSurfacePresentModesKHR, "vkGetPhysicalDeviceSurfacePresentModesKHR") set_proc_address(&GetPhysicalDeviceSurfaceSupportKHR, "vkGetPhysicalDeviceSurfaceSupportKHR") + set_proc_address(&GetPhysicalDeviceToolProperties, "vkGetPhysicalDeviceToolProperties") set_proc_address(&GetPhysicalDeviceToolPropertiesEXT, "vkGetPhysicalDeviceToolPropertiesEXT") set_proc_address(&GetPhysicalDeviceWin32PresentationSupportKHR, "vkGetPhysicalDeviceWin32PresentationSupportKHR") set_proc_address(&GetWinrtDisplayNV, "vkGetWinrtDisplayNV") @@ -1067,6 +1156,8 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CmdBeginRenderPass, "vkCmdBeginRenderPass") set_proc_address(&CmdBeginRenderPass2, "vkCmdBeginRenderPass2") set_proc_address(&CmdBeginRenderPass2KHR, "vkCmdBeginRenderPass2KHR") + set_proc_address(&CmdBeginRendering, "vkCmdBeginRendering") + set_proc_address(&CmdBeginRenderingKHR, "vkCmdBeginRenderingKHR") set_proc_address(&CmdBeginTransformFeedbackEXT, "vkCmdBeginTransformFeedbackEXT") set_proc_address(&CmdBindDescriptorSets, "vkCmdBindDescriptorSets") set_proc_address(&CmdBindIndexBuffer, "vkCmdBindIndexBuffer") @@ -1076,8 +1167,10 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CmdBindShadingRateImageNV, "vkCmdBindShadingRateImageNV") set_proc_address(&CmdBindTransformFeedbackBuffersEXT, "vkCmdBindTransformFeedbackBuffersEXT") set_proc_address(&CmdBindVertexBuffers, "vkCmdBindVertexBuffers") + set_proc_address(&CmdBindVertexBuffers2, "vkCmdBindVertexBuffers2") set_proc_address(&CmdBindVertexBuffers2EXT, "vkCmdBindVertexBuffers2EXT") set_proc_address(&CmdBlitImage, "vkCmdBlitImage") + set_proc_address(&CmdBlitImage2, "vkCmdBlitImage2") set_proc_address(&CmdBlitImage2KHR, "vkCmdBlitImage2KHR") set_proc_address(&CmdBuildAccelerationStructureNV, "vkCmdBuildAccelerationStructureNV") set_proc_address(&CmdBuildAccelerationStructuresIndirectKHR, "vkCmdBuildAccelerationStructuresIndirectKHR") @@ -1089,12 +1182,16 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CmdCopyAccelerationStructureNV, "vkCmdCopyAccelerationStructureNV") set_proc_address(&CmdCopyAccelerationStructureToMemoryKHR, "vkCmdCopyAccelerationStructureToMemoryKHR") set_proc_address(&CmdCopyBuffer, "vkCmdCopyBuffer") + set_proc_address(&CmdCopyBuffer2, "vkCmdCopyBuffer2") set_proc_address(&CmdCopyBuffer2KHR, "vkCmdCopyBuffer2KHR") set_proc_address(&CmdCopyBufferToImage, "vkCmdCopyBufferToImage") + set_proc_address(&CmdCopyBufferToImage2, "vkCmdCopyBufferToImage2") set_proc_address(&CmdCopyBufferToImage2KHR, "vkCmdCopyBufferToImage2KHR") set_proc_address(&CmdCopyImage, "vkCmdCopyImage") + set_proc_address(&CmdCopyImage2, "vkCmdCopyImage2") set_proc_address(&CmdCopyImage2KHR, "vkCmdCopyImage2KHR") set_proc_address(&CmdCopyImageToBuffer, "vkCmdCopyImageToBuffer") + set_proc_address(&CmdCopyImageToBuffer2, "vkCmdCopyImageToBuffer2") set_proc_address(&CmdCopyImageToBuffer2KHR, "vkCmdCopyImageToBuffer2KHR") set_proc_address(&CmdCopyMemoryToAccelerationStructureKHR, "vkCmdCopyMemoryToAccelerationStructureKHR") set_proc_address(&CmdCopyQueryPoolResults, "vkCmdCopyQueryPoolResults") @@ -1129,6 +1226,8 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CmdEndRenderPass, "vkCmdEndRenderPass") set_proc_address(&CmdEndRenderPass2, "vkCmdEndRenderPass2") set_proc_address(&CmdEndRenderPass2KHR, "vkCmdEndRenderPass2KHR") + set_proc_address(&CmdEndRendering, "vkCmdEndRendering") + set_proc_address(&CmdEndRenderingKHR, "vkCmdEndRenderingKHR") set_proc_address(&CmdEndTransformFeedbackEXT, "vkCmdEndTransformFeedbackEXT") set_proc_address(&CmdExecuteCommands, "vkCmdExecuteCommands") set_proc_address(&CmdExecuteGeneratedCommandsNV, "vkCmdExecuteGeneratedCommandsNV") @@ -1138,35 +1237,46 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CmdNextSubpass2, "vkCmdNextSubpass2") set_proc_address(&CmdNextSubpass2KHR, "vkCmdNextSubpass2KHR") set_proc_address(&CmdPipelineBarrier, "vkCmdPipelineBarrier") + set_proc_address(&CmdPipelineBarrier2, "vkCmdPipelineBarrier2") set_proc_address(&CmdPipelineBarrier2KHR, "vkCmdPipelineBarrier2KHR") set_proc_address(&CmdPreprocessGeneratedCommandsNV, "vkCmdPreprocessGeneratedCommandsNV") set_proc_address(&CmdPushConstants, "vkCmdPushConstants") set_proc_address(&CmdPushDescriptorSetKHR, "vkCmdPushDescriptorSetKHR") set_proc_address(&CmdPushDescriptorSetWithTemplateKHR, "vkCmdPushDescriptorSetWithTemplateKHR") set_proc_address(&CmdResetEvent, "vkCmdResetEvent") + set_proc_address(&CmdResetEvent2, "vkCmdResetEvent2") set_proc_address(&CmdResetEvent2KHR, "vkCmdResetEvent2KHR") set_proc_address(&CmdResetQueryPool, "vkCmdResetQueryPool") set_proc_address(&CmdResolveImage, "vkCmdResolveImage") + set_proc_address(&CmdResolveImage2, "vkCmdResolveImage2") set_proc_address(&CmdResolveImage2KHR, "vkCmdResolveImage2KHR") set_proc_address(&CmdSetBlendConstants, "vkCmdSetBlendConstants") set_proc_address(&CmdSetCheckpointNV, "vkCmdSetCheckpointNV") set_proc_address(&CmdSetCoarseSampleOrderNV, "vkCmdSetCoarseSampleOrderNV") + set_proc_address(&CmdSetCullMode, "vkCmdSetCullMode") set_proc_address(&CmdSetCullModeEXT, "vkCmdSetCullModeEXT") set_proc_address(&CmdSetDepthBias, "vkCmdSetDepthBias") + set_proc_address(&CmdSetDepthBiasEnable, "vkCmdSetDepthBiasEnable") set_proc_address(&CmdSetDepthBiasEnableEXT, "vkCmdSetDepthBiasEnableEXT") set_proc_address(&CmdSetDepthBounds, "vkCmdSetDepthBounds") + set_proc_address(&CmdSetDepthBoundsTestEnable, "vkCmdSetDepthBoundsTestEnable") set_proc_address(&CmdSetDepthBoundsTestEnableEXT, "vkCmdSetDepthBoundsTestEnableEXT") + set_proc_address(&CmdSetDepthCompareOp, "vkCmdSetDepthCompareOp") set_proc_address(&CmdSetDepthCompareOpEXT, "vkCmdSetDepthCompareOpEXT") + set_proc_address(&CmdSetDepthTestEnable, "vkCmdSetDepthTestEnable") set_proc_address(&CmdSetDepthTestEnableEXT, "vkCmdSetDepthTestEnableEXT") + set_proc_address(&CmdSetDepthWriteEnable, "vkCmdSetDepthWriteEnable") set_proc_address(&CmdSetDepthWriteEnableEXT, "vkCmdSetDepthWriteEnableEXT") set_proc_address(&CmdSetDeviceMask, "vkCmdSetDeviceMask") set_proc_address(&CmdSetDeviceMaskKHR, "vkCmdSetDeviceMaskKHR") set_proc_address(&CmdSetDiscardRectangleEXT, "vkCmdSetDiscardRectangleEXT") set_proc_address(&CmdSetEvent, "vkCmdSetEvent") + set_proc_address(&CmdSetEvent2, "vkCmdSetEvent2") set_proc_address(&CmdSetEvent2KHR, "vkCmdSetEvent2KHR") set_proc_address(&CmdSetExclusiveScissorNV, "vkCmdSetExclusiveScissorNV") set_proc_address(&CmdSetFragmentShadingRateEnumNV, "vkCmdSetFragmentShadingRateEnumNV") set_proc_address(&CmdSetFragmentShadingRateKHR, "vkCmdSetFragmentShadingRateKHR") + set_proc_address(&CmdSetFrontFace, "vkCmdSetFrontFace") set_proc_address(&CmdSetFrontFaceEXT, "vkCmdSetFrontFaceEXT") set_proc_address(&CmdSetLineStippleEXT, "vkCmdSetLineStippleEXT") set_proc_address(&CmdSetLineWidth, "vkCmdSetLineWidth") @@ -1175,22 +1285,29 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CmdSetPerformanceMarkerINTEL, "vkCmdSetPerformanceMarkerINTEL") set_proc_address(&CmdSetPerformanceOverrideINTEL, "vkCmdSetPerformanceOverrideINTEL") set_proc_address(&CmdSetPerformanceStreamMarkerINTEL, "vkCmdSetPerformanceStreamMarkerINTEL") + set_proc_address(&CmdSetPrimitiveRestartEnable, "vkCmdSetPrimitiveRestartEnable") set_proc_address(&CmdSetPrimitiveRestartEnableEXT, "vkCmdSetPrimitiveRestartEnableEXT") + set_proc_address(&CmdSetPrimitiveTopology, "vkCmdSetPrimitiveTopology") set_proc_address(&CmdSetPrimitiveTopologyEXT, "vkCmdSetPrimitiveTopologyEXT") + set_proc_address(&CmdSetRasterizerDiscardEnable, "vkCmdSetRasterizerDiscardEnable") set_proc_address(&CmdSetRasterizerDiscardEnableEXT, "vkCmdSetRasterizerDiscardEnableEXT") set_proc_address(&CmdSetRayTracingPipelineStackSizeKHR, "vkCmdSetRayTracingPipelineStackSizeKHR") set_proc_address(&CmdSetSampleLocationsEXT, "vkCmdSetSampleLocationsEXT") set_proc_address(&CmdSetScissor, "vkCmdSetScissor") + set_proc_address(&CmdSetScissorWithCount, "vkCmdSetScissorWithCount") set_proc_address(&CmdSetScissorWithCountEXT, "vkCmdSetScissorWithCountEXT") set_proc_address(&CmdSetStencilCompareMask, "vkCmdSetStencilCompareMask") + set_proc_address(&CmdSetStencilOp, "vkCmdSetStencilOp") set_proc_address(&CmdSetStencilOpEXT, "vkCmdSetStencilOpEXT") set_proc_address(&CmdSetStencilReference, "vkCmdSetStencilReference") + set_proc_address(&CmdSetStencilTestEnable, "vkCmdSetStencilTestEnable") set_proc_address(&CmdSetStencilTestEnableEXT, "vkCmdSetStencilTestEnableEXT") set_proc_address(&CmdSetStencilWriteMask, "vkCmdSetStencilWriteMask") set_proc_address(&CmdSetVertexInputEXT, "vkCmdSetVertexInputEXT") set_proc_address(&CmdSetViewport, "vkCmdSetViewport") set_proc_address(&CmdSetViewportShadingRatePaletteNV, "vkCmdSetViewportShadingRatePaletteNV") set_proc_address(&CmdSetViewportWScalingNV, "vkCmdSetViewportWScalingNV") + set_proc_address(&CmdSetViewportWithCount, "vkCmdSetViewportWithCount") set_proc_address(&CmdSetViewportWithCountEXT, "vkCmdSetViewportWithCountEXT") set_proc_address(&CmdSubpassShadingHUAWEI, "vkCmdSubpassShadingHUAWEI") set_proc_address(&CmdTraceRaysIndirectKHR, "vkCmdTraceRaysIndirectKHR") @@ -1198,12 +1315,14 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CmdTraceRaysNV, "vkCmdTraceRaysNV") set_proc_address(&CmdUpdateBuffer, "vkCmdUpdateBuffer") set_proc_address(&CmdWaitEvents, "vkCmdWaitEvents") + set_proc_address(&CmdWaitEvents2, "vkCmdWaitEvents2") set_proc_address(&CmdWaitEvents2KHR, "vkCmdWaitEvents2KHR") set_proc_address(&CmdWriteAccelerationStructuresPropertiesKHR, "vkCmdWriteAccelerationStructuresPropertiesKHR") set_proc_address(&CmdWriteAccelerationStructuresPropertiesNV, "vkCmdWriteAccelerationStructuresPropertiesNV") set_proc_address(&CmdWriteBufferMarker2AMD, "vkCmdWriteBufferMarker2AMD") set_proc_address(&CmdWriteBufferMarkerAMD, "vkCmdWriteBufferMarkerAMD") set_proc_address(&CmdWriteTimestamp, "vkCmdWriteTimestamp") + set_proc_address(&CmdWriteTimestamp2, "vkCmdWriteTimestamp2") set_proc_address(&CmdWriteTimestamp2KHR, "vkCmdWriteTimestamp2KHR") set_proc_address(&CompileDeferredNV, "vkCompileDeferredNV") set_proc_address(&CopyAccelerationStructureKHR, "vkCopyAccelerationStructureKHR") @@ -1231,6 +1350,7 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&CreateIndirectCommandsLayoutNV, "vkCreateIndirectCommandsLayoutNV") set_proc_address(&CreatePipelineCache, "vkCreatePipelineCache") set_proc_address(&CreatePipelineLayout, "vkCreatePipelineLayout") + set_proc_address(&CreatePrivateDataSlot, "vkCreatePrivateDataSlot") set_proc_address(&CreatePrivateDataSlotEXT, "vkCreatePrivateDataSlotEXT") set_proc_address(&CreateQueryPool, "vkCreateQueryPool") set_proc_address(&CreateRayTracingPipelinesKHR, "vkCreateRayTracingPipelinesKHR") @@ -1271,6 +1391,7 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&DestroyPipeline, "vkDestroyPipeline") set_proc_address(&DestroyPipelineCache, "vkDestroyPipelineCache") set_proc_address(&DestroyPipelineLayout, "vkDestroyPipelineLayout") + set_proc_address(&DestroyPrivateDataSlot, "vkDestroyPrivateDataSlot") set_proc_address(&DestroyPrivateDataSlotEXT, "vkDestroyPrivateDataSlotEXT") set_proc_address(&DestroyQueryPool, "vkDestroyQueryPool") set_proc_address(&DestroyRenderPass, "vkDestroyRenderPass") @@ -1303,14 +1424,22 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&GetCalibratedTimestampsEXT, "vkGetCalibratedTimestampsEXT") set_proc_address(&GetDeferredOperationMaxConcurrencyKHR, "vkGetDeferredOperationMaxConcurrencyKHR") set_proc_address(&GetDeferredOperationResultKHR, "vkGetDeferredOperationResultKHR") + set_proc_address(&GetDescriptorSetHostMappingVALVE, "vkGetDescriptorSetHostMappingVALVE") + set_proc_address(&GetDescriptorSetLayoutHostMappingInfoVALVE, "vkGetDescriptorSetLayoutHostMappingInfoVALVE") set_proc_address(&GetDescriptorSetLayoutSupport, "vkGetDescriptorSetLayoutSupport") set_proc_address(&GetDescriptorSetLayoutSupportKHR, "vkGetDescriptorSetLayoutSupportKHR") set_proc_address(&GetDeviceAccelerationStructureCompatibilityKHR, "vkGetDeviceAccelerationStructureCompatibilityKHR") + set_proc_address(&GetDeviceBufferMemoryRequirements, "vkGetDeviceBufferMemoryRequirements") + set_proc_address(&GetDeviceBufferMemoryRequirementsKHR, "vkGetDeviceBufferMemoryRequirementsKHR") set_proc_address(&GetDeviceGroupPeerMemoryFeatures, "vkGetDeviceGroupPeerMemoryFeatures") set_proc_address(&GetDeviceGroupPeerMemoryFeaturesKHR, "vkGetDeviceGroupPeerMemoryFeaturesKHR") set_proc_address(&GetDeviceGroupPresentCapabilitiesKHR, "vkGetDeviceGroupPresentCapabilitiesKHR") set_proc_address(&GetDeviceGroupSurfacePresentModes2EXT, "vkGetDeviceGroupSurfacePresentModes2EXT") set_proc_address(&GetDeviceGroupSurfacePresentModesKHR, "vkGetDeviceGroupSurfacePresentModesKHR") + set_proc_address(&GetDeviceImageMemoryRequirements, "vkGetDeviceImageMemoryRequirements") + set_proc_address(&GetDeviceImageMemoryRequirementsKHR, "vkGetDeviceImageMemoryRequirementsKHR") + set_proc_address(&GetDeviceImageSparseMemoryRequirements, "vkGetDeviceImageSparseMemoryRequirements") + set_proc_address(&GetDeviceImageSparseMemoryRequirementsKHR, "vkGetDeviceImageSparseMemoryRequirementsKHR") set_proc_address(&GetDeviceMemoryCommitment, "vkGetDeviceMemoryCommitment") set_proc_address(&GetDeviceMemoryOpaqueCaptureAddress, "vkGetDeviceMemoryOpaqueCaptureAddress") set_proc_address(&GetDeviceMemoryOpaqueCaptureAddressKHR, "vkGetDeviceMemoryOpaqueCaptureAddressKHR") @@ -1346,6 +1475,7 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&GetPipelineExecutableInternalRepresentationsKHR, "vkGetPipelineExecutableInternalRepresentationsKHR") set_proc_address(&GetPipelineExecutablePropertiesKHR, "vkGetPipelineExecutablePropertiesKHR") set_proc_address(&GetPipelineExecutableStatisticsKHR, "vkGetPipelineExecutableStatisticsKHR") + set_proc_address(&GetPrivateData, "vkGetPrivateData") set_proc_address(&GetPrivateDataEXT, "vkGetPrivateDataEXT") set_proc_address(&GetQueryPoolResults, "vkGetQueryPoolResults") set_proc_address(&GetQueueCheckpointData2NV, "vkGetQueueCheckpointData2NV") @@ -1381,6 +1511,7 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&QueuePresentKHR, "vkQueuePresentKHR") set_proc_address(&QueueSetPerformanceConfigurationINTEL, "vkQueueSetPerformanceConfigurationINTEL") set_proc_address(&QueueSubmit, "vkQueueSubmit") + set_proc_address(&QueueSubmit2, "vkQueueSubmit2") set_proc_address(&QueueSubmit2KHR, "vkQueueSubmit2KHR") set_proc_address(&QueueWaitIdle, "vkQueueWaitIdle") set_proc_address(&RegisterDeviceEventEXT, "vkRegisterDeviceEventEXT") @@ -1401,6 +1532,7 @@ load_proc_addresses_custom :: proc(set_proc_address: SetProcAddressType) { set_proc_address(&SetEvent, "vkSetEvent") set_proc_address(&SetHdrMetadataEXT, "vkSetHdrMetadataEXT") set_proc_address(&SetLocalDimmingAMD, "vkSetLocalDimmingAMD") + set_proc_address(&SetPrivateData, "vkSetPrivateData") set_proc_address(&SetPrivateDataEXT, "vkSetPrivateDataEXT") set_proc_address(&SignalSemaphore, "vkSignalSemaphore") set_proc_address(&SignalSemaphoreKHR, "vkSignalSemaphoreKHR") @@ -1445,6 +1577,8 @@ Device_VTable :: struct { CmdBeginRenderPass: ProcCmdBeginRenderPass, CmdBeginRenderPass2: ProcCmdBeginRenderPass2, CmdBeginRenderPass2KHR: ProcCmdBeginRenderPass2KHR, + CmdBeginRendering: ProcCmdBeginRendering, + CmdBeginRenderingKHR: ProcCmdBeginRenderingKHR, CmdBeginTransformFeedbackEXT: ProcCmdBeginTransformFeedbackEXT, CmdBindDescriptorSets: ProcCmdBindDescriptorSets, CmdBindIndexBuffer: ProcCmdBindIndexBuffer, @@ -1454,8 +1588,10 @@ Device_VTable :: struct { CmdBindShadingRateImageNV: ProcCmdBindShadingRateImageNV, CmdBindTransformFeedbackBuffersEXT: ProcCmdBindTransformFeedbackBuffersEXT, CmdBindVertexBuffers: ProcCmdBindVertexBuffers, + CmdBindVertexBuffers2: ProcCmdBindVertexBuffers2, CmdBindVertexBuffers2EXT: ProcCmdBindVertexBuffers2EXT, CmdBlitImage: ProcCmdBlitImage, + CmdBlitImage2: ProcCmdBlitImage2, CmdBlitImage2KHR: ProcCmdBlitImage2KHR, CmdBuildAccelerationStructureNV: ProcCmdBuildAccelerationStructureNV, CmdBuildAccelerationStructuresIndirectKHR: ProcCmdBuildAccelerationStructuresIndirectKHR, @@ -1467,12 +1603,16 @@ Device_VTable :: struct { CmdCopyAccelerationStructureNV: ProcCmdCopyAccelerationStructureNV, CmdCopyAccelerationStructureToMemoryKHR: ProcCmdCopyAccelerationStructureToMemoryKHR, CmdCopyBuffer: ProcCmdCopyBuffer, + CmdCopyBuffer2: ProcCmdCopyBuffer2, CmdCopyBuffer2KHR: ProcCmdCopyBuffer2KHR, CmdCopyBufferToImage: ProcCmdCopyBufferToImage, + CmdCopyBufferToImage2: ProcCmdCopyBufferToImage2, CmdCopyBufferToImage2KHR: ProcCmdCopyBufferToImage2KHR, CmdCopyImage: ProcCmdCopyImage, + CmdCopyImage2: ProcCmdCopyImage2, CmdCopyImage2KHR: ProcCmdCopyImage2KHR, CmdCopyImageToBuffer: ProcCmdCopyImageToBuffer, + CmdCopyImageToBuffer2: ProcCmdCopyImageToBuffer2, CmdCopyImageToBuffer2KHR: ProcCmdCopyImageToBuffer2KHR, CmdCopyMemoryToAccelerationStructureKHR: ProcCmdCopyMemoryToAccelerationStructureKHR, CmdCopyQueryPoolResults: ProcCmdCopyQueryPoolResults, @@ -1507,6 +1647,8 @@ Device_VTable :: struct { CmdEndRenderPass: ProcCmdEndRenderPass, CmdEndRenderPass2: ProcCmdEndRenderPass2, CmdEndRenderPass2KHR: ProcCmdEndRenderPass2KHR, + CmdEndRendering: ProcCmdEndRendering, + CmdEndRenderingKHR: ProcCmdEndRenderingKHR, CmdEndTransformFeedbackEXT: ProcCmdEndTransformFeedbackEXT, CmdExecuteCommands: ProcCmdExecuteCommands, CmdExecuteGeneratedCommandsNV: ProcCmdExecuteGeneratedCommandsNV, @@ -1516,35 +1658,46 @@ Device_VTable :: struct { CmdNextSubpass2: ProcCmdNextSubpass2, CmdNextSubpass2KHR: ProcCmdNextSubpass2KHR, CmdPipelineBarrier: ProcCmdPipelineBarrier, + CmdPipelineBarrier2: ProcCmdPipelineBarrier2, CmdPipelineBarrier2KHR: ProcCmdPipelineBarrier2KHR, CmdPreprocessGeneratedCommandsNV: ProcCmdPreprocessGeneratedCommandsNV, CmdPushConstants: ProcCmdPushConstants, CmdPushDescriptorSetKHR: ProcCmdPushDescriptorSetKHR, CmdPushDescriptorSetWithTemplateKHR: ProcCmdPushDescriptorSetWithTemplateKHR, CmdResetEvent: ProcCmdResetEvent, + CmdResetEvent2: ProcCmdResetEvent2, CmdResetEvent2KHR: ProcCmdResetEvent2KHR, CmdResetQueryPool: ProcCmdResetQueryPool, CmdResolveImage: ProcCmdResolveImage, + CmdResolveImage2: ProcCmdResolveImage2, CmdResolveImage2KHR: ProcCmdResolveImage2KHR, CmdSetBlendConstants: ProcCmdSetBlendConstants, CmdSetCheckpointNV: ProcCmdSetCheckpointNV, CmdSetCoarseSampleOrderNV: ProcCmdSetCoarseSampleOrderNV, + CmdSetCullMode: ProcCmdSetCullMode, CmdSetCullModeEXT: ProcCmdSetCullModeEXT, CmdSetDepthBias: ProcCmdSetDepthBias, + CmdSetDepthBiasEnable: ProcCmdSetDepthBiasEnable, CmdSetDepthBiasEnableEXT: ProcCmdSetDepthBiasEnableEXT, CmdSetDepthBounds: ProcCmdSetDepthBounds, + CmdSetDepthBoundsTestEnable: ProcCmdSetDepthBoundsTestEnable, CmdSetDepthBoundsTestEnableEXT: ProcCmdSetDepthBoundsTestEnableEXT, + CmdSetDepthCompareOp: ProcCmdSetDepthCompareOp, CmdSetDepthCompareOpEXT: ProcCmdSetDepthCompareOpEXT, + CmdSetDepthTestEnable: ProcCmdSetDepthTestEnable, CmdSetDepthTestEnableEXT: ProcCmdSetDepthTestEnableEXT, + CmdSetDepthWriteEnable: ProcCmdSetDepthWriteEnable, CmdSetDepthWriteEnableEXT: ProcCmdSetDepthWriteEnableEXT, CmdSetDeviceMask: ProcCmdSetDeviceMask, CmdSetDeviceMaskKHR: ProcCmdSetDeviceMaskKHR, CmdSetDiscardRectangleEXT: ProcCmdSetDiscardRectangleEXT, CmdSetEvent: ProcCmdSetEvent, + CmdSetEvent2: ProcCmdSetEvent2, CmdSetEvent2KHR: ProcCmdSetEvent2KHR, CmdSetExclusiveScissorNV: ProcCmdSetExclusiveScissorNV, CmdSetFragmentShadingRateEnumNV: ProcCmdSetFragmentShadingRateEnumNV, CmdSetFragmentShadingRateKHR: ProcCmdSetFragmentShadingRateKHR, + CmdSetFrontFace: ProcCmdSetFrontFace, CmdSetFrontFaceEXT: ProcCmdSetFrontFaceEXT, CmdSetLineStippleEXT: ProcCmdSetLineStippleEXT, CmdSetLineWidth: ProcCmdSetLineWidth, @@ -1553,22 +1706,29 @@ Device_VTable :: struct { CmdSetPerformanceMarkerINTEL: ProcCmdSetPerformanceMarkerINTEL, CmdSetPerformanceOverrideINTEL: ProcCmdSetPerformanceOverrideINTEL, CmdSetPerformanceStreamMarkerINTEL: ProcCmdSetPerformanceStreamMarkerINTEL, + CmdSetPrimitiveRestartEnable: ProcCmdSetPrimitiveRestartEnable, CmdSetPrimitiveRestartEnableEXT: ProcCmdSetPrimitiveRestartEnableEXT, + CmdSetPrimitiveTopology: ProcCmdSetPrimitiveTopology, CmdSetPrimitiveTopologyEXT: ProcCmdSetPrimitiveTopologyEXT, + CmdSetRasterizerDiscardEnable: ProcCmdSetRasterizerDiscardEnable, CmdSetRasterizerDiscardEnableEXT: ProcCmdSetRasterizerDiscardEnableEXT, CmdSetRayTracingPipelineStackSizeKHR: ProcCmdSetRayTracingPipelineStackSizeKHR, CmdSetSampleLocationsEXT: ProcCmdSetSampleLocationsEXT, CmdSetScissor: ProcCmdSetScissor, + CmdSetScissorWithCount: ProcCmdSetScissorWithCount, CmdSetScissorWithCountEXT: ProcCmdSetScissorWithCountEXT, CmdSetStencilCompareMask: ProcCmdSetStencilCompareMask, + CmdSetStencilOp: ProcCmdSetStencilOp, CmdSetStencilOpEXT: ProcCmdSetStencilOpEXT, CmdSetStencilReference: ProcCmdSetStencilReference, + CmdSetStencilTestEnable: ProcCmdSetStencilTestEnable, CmdSetStencilTestEnableEXT: ProcCmdSetStencilTestEnableEXT, CmdSetStencilWriteMask: ProcCmdSetStencilWriteMask, CmdSetVertexInputEXT: ProcCmdSetVertexInputEXT, CmdSetViewport: ProcCmdSetViewport, CmdSetViewportShadingRatePaletteNV: ProcCmdSetViewportShadingRatePaletteNV, CmdSetViewportWScalingNV: ProcCmdSetViewportWScalingNV, + CmdSetViewportWithCount: ProcCmdSetViewportWithCount, CmdSetViewportWithCountEXT: ProcCmdSetViewportWithCountEXT, CmdSubpassShadingHUAWEI: ProcCmdSubpassShadingHUAWEI, CmdTraceRaysIndirectKHR: ProcCmdTraceRaysIndirectKHR, @@ -1576,12 +1736,14 @@ Device_VTable :: struct { CmdTraceRaysNV: ProcCmdTraceRaysNV, CmdUpdateBuffer: ProcCmdUpdateBuffer, CmdWaitEvents: ProcCmdWaitEvents, + CmdWaitEvents2: ProcCmdWaitEvents2, CmdWaitEvents2KHR: ProcCmdWaitEvents2KHR, CmdWriteAccelerationStructuresPropertiesKHR: ProcCmdWriteAccelerationStructuresPropertiesKHR, CmdWriteAccelerationStructuresPropertiesNV: ProcCmdWriteAccelerationStructuresPropertiesNV, CmdWriteBufferMarker2AMD: ProcCmdWriteBufferMarker2AMD, CmdWriteBufferMarkerAMD: ProcCmdWriteBufferMarkerAMD, CmdWriteTimestamp: ProcCmdWriteTimestamp, + CmdWriteTimestamp2: ProcCmdWriteTimestamp2, CmdWriteTimestamp2KHR: ProcCmdWriteTimestamp2KHR, CompileDeferredNV: ProcCompileDeferredNV, CopyAccelerationStructureKHR: ProcCopyAccelerationStructureKHR, @@ -1609,6 +1771,7 @@ Device_VTable :: struct { CreateIndirectCommandsLayoutNV: ProcCreateIndirectCommandsLayoutNV, CreatePipelineCache: ProcCreatePipelineCache, CreatePipelineLayout: ProcCreatePipelineLayout, + CreatePrivateDataSlot: ProcCreatePrivateDataSlot, CreatePrivateDataSlotEXT: ProcCreatePrivateDataSlotEXT, CreateQueryPool: ProcCreateQueryPool, CreateRayTracingPipelinesKHR: ProcCreateRayTracingPipelinesKHR, @@ -1649,6 +1812,7 @@ Device_VTable :: struct { DestroyPipeline: ProcDestroyPipeline, DestroyPipelineCache: ProcDestroyPipelineCache, DestroyPipelineLayout: ProcDestroyPipelineLayout, + DestroyPrivateDataSlot: ProcDestroyPrivateDataSlot, DestroyPrivateDataSlotEXT: ProcDestroyPrivateDataSlotEXT, DestroyQueryPool: ProcDestroyQueryPool, DestroyRenderPass: ProcDestroyRenderPass, @@ -1681,14 +1845,22 @@ Device_VTable :: struct { GetCalibratedTimestampsEXT: ProcGetCalibratedTimestampsEXT, GetDeferredOperationMaxConcurrencyKHR: ProcGetDeferredOperationMaxConcurrencyKHR, GetDeferredOperationResultKHR: ProcGetDeferredOperationResultKHR, + GetDescriptorSetHostMappingVALVE: ProcGetDescriptorSetHostMappingVALVE, + GetDescriptorSetLayoutHostMappingInfoVALVE: ProcGetDescriptorSetLayoutHostMappingInfoVALVE, GetDescriptorSetLayoutSupport: ProcGetDescriptorSetLayoutSupport, GetDescriptorSetLayoutSupportKHR: ProcGetDescriptorSetLayoutSupportKHR, GetDeviceAccelerationStructureCompatibilityKHR: ProcGetDeviceAccelerationStructureCompatibilityKHR, + GetDeviceBufferMemoryRequirements: ProcGetDeviceBufferMemoryRequirements, + GetDeviceBufferMemoryRequirementsKHR: ProcGetDeviceBufferMemoryRequirementsKHR, GetDeviceGroupPeerMemoryFeatures: ProcGetDeviceGroupPeerMemoryFeatures, GetDeviceGroupPeerMemoryFeaturesKHR: ProcGetDeviceGroupPeerMemoryFeaturesKHR, GetDeviceGroupPresentCapabilitiesKHR: ProcGetDeviceGroupPresentCapabilitiesKHR, GetDeviceGroupSurfacePresentModes2EXT: ProcGetDeviceGroupSurfacePresentModes2EXT, GetDeviceGroupSurfacePresentModesKHR: ProcGetDeviceGroupSurfacePresentModesKHR, + GetDeviceImageMemoryRequirements: ProcGetDeviceImageMemoryRequirements, + GetDeviceImageMemoryRequirementsKHR: ProcGetDeviceImageMemoryRequirementsKHR, + GetDeviceImageSparseMemoryRequirements: ProcGetDeviceImageSparseMemoryRequirements, + GetDeviceImageSparseMemoryRequirementsKHR: ProcGetDeviceImageSparseMemoryRequirementsKHR, GetDeviceMemoryCommitment: ProcGetDeviceMemoryCommitment, GetDeviceMemoryOpaqueCaptureAddress: ProcGetDeviceMemoryOpaqueCaptureAddress, GetDeviceMemoryOpaqueCaptureAddressKHR: ProcGetDeviceMemoryOpaqueCaptureAddressKHR, @@ -1724,6 +1896,7 @@ Device_VTable :: struct { GetPipelineExecutableInternalRepresentationsKHR: ProcGetPipelineExecutableInternalRepresentationsKHR, GetPipelineExecutablePropertiesKHR: ProcGetPipelineExecutablePropertiesKHR, GetPipelineExecutableStatisticsKHR: ProcGetPipelineExecutableStatisticsKHR, + GetPrivateData: ProcGetPrivateData, GetPrivateDataEXT: ProcGetPrivateDataEXT, GetQueryPoolResults: ProcGetQueryPoolResults, GetQueueCheckpointData2NV: ProcGetQueueCheckpointData2NV, @@ -1759,6 +1932,7 @@ Device_VTable :: struct { QueuePresentKHR: ProcQueuePresentKHR, QueueSetPerformanceConfigurationINTEL: ProcQueueSetPerformanceConfigurationINTEL, QueueSubmit: ProcQueueSubmit, + QueueSubmit2: ProcQueueSubmit2, QueueSubmit2KHR: ProcQueueSubmit2KHR, QueueWaitIdle: ProcQueueWaitIdle, RegisterDeviceEventEXT: ProcRegisterDeviceEventEXT, @@ -1779,6 +1953,7 @@ Device_VTable :: struct { SetEvent: ProcSetEvent, SetHdrMetadataEXT: ProcSetHdrMetadataEXT, SetLocalDimmingAMD: ProcSetLocalDimmingAMD, + SetPrivateData: ProcSetPrivateData, SetPrivateDataEXT: ProcSetPrivateDataEXT, SignalSemaphore: ProcSignalSemaphore, SignalSemaphoreKHR: ProcSignalSemaphoreKHR, @@ -1821,6 +1996,8 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CmdBeginRenderPass = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderPass") vtable.CmdBeginRenderPass2 = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderPass2") vtable.CmdBeginRenderPass2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderPass2KHR") + vtable.CmdBeginRendering = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRendering") + vtable.CmdBeginRenderingKHR = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderingKHR") vtable.CmdBeginTransformFeedbackEXT = auto_cast GetDeviceProcAddr(device, "vkCmdBeginTransformFeedbackEXT") vtable.CmdBindDescriptorSets = auto_cast GetDeviceProcAddr(device, "vkCmdBindDescriptorSets") vtable.CmdBindIndexBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdBindIndexBuffer") @@ -1830,8 +2007,10 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CmdBindShadingRateImageNV = auto_cast GetDeviceProcAddr(device, "vkCmdBindShadingRateImageNV") vtable.CmdBindTransformFeedbackBuffersEXT = auto_cast GetDeviceProcAddr(device, "vkCmdBindTransformFeedbackBuffersEXT") vtable.CmdBindVertexBuffers = auto_cast GetDeviceProcAddr(device, "vkCmdBindVertexBuffers") + vtable.CmdBindVertexBuffers2 = auto_cast GetDeviceProcAddr(device, "vkCmdBindVertexBuffers2") vtable.CmdBindVertexBuffers2EXT = auto_cast GetDeviceProcAddr(device, "vkCmdBindVertexBuffers2EXT") vtable.CmdBlitImage = auto_cast GetDeviceProcAddr(device, "vkCmdBlitImage") + vtable.CmdBlitImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdBlitImage2") vtable.CmdBlitImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdBlitImage2KHR") vtable.CmdBuildAccelerationStructureNV = auto_cast GetDeviceProcAddr(device, "vkCmdBuildAccelerationStructureNV") vtable.CmdBuildAccelerationStructuresIndirectKHR = auto_cast GetDeviceProcAddr(device, "vkCmdBuildAccelerationStructuresIndirectKHR") @@ -1843,12 +2022,16 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CmdCopyAccelerationStructureNV = auto_cast GetDeviceProcAddr(device, "vkCmdCopyAccelerationStructureNV") vtable.CmdCopyAccelerationStructureToMemoryKHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyAccelerationStructureToMemoryKHR") vtable.CmdCopyBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBuffer") + vtable.CmdCopyBuffer2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBuffer2") vtable.CmdCopyBuffer2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBuffer2KHR") vtable.CmdCopyBufferToImage = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBufferToImage") + vtable.CmdCopyBufferToImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBufferToImage2") vtable.CmdCopyBufferToImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBufferToImage2KHR") vtable.CmdCopyImage = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImage") + vtable.CmdCopyImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImage2") vtable.CmdCopyImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImage2KHR") vtable.CmdCopyImageToBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImageToBuffer") + vtable.CmdCopyImageToBuffer2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImageToBuffer2") vtable.CmdCopyImageToBuffer2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImageToBuffer2KHR") vtable.CmdCopyMemoryToAccelerationStructureKHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyMemoryToAccelerationStructureKHR") vtable.CmdCopyQueryPoolResults = auto_cast GetDeviceProcAddr(device, "vkCmdCopyQueryPoolResults") @@ -1883,6 +2066,8 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CmdEndRenderPass = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderPass") vtable.CmdEndRenderPass2 = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderPass2") vtable.CmdEndRenderPass2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderPass2KHR") + vtable.CmdEndRendering = auto_cast GetDeviceProcAddr(device, "vkCmdEndRendering") + vtable.CmdEndRenderingKHR = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderingKHR") vtable.CmdEndTransformFeedbackEXT = auto_cast GetDeviceProcAddr(device, "vkCmdEndTransformFeedbackEXT") vtable.CmdExecuteCommands = auto_cast GetDeviceProcAddr(device, "vkCmdExecuteCommands") vtable.CmdExecuteGeneratedCommandsNV = auto_cast GetDeviceProcAddr(device, "vkCmdExecuteGeneratedCommandsNV") @@ -1892,35 +2077,46 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CmdNextSubpass2 = auto_cast GetDeviceProcAddr(device, "vkCmdNextSubpass2") vtable.CmdNextSubpass2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdNextSubpass2KHR") vtable.CmdPipelineBarrier = auto_cast GetDeviceProcAddr(device, "vkCmdPipelineBarrier") + vtable.CmdPipelineBarrier2 = auto_cast GetDeviceProcAddr(device, "vkCmdPipelineBarrier2") vtable.CmdPipelineBarrier2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdPipelineBarrier2KHR") vtable.CmdPreprocessGeneratedCommandsNV = auto_cast GetDeviceProcAddr(device, "vkCmdPreprocessGeneratedCommandsNV") vtable.CmdPushConstants = auto_cast GetDeviceProcAddr(device, "vkCmdPushConstants") vtable.CmdPushDescriptorSetKHR = auto_cast GetDeviceProcAddr(device, "vkCmdPushDescriptorSetKHR") vtable.CmdPushDescriptorSetWithTemplateKHR = auto_cast GetDeviceProcAddr(device, "vkCmdPushDescriptorSetWithTemplateKHR") vtable.CmdResetEvent = auto_cast GetDeviceProcAddr(device, "vkCmdResetEvent") + vtable.CmdResetEvent2 = auto_cast GetDeviceProcAddr(device, "vkCmdResetEvent2") vtable.CmdResetEvent2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdResetEvent2KHR") vtable.CmdResetQueryPool = auto_cast GetDeviceProcAddr(device, "vkCmdResetQueryPool") vtable.CmdResolveImage = auto_cast GetDeviceProcAddr(device, "vkCmdResolveImage") + vtable.CmdResolveImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdResolveImage2") vtable.CmdResolveImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdResolveImage2KHR") vtable.CmdSetBlendConstants = auto_cast GetDeviceProcAddr(device, "vkCmdSetBlendConstants") vtable.CmdSetCheckpointNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetCheckpointNV") vtable.CmdSetCoarseSampleOrderNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetCoarseSampleOrderNV") + vtable.CmdSetCullMode = auto_cast GetDeviceProcAddr(device, "vkCmdSetCullMode") vtable.CmdSetCullModeEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetCullModeEXT") vtable.CmdSetDepthBias = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBias") + vtable.CmdSetDepthBiasEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBiasEnable") vtable.CmdSetDepthBiasEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBiasEnableEXT") vtable.CmdSetDepthBounds = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBounds") + vtable.CmdSetDepthBoundsTestEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBoundsTestEnable") vtable.CmdSetDepthBoundsTestEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBoundsTestEnableEXT") + vtable.CmdSetDepthCompareOp = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthCompareOp") vtable.CmdSetDepthCompareOpEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthCompareOpEXT") + vtable.CmdSetDepthTestEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthTestEnable") vtable.CmdSetDepthTestEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthTestEnableEXT") + vtable.CmdSetDepthWriteEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthWriteEnable") vtable.CmdSetDepthWriteEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthWriteEnableEXT") vtable.CmdSetDeviceMask = auto_cast GetDeviceProcAddr(device, "vkCmdSetDeviceMask") vtable.CmdSetDeviceMaskKHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetDeviceMaskKHR") vtable.CmdSetDiscardRectangleEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDiscardRectangleEXT") vtable.CmdSetEvent = auto_cast GetDeviceProcAddr(device, "vkCmdSetEvent") + vtable.CmdSetEvent2 = auto_cast GetDeviceProcAddr(device, "vkCmdSetEvent2") vtable.CmdSetEvent2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetEvent2KHR") vtable.CmdSetExclusiveScissorNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetExclusiveScissorNV") vtable.CmdSetFragmentShadingRateEnumNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetFragmentShadingRateEnumNV") vtable.CmdSetFragmentShadingRateKHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetFragmentShadingRateKHR") + vtable.CmdSetFrontFace = auto_cast GetDeviceProcAddr(device, "vkCmdSetFrontFace") vtable.CmdSetFrontFaceEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetFrontFaceEXT") vtable.CmdSetLineStippleEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetLineStippleEXT") vtable.CmdSetLineWidth = auto_cast GetDeviceProcAddr(device, "vkCmdSetLineWidth") @@ -1929,22 +2125,29 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CmdSetPerformanceMarkerINTEL = auto_cast GetDeviceProcAddr(device, "vkCmdSetPerformanceMarkerINTEL") vtable.CmdSetPerformanceOverrideINTEL = auto_cast GetDeviceProcAddr(device, "vkCmdSetPerformanceOverrideINTEL") vtable.CmdSetPerformanceStreamMarkerINTEL = auto_cast GetDeviceProcAddr(device, "vkCmdSetPerformanceStreamMarkerINTEL") + vtable.CmdSetPrimitiveRestartEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveRestartEnable") vtable.CmdSetPrimitiveRestartEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveRestartEnableEXT") + vtable.CmdSetPrimitiveTopology = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveTopology") vtable.CmdSetPrimitiveTopologyEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveTopologyEXT") + vtable.CmdSetRasterizerDiscardEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetRasterizerDiscardEnable") vtable.CmdSetRasterizerDiscardEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetRasterizerDiscardEnableEXT") vtable.CmdSetRayTracingPipelineStackSizeKHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetRayTracingPipelineStackSizeKHR") vtable.CmdSetSampleLocationsEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetSampleLocationsEXT") vtable.CmdSetScissor = auto_cast GetDeviceProcAddr(device, "vkCmdSetScissor") + vtable.CmdSetScissorWithCount = auto_cast GetDeviceProcAddr(device, "vkCmdSetScissorWithCount") vtable.CmdSetScissorWithCountEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetScissorWithCountEXT") vtable.CmdSetStencilCompareMask = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilCompareMask") + vtable.CmdSetStencilOp = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilOp") vtable.CmdSetStencilOpEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilOpEXT") vtable.CmdSetStencilReference = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilReference") + vtable.CmdSetStencilTestEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilTestEnable") vtable.CmdSetStencilTestEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilTestEnableEXT") vtable.CmdSetStencilWriteMask = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilWriteMask") vtable.CmdSetVertexInputEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetVertexInputEXT") vtable.CmdSetViewport = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewport") vtable.CmdSetViewportShadingRatePaletteNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportShadingRatePaletteNV") vtable.CmdSetViewportWScalingNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportWScalingNV") + vtable.CmdSetViewportWithCount = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportWithCount") vtable.CmdSetViewportWithCountEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportWithCountEXT") vtable.CmdSubpassShadingHUAWEI = auto_cast GetDeviceProcAddr(device, "vkCmdSubpassShadingHUAWEI") vtable.CmdTraceRaysIndirectKHR = auto_cast GetDeviceProcAddr(device, "vkCmdTraceRaysIndirectKHR") @@ -1952,12 +2155,14 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CmdTraceRaysNV = auto_cast GetDeviceProcAddr(device, "vkCmdTraceRaysNV") vtable.CmdUpdateBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdUpdateBuffer") vtable.CmdWaitEvents = auto_cast GetDeviceProcAddr(device, "vkCmdWaitEvents") + vtable.CmdWaitEvents2 = auto_cast GetDeviceProcAddr(device, "vkCmdWaitEvents2") vtable.CmdWaitEvents2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdWaitEvents2KHR") vtable.CmdWriteAccelerationStructuresPropertiesKHR = auto_cast GetDeviceProcAddr(device, "vkCmdWriteAccelerationStructuresPropertiesKHR") vtable.CmdWriteAccelerationStructuresPropertiesNV = auto_cast GetDeviceProcAddr(device, "vkCmdWriteAccelerationStructuresPropertiesNV") vtable.CmdWriteBufferMarker2AMD = auto_cast GetDeviceProcAddr(device, "vkCmdWriteBufferMarker2AMD") vtable.CmdWriteBufferMarkerAMD = auto_cast GetDeviceProcAddr(device, "vkCmdWriteBufferMarkerAMD") vtable.CmdWriteTimestamp = auto_cast GetDeviceProcAddr(device, "vkCmdWriteTimestamp") + vtable.CmdWriteTimestamp2 = auto_cast GetDeviceProcAddr(device, "vkCmdWriteTimestamp2") vtable.CmdWriteTimestamp2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdWriteTimestamp2KHR") vtable.CompileDeferredNV = auto_cast GetDeviceProcAddr(device, "vkCompileDeferredNV") vtable.CopyAccelerationStructureKHR = auto_cast GetDeviceProcAddr(device, "vkCopyAccelerationStructureKHR") @@ -1985,6 +2190,7 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.CreateIndirectCommandsLayoutNV = auto_cast GetDeviceProcAddr(device, "vkCreateIndirectCommandsLayoutNV") vtable.CreatePipelineCache = auto_cast GetDeviceProcAddr(device, "vkCreatePipelineCache") vtable.CreatePipelineLayout = auto_cast GetDeviceProcAddr(device, "vkCreatePipelineLayout") + vtable.CreatePrivateDataSlot = auto_cast GetDeviceProcAddr(device, "vkCreatePrivateDataSlot") vtable.CreatePrivateDataSlotEXT = auto_cast GetDeviceProcAddr(device, "vkCreatePrivateDataSlotEXT") vtable.CreateQueryPool = auto_cast GetDeviceProcAddr(device, "vkCreateQueryPool") vtable.CreateRayTracingPipelinesKHR = auto_cast GetDeviceProcAddr(device, "vkCreateRayTracingPipelinesKHR") @@ -2025,6 +2231,7 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.DestroyPipeline = auto_cast GetDeviceProcAddr(device, "vkDestroyPipeline") vtable.DestroyPipelineCache = auto_cast GetDeviceProcAddr(device, "vkDestroyPipelineCache") vtable.DestroyPipelineLayout = auto_cast GetDeviceProcAddr(device, "vkDestroyPipelineLayout") + vtable.DestroyPrivateDataSlot = auto_cast GetDeviceProcAddr(device, "vkDestroyPrivateDataSlot") vtable.DestroyPrivateDataSlotEXT = auto_cast GetDeviceProcAddr(device, "vkDestroyPrivateDataSlotEXT") vtable.DestroyQueryPool = auto_cast GetDeviceProcAddr(device, "vkDestroyQueryPool") vtable.DestroyRenderPass = auto_cast GetDeviceProcAddr(device, "vkDestroyRenderPass") @@ -2057,14 +2264,22 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.GetCalibratedTimestampsEXT = auto_cast GetDeviceProcAddr(device, "vkGetCalibratedTimestampsEXT") vtable.GetDeferredOperationMaxConcurrencyKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeferredOperationMaxConcurrencyKHR") vtable.GetDeferredOperationResultKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeferredOperationResultKHR") + vtable.GetDescriptorSetHostMappingVALVE = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetHostMappingVALVE") + vtable.GetDescriptorSetLayoutHostMappingInfoVALVE = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetLayoutHostMappingInfoVALVE") vtable.GetDescriptorSetLayoutSupport = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetLayoutSupport") vtable.GetDescriptorSetLayoutSupportKHR = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetLayoutSupportKHR") vtable.GetDeviceAccelerationStructureCompatibilityKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceAccelerationStructureCompatibilityKHR") + vtable.GetDeviceBufferMemoryRequirements = auto_cast GetDeviceProcAddr(device, "vkGetDeviceBufferMemoryRequirements") + vtable.GetDeviceBufferMemoryRequirementsKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceBufferMemoryRequirementsKHR") vtable.GetDeviceGroupPeerMemoryFeatures = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupPeerMemoryFeatures") vtable.GetDeviceGroupPeerMemoryFeaturesKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupPeerMemoryFeaturesKHR") vtable.GetDeviceGroupPresentCapabilitiesKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupPresentCapabilitiesKHR") vtable.GetDeviceGroupSurfacePresentModes2EXT = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupSurfacePresentModes2EXT") vtable.GetDeviceGroupSurfacePresentModesKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupSurfacePresentModesKHR") + vtable.GetDeviceImageMemoryRequirements = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageMemoryRequirements") + vtable.GetDeviceImageMemoryRequirementsKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageMemoryRequirementsKHR") + vtable.GetDeviceImageSparseMemoryRequirements = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageSparseMemoryRequirements") + vtable.GetDeviceImageSparseMemoryRequirementsKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageSparseMemoryRequirementsKHR") vtable.GetDeviceMemoryCommitment = auto_cast GetDeviceProcAddr(device, "vkGetDeviceMemoryCommitment") vtable.GetDeviceMemoryOpaqueCaptureAddress = auto_cast GetDeviceProcAddr(device, "vkGetDeviceMemoryOpaqueCaptureAddress") vtable.GetDeviceMemoryOpaqueCaptureAddressKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceMemoryOpaqueCaptureAddressKHR") @@ -2100,6 +2315,7 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.GetPipelineExecutableInternalRepresentationsKHR = auto_cast GetDeviceProcAddr(device, "vkGetPipelineExecutableInternalRepresentationsKHR") vtable.GetPipelineExecutablePropertiesKHR = auto_cast GetDeviceProcAddr(device, "vkGetPipelineExecutablePropertiesKHR") vtable.GetPipelineExecutableStatisticsKHR = auto_cast GetDeviceProcAddr(device, "vkGetPipelineExecutableStatisticsKHR") + vtable.GetPrivateData = auto_cast GetDeviceProcAddr(device, "vkGetPrivateData") vtable.GetPrivateDataEXT = auto_cast GetDeviceProcAddr(device, "vkGetPrivateDataEXT") vtable.GetQueryPoolResults = auto_cast GetDeviceProcAddr(device, "vkGetQueryPoolResults") vtable.GetQueueCheckpointData2NV = auto_cast GetDeviceProcAddr(device, "vkGetQueueCheckpointData2NV") @@ -2135,6 +2351,7 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.QueuePresentKHR = auto_cast GetDeviceProcAddr(device, "vkQueuePresentKHR") vtable.QueueSetPerformanceConfigurationINTEL = auto_cast GetDeviceProcAddr(device, "vkQueueSetPerformanceConfigurationINTEL") vtable.QueueSubmit = auto_cast GetDeviceProcAddr(device, "vkQueueSubmit") + vtable.QueueSubmit2 = auto_cast GetDeviceProcAddr(device, "vkQueueSubmit2") vtable.QueueSubmit2KHR = auto_cast GetDeviceProcAddr(device, "vkQueueSubmit2KHR") vtable.QueueWaitIdle = auto_cast GetDeviceProcAddr(device, "vkQueueWaitIdle") vtable.RegisterDeviceEventEXT = auto_cast GetDeviceProcAddr(device, "vkRegisterDeviceEventEXT") @@ -2155,6 +2372,7 @@ load_proc_addresses_device_vtable :: proc(device: Device, vtable: ^Device_VTable vtable.SetEvent = auto_cast GetDeviceProcAddr(device, "vkSetEvent") vtable.SetHdrMetadataEXT = auto_cast GetDeviceProcAddr(device, "vkSetHdrMetadataEXT") vtable.SetLocalDimmingAMD = auto_cast GetDeviceProcAddr(device, "vkSetLocalDimmingAMD") + vtable.SetPrivateData = auto_cast GetDeviceProcAddr(device, "vkSetPrivateData") vtable.SetPrivateDataEXT = auto_cast GetDeviceProcAddr(device, "vkSetPrivateDataEXT") vtable.SignalSemaphore = auto_cast GetDeviceProcAddr(device, "vkSignalSemaphore") vtable.SignalSemaphoreKHR = auto_cast GetDeviceProcAddr(device, "vkSignalSemaphoreKHR") @@ -2197,6 +2415,8 @@ load_proc_addresses_device :: proc(device: Device) { CmdBeginRenderPass = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderPass") CmdBeginRenderPass2 = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderPass2") CmdBeginRenderPass2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderPass2KHR") + CmdBeginRendering = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRendering") + CmdBeginRenderingKHR = auto_cast GetDeviceProcAddr(device, "vkCmdBeginRenderingKHR") CmdBeginTransformFeedbackEXT = auto_cast GetDeviceProcAddr(device, "vkCmdBeginTransformFeedbackEXT") CmdBindDescriptorSets = auto_cast GetDeviceProcAddr(device, "vkCmdBindDescriptorSets") CmdBindIndexBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdBindIndexBuffer") @@ -2206,8 +2426,10 @@ load_proc_addresses_device :: proc(device: Device) { CmdBindShadingRateImageNV = auto_cast GetDeviceProcAddr(device, "vkCmdBindShadingRateImageNV") CmdBindTransformFeedbackBuffersEXT = auto_cast GetDeviceProcAddr(device, "vkCmdBindTransformFeedbackBuffersEXT") CmdBindVertexBuffers = auto_cast GetDeviceProcAddr(device, "vkCmdBindVertexBuffers") + CmdBindVertexBuffers2 = auto_cast GetDeviceProcAddr(device, "vkCmdBindVertexBuffers2") CmdBindVertexBuffers2EXT = auto_cast GetDeviceProcAddr(device, "vkCmdBindVertexBuffers2EXT") CmdBlitImage = auto_cast GetDeviceProcAddr(device, "vkCmdBlitImage") + CmdBlitImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdBlitImage2") CmdBlitImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdBlitImage2KHR") CmdBuildAccelerationStructureNV = auto_cast GetDeviceProcAddr(device, "vkCmdBuildAccelerationStructureNV") CmdBuildAccelerationStructuresIndirectKHR = auto_cast GetDeviceProcAddr(device, "vkCmdBuildAccelerationStructuresIndirectKHR") @@ -2219,12 +2441,16 @@ load_proc_addresses_device :: proc(device: Device) { CmdCopyAccelerationStructureNV = auto_cast GetDeviceProcAddr(device, "vkCmdCopyAccelerationStructureNV") CmdCopyAccelerationStructureToMemoryKHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyAccelerationStructureToMemoryKHR") CmdCopyBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBuffer") + CmdCopyBuffer2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBuffer2") CmdCopyBuffer2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBuffer2KHR") CmdCopyBufferToImage = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBufferToImage") + CmdCopyBufferToImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBufferToImage2") CmdCopyBufferToImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyBufferToImage2KHR") CmdCopyImage = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImage") + CmdCopyImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImage2") CmdCopyImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImage2KHR") CmdCopyImageToBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImageToBuffer") + CmdCopyImageToBuffer2 = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImageToBuffer2") CmdCopyImageToBuffer2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyImageToBuffer2KHR") CmdCopyMemoryToAccelerationStructureKHR = auto_cast GetDeviceProcAddr(device, "vkCmdCopyMemoryToAccelerationStructureKHR") CmdCopyQueryPoolResults = auto_cast GetDeviceProcAddr(device, "vkCmdCopyQueryPoolResults") @@ -2259,6 +2485,8 @@ load_proc_addresses_device :: proc(device: Device) { CmdEndRenderPass = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderPass") CmdEndRenderPass2 = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderPass2") CmdEndRenderPass2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderPass2KHR") + CmdEndRendering = auto_cast GetDeviceProcAddr(device, "vkCmdEndRendering") + CmdEndRenderingKHR = auto_cast GetDeviceProcAddr(device, "vkCmdEndRenderingKHR") CmdEndTransformFeedbackEXT = auto_cast GetDeviceProcAddr(device, "vkCmdEndTransformFeedbackEXT") CmdExecuteCommands = auto_cast GetDeviceProcAddr(device, "vkCmdExecuteCommands") CmdExecuteGeneratedCommandsNV = auto_cast GetDeviceProcAddr(device, "vkCmdExecuteGeneratedCommandsNV") @@ -2268,35 +2496,46 @@ load_proc_addresses_device :: proc(device: Device) { CmdNextSubpass2 = auto_cast GetDeviceProcAddr(device, "vkCmdNextSubpass2") CmdNextSubpass2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdNextSubpass2KHR") CmdPipelineBarrier = auto_cast GetDeviceProcAddr(device, "vkCmdPipelineBarrier") + CmdPipelineBarrier2 = auto_cast GetDeviceProcAddr(device, "vkCmdPipelineBarrier2") CmdPipelineBarrier2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdPipelineBarrier2KHR") CmdPreprocessGeneratedCommandsNV = auto_cast GetDeviceProcAddr(device, "vkCmdPreprocessGeneratedCommandsNV") CmdPushConstants = auto_cast GetDeviceProcAddr(device, "vkCmdPushConstants") CmdPushDescriptorSetKHR = auto_cast GetDeviceProcAddr(device, "vkCmdPushDescriptorSetKHR") CmdPushDescriptorSetWithTemplateKHR = auto_cast GetDeviceProcAddr(device, "vkCmdPushDescriptorSetWithTemplateKHR") CmdResetEvent = auto_cast GetDeviceProcAddr(device, "vkCmdResetEvent") + CmdResetEvent2 = auto_cast GetDeviceProcAddr(device, "vkCmdResetEvent2") CmdResetEvent2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdResetEvent2KHR") CmdResetQueryPool = auto_cast GetDeviceProcAddr(device, "vkCmdResetQueryPool") CmdResolveImage = auto_cast GetDeviceProcAddr(device, "vkCmdResolveImage") + CmdResolveImage2 = auto_cast GetDeviceProcAddr(device, "vkCmdResolveImage2") CmdResolveImage2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdResolveImage2KHR") CmdSetBlendConstants = auto_cast GetDeviceProcAddr(device, "vkCmdSetBlendConstants") CmdSetCheckpointNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetCheckpointNV") CmdSetCoarseSampleOrderNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetCoarseSampleOrderNV") + CmdSetCullMode = auto_cast GetDeviceProcAddr(device, "vkCmdSetCullMode") CmdSetCullModeEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetCullModeEXT") CmdSetDepthBias = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBias") + CmdSetDepthBiasEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBiasEnable") CmdSetDepthBiasEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBiasEnableEXT") CmdSetDepthBounds = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBounds") + CmdSetDepthBoundsTestEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBoundsTestEnable") CmdSetDepthBoundsTestEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthBoundsTestEnableEXT") + CmdSetDepthCompareOp = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthCompareOp") CmdSetDepthCompareOpEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthCompareOpEXT") + CmdSetDepthTestEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthTestEnable") CmdSetDepthTestEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthTestEnableEXT") + CmdSetDepthWriteEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthWriteEnable") CmdSetDepthWriteEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDepthWriteEnableEXT") CmdSetDeviceMask = auto_cast GetDeviceProcAddr(device, "vkCmdSetDeviceMask") CmdSetDeviceMaskKHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetDeviceMaskKHR") CmdSetDiscardRectangleEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetDiscardRectangleEXT") CmdSetEvent = auto_cast GetDeviceProcAddr(device, "vkCmdSetEvent") + CmdSetEvent2 = auto_cast GetDeviceProcAddr(device, "vkCmdSetEvent2") CmdSetEvent2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetEvent2KHR") CmdSetExclusiveScissorNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetExclusiveScissorNV") CmdSetFragmentShadingRateEnumNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetFragmentShadingRateEnumNV") CmdSetFragmentShadingRateKHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetFragmentShadingRateKHR") + CmdSetFrontFace = auto_cast GetDeviceProcAddr(device, "vkCmdSetFrontFace") CmdSetFrontFaceEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetFrontFaceEXT") CmdSetLineStippleEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetLineStippleEXT") CmdSetLineWidth = auto_cast GetDeviceProcAddr(device, "vkCmdSetLineWidth") @@ -2305,22 +2544,29 @@ load_proc_addresses_device :: proc(device: Device) { CmdSetPerformanceMarkerINTEL = auto_cast GetDeviceProcAddr(device, "vkCmdSetPerformanceMarkerINTEL") CmdSetPerformanceOverrideINTEL = auto_cast GetDeviceProcAddr(device, "vkCmdSetPerformanceOverrideINTEL") CmdSetPerformanceStreamMarkerINTEL = auto_cast GetDeviceProcAddr(device, "vkCmdSetPerformanceStreamMarkerINTEL") + CmdSetPrimitiveRestartEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveRestartEnable") CmdSetPrimitiveRestartEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveRestartEnableEXT") + CmdSetPrimitiveTopology = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveTopology") CmdSetPrimitiveTopologyEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetPrimitiveTopologyEXT") + CmdSetRasterizerDiscardEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetRasterizerDiscardEnable") CmdSetRasterizerDiscardEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetRasterizerDiscardEnableEXT") CmdSetRayTracingPipelineStackSizeKHR = auto_cast GetDeviceProcAddr(device, "vkCmdSetRayTracingPipelineStackSizeKHR") CmdSetSampleLocationsEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetSampleLocationsEXT") CmdSetScissor = auto_cast GetDeviceProcAddr(device, "vkCmdSetScissor") + CmdSetScissorWithCount = auto_cast GetDeviceProcAddr(device, "vkCmdSetScissorWithCount") CmdSetScissorWithCountEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetScissorWithCountEXT") CmdSetStencilCompareMask = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilCompareMask") + CmdSetStencilOp = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilOp") CmdSetStencilOpEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilOpEXT") CmdSetStencilReference = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilReference") + CmdSetStencilTestEnable = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilTestEnable") CmdSetStencilTestEnableEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilTestEnableEXT") CmdSetStencilWriteMask = auto_cast GetDeviceProcAddr(device, "vkCmdSetStencilWriteMask") CmdSetVertexInputEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetVertexInputEXT") CmdSetViewport = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewport") CmdSetViewportShadingRatePaletteNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportShadingRatePaletteNV") CmdSetViewportWScalingNV = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportWScalingNV") + CmdSetViewportWithCount = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportWithCount") CmdSetViewportWithCountEXT = auto_cast GetDeviceProcAddr(device, "vkCmdSetViewportWithCountEXT") CmdSubpassShadingHUAWEI = auto_cast GetDeviceProcAddr(device, "vkCmdSubpassShadingHUAWEI") CmdTraceRaysIndirectKHR = auto_cast GetDeviceProcAddr(device, "vkCmdTraceRaysIndirectKHR") @@ -2328,12 +2574,14 @@ load_proc_addresses_device :: proc(device: Device) { CmdTraceRaysNV = auto_cast GetDeviceProcAddr(device, "vkCmdTraceRaysNV") CmdUpdateBuffer = auto_cast GetDeviceProcAddr(device, "vkCmdUpdateBuffer") CmdWaitEvents = auto_cast GetDeviceProcAddr(device, "vkCmdWaitEvents") + CmdWaitEvents2 = auto_cast GetDeviceProcAddr(device, "vkCmdWaitEvents2") CmdWaitEvents2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdWaitEvents2KHR") CmdWriteAccelerationStructuresPropertiesKHR = auto_cast GetDeviceProcAddr(device, "vkCmdWriteAccelerationStructuresPropertiesKHR") CmdWriteAccelerationStructuresPropertiesNV = auto_cast GetDeviceProcAddr(device, "vkCmdWriteAccelerationStructuresPropertiesNV") CmdWriteBufferMarker2AMD = auto_cast GetDeviceProcAddr(device, "vkCmdWriteBufferMarker2AMD") CmdWriteBufferMarkerAMD = auto_cast GetDeviceProcAddr(device, "vkCmdWriteBufferMarkerAMD") CmdWriteTimestamp = auto_cast GetDeviceProcAddr(device, "vkCmdWriteTimestamp") + CmdWriteTimestamp2 = auto_cast GetDeviceProcAddr(device, "vkCmdWriteTimestamp2") CmdWriteTimestamp2KHR = auto_cast GetDeviceProcAddr(device, "vkCmdWriteTimestamp2KHR") CompileDeferredNV = auto_cast GetDeviceProcAddr(device, "vkCompileDeferredNV") CopyAccelerationStructureKHR = auto_cast GetDeviceProcAddr(device, "vkCopyAccelerationStructureKHR") @@ -2361,6 +2609,7 @@ load_proc_addresses_device :: proc(device: Device) { CreateIndirectCommandsLayoutNV = auto_cast GetDeviceProcAddr(device, "vkCreateIndirectCommandsLayoutNV") CreatePipelineCache = auto_cast GetDeviceProcAddr(device, "vkCreatePipelineCache") CreatePipelineLayout = auto_cast GetDeviceProcAddr(device, "vkCreatePipelineLayout") + CreatePrivateDataSlot = auto_cast GetDeviceProcAddr(device, "vkCreatePrivateDataSlot") CreatePrivateDataSlotEXT = auto_cast GetDeviceProcAddr(device, "vkCreatePrivateDataSlotEXT") CreateQueryPool = auto_cast GetDeviceProcAddr(device, "vkCreateQueryPool") CreateRayTracingPipelinesKHR = auto_cast GetDeviceProcAddr(device, "vkCreateRayTracingPipelinesKHR") @@ -2401,6 +2650,7 @@ load_proc_addresses_device :: proc(device: Device) { DestroyPipeline = auto_cast GetDeviceProcAddr(device, "vkDestroyPipeline") DestroyPipelineCache = auto_cast GetDeviceProcAddr(device, "vkDestroyPipelineCache") DestroyPipelineLayout = auto_cast GetDeviceProcAddr(device, "vkDestroyPipelineLayout") + DestroyPrivateDataSlot = auto_cast GetDeviceProcAddr(device, "vkDestroyPrivateDataSlot") DestroyPrivateDataSlotEXT = auto_cast GetDeviceProcAddr(device, "vkDestroyPrivateDataSlotEXT") DestroyQueryPool = auto_cast GetDeviceProcAddr(device, "vkDestroyQueryPool") DestroyRenderPass = auto_cast GetDeviceProcAddr(device, "vkDestroyRenderPass") @@ -2433,14 +2683,22 @@ load_proc_addresses_device :: proc(device: Device) { GetCalibratedTimestampsEXT = auto_cast GetDeviceProcAddr(device, "vkGetCalibratedTimestampsEXT") GetDeferredOperationMaxConcurrencyKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeferredOperationMaxConcurrencyKHR") GetDeferredOperationResultKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeferredOperationResultKHR") + GetDescriptorSetHostMappingVALVE = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetHostMappingVALVE") + GetDescriptorSetLayoutHostMappingInfoVALVE = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetLayoutHostMappingInfoVALVE") GetDescriptorSetLayoutSupport = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetLayoutSupport") GetDescriptorSetLayoutSupportKHR = auto_cast GetDeviceProcAddr(device, "vkGetDescriptorSetLayoutSupportKHR") GetDeviceAccelerationStructureCompatibilityKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceAccelerationStructureCompatibilityKHR") + GetDeviceBufferMemoryRequirements = auto_cast GetDeviceProcAddr(device, "vkGetDeviceBufferMemoryRequirements") + GetDeviceBufferMemoryRequirementsKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceBufferMemoryRequirementsKHR") GetDeviceGroupPeerMemoryFeatures = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupPeerMemoryFeatures") GetDeviceGroupPeerMemoryFeaturesKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupPeerMemoryFeaturesKHR") GetDeviceGroupPresentCapabilitiesKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupPresentCapabilitiesKHR") GetDeviceGroupSurfacePresentModes2EXT = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupSurfacePresentModes2EXT") GetDeviceGroupSurfacePresentModesKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceGroupSurfacePresentModesKHR") + GetDeviceImageMemoryRequirements = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageMemoryRequirements") + GetDeviceImageMemoryRequirementsKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageMemoryRequirementsKHR") + GetDeviceImageSparseMemoryRequirements = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageSparseMemoryRequirements") + GetDeviceImageSparseMemoryRequirementsKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceImageSparseMemoryRequirementsKHR") GetDeviceMemoryCommitment = auto_cast GetDeviceProcAddr(device, "vkGetDeviceMemoryCommitment") GetDeviceMemoryOpaqueCaptureAddress = auto_cast GetDeviceProcAddr(device, "vkGetDeviceMemoryOpaqueCaptureAddress") GetDeviceMemoryOpaqueCaptureAddressKHR = auto_cast GetDeviceProcAddr(device, "vkGetDeviceMemoryOpaqueCaptureAddressKHR") @@ -2476,6 +2734,7 @@ load_proc_addresses_device :: proc(device: Device) { GetPipelineExecutableInternalRepresentationsKHR = auto_cast GetDeviceProcAddr(device, "vkGetPipelineExecutableInternalRepresentationsKHR") GetPipelineExecutablePropertiesKHR = auto_cast GetDeviceProcAddr(device, "vkGetPipelineExecutablePropertiesKHR") GetPipelineExecutableStatisticsKHR = auto_cast GetDeviceProcAddr(device, "vkGetPipelineExecutableStatisticsKHR") + GetPrivateData = auto_cast GetDeviceProcAddr(device, "vkGetPrivateData") GetPrivateDataEXT = auto_cast GetDeviceProcAddr(device, "vkGetPrivateDataEXT") GetQueryPoolResults = auto_cast GetDeviceProcAddr(device, "vkGetQueryPoolResults") GetQueueCheckpointData2NV = auto_cast GetDeviceProcAddr(device, "vkGetQueueCheckpointData2NV") @@ -2511,6 +2770,7 @@ load_proc_addresses_device :: proc(device: Device) { QueuePresentKHR = auto_cast GetDeviceProcAddr(device, "vkQueuePresentKHR") QueueSetPerformanceConfigurationINTEL = auto_cast GetDeviceProcAddr(device, "vkQueueSetPerformanceConfigurationINTEL") QueueSubmit = auto_cast GetDeviceProcAddr(device, "vkQueueSubmit") + QueueSubmit2 = auto_cast GetDeviceProcAddr(device, "vkQueueSubmit2") QueueSubmit2KHR = auto_cast GetDeviceProcAddr(device, "vkQueueSubmit2KHR") QueueWaitIdle = auto_cast GetDeviceProcAddr(device, "vkQueueWaitIdle") RegisterDeviceEventEXT = auto_cast GetDeviceProcAddr(device, "vkRegisterDeviceEventEXT") @@ -2531,6 +2791,7 @@ load_proc_addresses_device :: proc(device: Device) { SetEvent = auto_cast GetDeviceProcAddr(device, "vkSetEvent") SetHdrMetadataEXT = auto_cast GetDeviceProcAddr(device, "vkSetHdrMetadataEXT") SetLocalDimmingAMD = auto_cast GetDeviceProcAddr(device, "vkSetLocalDimmingAMD") + SetPrivateData = auto_cast GetDeviceProcAddr(device, "vkSetPrivateData") SetPrivateDataEXT = auto_cast GetDeviceProcAddr(device, "vkSetPrivateDataEXT") SignalSemaphore = auto_cast GetDeviceProcAddr(device, "vkSignalSemaphore") SignalSemaphoreKHR = auto_cast GetDeviceProcAddr(device, "vkSignalSemaphoreKHR") @@ -2626,6 +2887,7 @@ load_proc_addresses_instance :: proc(instance: Instance) { GetPhysicalDeviceSurfacePresentModes2EXT = auto_cast GetInstanceProcAddr(instance, "vkGetPhysicalDeviceSurfacePresentModes2EXT") GetPhysicalDeviceSurfacePresentModesKHR = auto_cast GetInstanceProcAddr(instance, "vkGetPhysicalDeviceSurfacePresentModesKHR") GetPhysicalDeviceSurfaceSupportKHR = auto_cast GetInstanceProcAddr(instance, "vkGetPhysicalDeviceSurfaceSupportKHR") + GetPhysicalDeviceToolProperties = auto_cast GetInstanceProcAddr(instance, "vkGetPhysicalDeviceToolProperties") GetPhysicalDeviceToolPropertiesEXT = auto_cast GetInstanceProcAddr(instance, "vkGetPhysicalDeviceToolPropertiesEXT") GetPhysicalDeviceWin32PresentationSupportKHR = auto_cast GetInstanceProcAddr(instance, "vkGetPhysicalDeviceWin32PresentationSupportKHR") GetWinrtDisplayNV = auto_cast GetInstanceProcAddr(instance, "vkGetWinrtDisplayNV") @@ -2657,6 +2919,8 @@ load_proc_addresses_instance :: proc(instance: Instance) { CmdBeginRenderPass = auto_cast GetInstanceProcAddr(instance, "vkCmdBeginRenderPass") CmdBeginRenderPass2 = auto_cast GetInstanceProcAddr(instance, "vkCmdBeginRenderPass2") CmdBeginRenderPass2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdBeginRenderPass2KHR") + CmdBeginRendering = auto_cast GetInstanceProcAddr(instance, "vkCmdBeginRendering") + CmdBeginRenderingKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdBeginRenderingKHR") CmdBeginTransformFeedbackEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdBeginTransformFeedbackEXT") CmdBindDescriptorSets = auto_cast GetInstanceProcAddr(instance, "vkCmdBindDescriptorSets") CmdBindIndexBuffer = auto_cast GetInstanceProcAddr(instance, "vkCmdBindIndexBuffer") @@ -2666,8 +2930,10 @@ load_proc_addresses_instance :: proc(instance: Instance) { CmdBindShadingRateImageNV = auto_cast GetInstanceProcAddr(instance, "vkCmdBindShadingRateImageNV") CmdBindTransformFeedbackBuffersEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdBindTransformFeedbackBuffersEXT") CmdBindVertexBuffers = auto_cast GetInstanceProcAddr(instance, "vkCmdBindVertexBuffers") + CmdBindVertexBuffers2 = auto_cast GetInstanceProcAddr(instance, "vkCmdBindVertexBuffers2") CmdBindVertexBuffers2EXT = auto_cast GetInstanceProcAddr(instance, "vkCmdBindVertexBuffers2EXT") CmdBlitImage = auto_cast GetInstanceProcAddr(instance, "vkCmdBlitImage") + CmdBlitImage2 = auto_cast GetInstanceProcAddr(instance, "vkCmdBlitImage2") CmdBlitImage2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdBlitImage2KHR") CmdBuildAccelerationStructureNV = auto_cast GetInstanceProcAddr(instance, "vkCmdBuildAccelerationStructureNV") CmdBuildAccelerationStructuresIndirectKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdBuildAccelerationStructuresIndirectKHR") @@ -2679,12 +2945,16 @@ load_proc_addresses_instance :: proc(instance: Instance) { CmdCopyAccelerationStructureNV = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyAccelerationStructureNV") CmdCopyAccelerationStructureToMemoryKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyAccelerationStructureToMemoryKHR") CmdCopyBuffer = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyBuffer") + CmdCopyBuffer2 = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyBuffer2") CmdCopyBuffer2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyBuffer2KHR") CmdCopyBufferToImage = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyBufferToImage") + CmdCopyBufferToImage2 = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyBufferToImage2") CmdCopyBufferToImage2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyBufferToImage2KHR") CmdCopyImage = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyImage") + CmdCopyImage2 = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyImage2") CmdCopyImage2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyImage2KHR") CmdCopyImageToBuffer = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyImageToBuffer") + CmdCopyImageToBuffer2 = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyImageToBuffer2") CmdCopyImageToBuffer2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyImageToBuffer2KHR") CmdCopyMemoryToAccelerationStructureKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyMemoryToAccelerationStructureKHR") CmdCopyQueryPoolResults = auto_cast GetInstanceProcAddr(instance, "vkCmdCopyQueryPoolResults") @@ -2719,6 +2989,8 @@ load_proc_addresses_instance :: proc(instance: Instance) { CmdEndRenderPass = auto_cast GetInstanceProcAddr(instance, "vkCmdEndRenderPass") CmdEndRenderPass2 = auto_cast GetInstanceProcAddr(instance, "vkCmdEndRenderPass2") CmdEndRenderPass2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdEndRenderPass2KHR") + CmdEndRendering = auto_cast GetInstanceProcAddr(instance, "vkCmdEndRendering") + CmdEndRenderingKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdEndRenderingKHR") CmdEndTransformFeedbackEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdEndTransformFeedbackEXT") CmdExecuteCommands = auto_cast GetInstanceProcAddr(instance, "vkCmdExecuteCommands") CmdExecuteGeneratedCommandsNV = auto_cast GetInstanceProcAddr(instance, "vkCmdExecuteGeneratedCommandsNV") @@ -2728,35 +3000,46 @@ load_proc_addresses_instance :: proc(instance: Instance) { CmdNextSubpass2 = auto_cast GetInstanceProcAddr(instance, "vkCmdNextSubpass2") CmdNextSubpass2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdNextSubpass2KHR") CmdPipelineBarrier = auto_cast GetInstanceProcAddr(instance, "vkCmdPipelineBarrier") + CmdPipelineBarrier2 = auto_cast GetInstanceProcAddr(instance, "vkCmdPipelineBarrier2") CmdPipelineBarrier2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdPipelineBarrier2KHR") CmdPreprocessGeneratedCommandsNV = auto_cast GetInstanceProcAddr(instance, "vkCmdPreprocessGeneratedCommandsNV") CmdPushConstants = auto_cast GetInstanceProcAddr(instance, "vkCmdPushConstants") CmdPushDescriptorSetKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdPushDescriptorSetKHR") CmdPushDescriptorSetWithTemplateKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdPushDescriptorSetWithTemplateKHR") CmdResetEvent = auto_cast GetInstanceProcAddr(instance, "vkCmdResetEvent") + CmdResetEvent2 = auto_cast GetInstanceProcAddr(instance, "vkCmdResetEvent2") CmdResetEvent2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdResetEvent2KHR") CmdResetQueryPool = auto_cast GetInstanceProcAddr(instance, "vkCmdResetQueryPool") CmdResolveImage = auto_cast GetInstanceProcAddr(instance, "vkCmdResolveImage") + CmdResolveImage2 = auto_cast GetInstanceProcAddr(instance, "vkCmdResolveImage2") CmdResolveImage2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdResolveImage2KHR") CmdSetBlendConstants = auto_cast GetInstanceProcAddr(instance, "vkCmdSetBlendConstants") CmdSetCheckpointNV = auto_cast GetInstanceProcAddr(instance, "vkCmdSetCheckpointNV") CmdSetCoarseSampleOrderNV = auto_cast GetInstanceProcAddr(instance, "vkCmdSetCoarseSampleOrderNV") + CmdSetCullMode = auto_cast GetInstanceProcAddr(instance, "vkCmdSetCullMode") CmdSetCullModeEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetCullModeEXT") CmdSetDepthBias = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthBias") + CmdSetDepthBiasEnable = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthBiasEnable") CmdSetDepthBiasEnableEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthBiasEnableEXT") CmdSetDepthBounds = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthBounds") + CmdSetDepthBoundsTestEnable = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthBoundsTestEnable") CmdSetDepthBoundsTestEnableEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthBoundsTestEnableEXT") + CmdSetDepthCompareOp = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthCompareOp") CmdSetDepthCompareOpEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthCompareOpEXT") + CmdSetDepthTestEnable = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthTestEnable") CmdSetDepthTestEnableEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthTestEnableEXT") + CmdSetDepthWriteEnable = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthWriteEnable") CmdSetDepthWriteEnableEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDepthWriteEnableEXT") CmdSetDeviceMask = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDeviceMask") CmdSetDeviceMaskKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDeviceMaskKHR") CmdSetDiscardRectangleEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetDiscardRectangleEXT") CmdSetEvent = auto_cast GetInstanceProcAddr(instance, "vkCmdSetEvent") + CmdSetEvent2 = auto_cast GetInstanceProcAddr(instance, "vkCmdSetEvent2") CmdSetEvent2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdSetEvent2KHR") CmdSetExclusiveScissorNV = auto_cast GetInstanceProcAddr(instance, "vkCmdSetExclusiveScissorNV") CmdSetFragmentShadingRateEnumNV = auto_cast GetInstanceProcAddr(instance, "vkCmdSetFragmentShadingRateEnumNV") CmdSetFragmentShadingRateKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdSetFragmentShadingRateKHR") + CmdSetFrontFace = auto_cast GetInstanceProcAddr(instance, "vkCmdSetFrontFace") CmdSetFrontFaceEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetFrontFaceEXT") CmdSetLineStippleEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetLineStippleEXT") CmdSetLineWidth = auto_cast GetInstanceProcAddr(instance, "vkCmdSetLineWidth") @@ -2765,22 +3048,29 @@ load_proc_addresses_instance :: proc(instance: Instance) { CmdSetPerformanceMarkerINTEL = auto_cast GetInstanceProcAddr(instance, "vkCmdSetPerformanceMarkerINTEL") CmdSetPerformanceOverrideINTEL = auto_cast GetInstanceProcAddr(instance, "vkCmdSetPerformanceOverrideINTEL") CmdSetPerformanceStreamMarkerINTEL = auto_cast GetInstanceProcAddr(instance, "vkCmdSetPerformanceStreamMarkerINTEL") + CmdSetPrimitiveRestartEnable = auto_cast GetInstanceProcAddr(instance, "vkCmdSetPrimitiveRestartEnable") CmdSetPrimitiveRestartEnableEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetPrimitiveRestartEnableEXT") + CmdSetPrimitiveTopology = auto_cast GetInstanceProcAddr(instance, "vkCmdSetPrimitiveTopology") CmdSetPrimitiveTopologyEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetPrimitiveTopologyEXT") + CmdSetRasterizerDiscardEnable = auto_cast GetInstanceProcAddr(instance, "vkCmdSetRasterizerDiscardEnable") CmdSetRasterizerDiscardEnableEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetRasterizerDiscardEnableEXT") CmdSetRayTracingPipelineStackSizeKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdSetRayTracingPipelineStackSizeKHR") CmdSetSampleLocationsEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetSampleLocationsEXT") CmdSetScissor = auto_cast GetInstanceProcAddr(instance, "vkCmdSetScissor") + CmdSetScissorWithCount = auto_cast GetInstanceProcAddr(instance, "vkCmdSetScissorWithCount") CmdSetScissorWithCountEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetScissorWithCountEXT") CmdSetStencilCompareMask = auto_cast GetInstanceProcAddr(instance, "vkCmdSetStencilCompareMask") + CmdSetStencilOp = auto_cast GetInstanceProcAddr(instance, "vkCmdSetStencilOp") CmdSetStencilOpEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetStencilOpEXT") CmdSetStencilReference = auto_cast GetInstanceProcAddr(instance, "vkCmdSetStencilReference") + CmdSetStencilTestEnable = auto_cast GetInstanceProcAddr(instance, "vkCmdSetStencilTestEnable") CmdSetStencilTestEnableEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetStencilTestEnableEXT") CmdSetStencilWriteMask = auto_cast GetInstanceProcAddr(instance, "vkCmdSetStencilWriteMask") CmdSetVertexInputEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetVertexInputEXT") CmdSetViewport = auto_cast GetInstanceProcAddr(instance, "vkCmdSetViewport") CmdSetViewportShadingRatePaletteNV = auto_cast GetInstanceProcAddr(instance, "vkCmdSetViewportShadingRatePaletteNV") CmdSetViewportWScalingNV = auto_cast GetInstanceProcAddr(instance, "vkCmdSetViewportWScalingNV") + CmdSetViewportWithCount = auto_cast GetInstanceProcAddr(instance, "vkCmdSetViewportWithCount") CmdSetViewportWithCountEXT = auto_cast GetInstanceProcAddr(instance, "vkCmdSetViewportWithCountEXT") CmdSubpassShadingHUAWEI = auto_cast GetInstanceProcAddr(instance, "vkCmdSubpassShadingHUAWEI") CmdTraceRaysIndirectKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdTraceRaysIndirectKHR") @@ -2788,12 +3078,14 @@ load_proc_addresses_instance :: proc(instance: Instance) { CmdTraceRaysNV = auto_cast GetInstanceProcAddr(instance, "vkCmdTraceRaysNV") CmdUpdateBuffer = auto_cast GetInstanceProcAddr(instance, "vkCmdUpdateBuffer") CmdWaitEvents = auto_cast GetInstanceProcAddr(instance, "vkCmdWaitEvents") + CmdWaitEvents2 = auto_cast GetInstanceProcAddr(instance, "vkCmdWaitEvents2") CmdWaitEvents2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdWaitEvents2KHR") CmdWriteAccelerationStructuresPropertiesKHR = auto_cast GetInstanceProcAddr(instance, "vkCmdWriteAccelerationStructuresPropertiesKHR") CmdWriteAccelerationStructuresPropertiesNV = auto_cast GetInstanceProcAddr(instance, "vkCmdWriteAccelerationStructuresPropertiesNV") CmdWriteBufferMarker2AMD = auto_cast GetInstanceProcAddr(instance, "vkCmdWriteBufferMarker2AMD") CmdWriteBufferMarkerAMD = auto_cast GetInstanceProcAddr(instance, "vkCmdWriteBufferMarkerAMD") CmdWriteTimestamp = auto_cast GetInstanceProcAddr(instance, "vkCmdWriteTimestamp") + CmdWriteTimestamp2 = auto_cast GetInstanceProcAddr(instance, "vkCmdWriteTimestamp2") CmdWriteTimestamp2KHR = auto_cast GetInstanceProcAddr(instance, "vkCmdWriteTimestamp2KHR") CompileDeferredNV = auto_cast GetInstanceProcAddr(instance, "vkCompileDeferredNV") CopyAccelerationStructureKHR = auto_cast GetInstanceProcAddr(instance, "vkCopyAccelerationStructureKHR") @@ -2821,6 +3113,7 @@ load_proc_addresses_instance :: proc(instance: Instance) { CreateIndirectCommandsLayoutNV = auto_cast GetInstanceProcAddr(instance, "vkCreateIndirectCommandsLayoutNV") CreatePipelineCache = auto_cast GetInstanceProcAddr(instance, "vkCreatePipelineCache") CreatePipelineLayout = auto_cast GetInstanceProcAddr(instance, "vkCreatePipelineLayout") + CreatePrivateDataSlot = auto_cast GetInstanceProcAddr(instance, "vkCreatePrivateDataSlot") CreatePrivateDataSlotEXT = auto_cast GetInstanceProcAddr(instance, "vkCreatePrivateDataSlotEXT") CreateQueryPool = auto_cast GetInstanceProcAddr(instance, "vkCreateQueryPool") CreateRayTracingPipelinesKHR = auto_cast GetInstanceProcAddr(instance, "vkCreateRayTracingPipelinesKHR") @@ -2861,6 +3154,7 @@ load_proc_addresses_instance :: proc(instance: Instance) { DestroyPipeline = auto_cast GetInstanceProcAddr(instance, "vkDestroyPipeline") DestroyPipelineCache = auto_cast GetInstanceProcAddr(instance, "vkDestroyPipelineCache") DestroyPipelineLayout = auto_cast GetInstanceProcAddr(instance, "vkDestroyPipelineLayout") + DestroyPrivateDataSlot = auto_cast GetInstanceProcAddr(instance, "vkDestroyPrivateDataSlot") DestroyPrivateDataSlotEXT = auto_cast GetInstanceProcAddr(instance, "vkDestroyPrivateDataSlotEXT") DestroyQueryPool = auto_cast GetInstanceProcAddr(instance, "vkDestroyQueryPool") DestroyRenderPass = auto_cast GetInstanceProcAddr(instance, "vkDestroyRenderPass") @@ -2893,14 +3187,22 @@ load_proc_addresses_instance :: proc(instance: Instance) { GetCalibratedTimestampsEXT = auto_cast GetInstanceProcAddr(instance, "vkGetCalibratedTimestampsEXT") GetDeferredOperationMaxConcurrencyKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeferredOperationMaxConcurrencyKHR") GetDeferredOperationResultKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeferredOperationResultKHR") + GetDescriptorSetHostMappingVALVE = auto_cast GetInstanceProcAddr(instance, "vkGetDescriptorSetHostMappingVALVE") + GetDescriptorSetLayoutHostMappingInfoVALVE = auto_cast GetInstanceProcAddr(instance, "vkGetDescriptorSetLayoutHostMappingInfoVALVE") GetDescriptorSetLayoutSupport = auto_cast GetInstanceProcAddr(instance, "vkGetDescriptorSetLayoutSupport") GetDescriptorSetLayoutSupportKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDescriptorSetLayoutSupportKHR") GetDeviceAccelerationStructureCompatibilityKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceAccelerationStructureCompatibilityKHR") + GetDeviceBufferMemoryRequirements = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceBufferMemoryRequirements") + GetDeviceBufferMemoryRequirementsKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceBufferMemoryRequirementsKHR") GetDeviceGroupPeerMemoryFeatures = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceGroupPeerMemoryFeatures") GetDeviceGroupPeerMemoryFeaturesKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceGroupPeerMemoryFeaturesKHR") GetDeviceGroupPresentCapabilitiesKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceGroupPresentCapabilitiesKHR") GetDeviceGroupSurfacePresentModes2EXT = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceGroupSurfacePresentModes2EXT") GetDeviceGroupSurfacePresentModesKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceGroupSurfacePresentModesKHR") + GetDeviceImageMemoryRequirements = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceImageMemoryRequirements") + GetDeviceImageMemoryRequirementsKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceImageMemoryRequirementsKHR") + GetDeviceImageSparseMemoryRequirements = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceImageSparseMemoryRequirements") + GetDeviceImageSparseMemoryRequirementsKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceImageSparseMemoryRequirementsKHR") GetDeviceMemoryCommitment = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceMemoryCommitment") GetDeviceMemoryOpaqueCaptureAddress = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceMemoryOpaqueCaptureAddress") GetDeviceMemoryOpaqueCaptureAddressKHR = auto_cast GetInstanceProcAddr(instance, "vkGetDeviceMemoryOpaqueCaptureAddressKHR") @@ -2936,6 +3238,7 @@ load_proc_addresses_instance :: proc(instance: Instance) { GetPipelineExecutableInternalRepresentationsKHR = auto_cast GetInstanceProcAddr(instance, "vkGetPipelineExecutableInternalRepresentationsKHR") GetPipelineExecutablePropertiesKHR = auto_cast GetInstanceProcAddr(instance, "vkGetPipelineExecutablePropertiesKHR") GetPipelineExecutableStatisticsKHR = auto_cast GetInstanceProcAddr(instance, "vkGetPipelineExecutableStatisticsKHR") + GetPrivateData = auto_cast GetInstanceProcAddr(instance, "vkGetPrivateData") GetPrivateDataEXT = auto_cast GetInstanceProcAddr(instance, "vkGetPrivateDataEXT") GetQueryPoolResults = auto_cast GetInstanceProcAddr(instance, "vkGetQueryPoolResults") GetQueueCheckpointData2NV = auto_cast GetInstanceProcAddr(instance, "vkGetQueueCheckpointData2NV") @@ -2971,6 +3274,7 @@ load_proc_addresses_instance :: proc(instance: Instance) { QueuePresentKHR = auto_cast GetInstanceProcAddr(instance, "vkQueuePresentKHR") QueueSetPerformanceConfigurationINTEL = auto_cast GetInstanceProcAddr(instance, "vkQueueSetPerformanceConfigurationINTEL") QueueSubmit = auto_cast GetInstanceProcAddr(instance, "vkQueueSubmit") + QueueSubmit2 = auto_cast GetInstanceProcAddr(instance, "vkQueueSubmit2") QueueSubmit2KHR = auto_cast GetInstanceProcAddr(instance, "vkQueueSubmit2KHR") QueueWaitIdle = auto_cast GetInstanceProcAddr(instance, "vkQueueWaitIdle") RegisterDeviceEventEXT = auto_cast GetInstanceProcAddr(instance, "vkRegisterDeviceEventEXT") @@ -2991,6 +3295,7 @@ load_proc_addresses_instance :: proc(instance: Instance) { SetEvent = auto_cast GetInstanceProcAddr(instance, "vkSetEvent") SetHdrMetadataEXT = auto_cast GetInstanceProcAddr(instance, "vkSetHdrMetadataEXT") SetLocalDimmingAMD = auto_cast GetInstanceProcAddr(instance, "vkSetLocalDimmingAMD") + SetPrivateData = auto_cast GetInstanceProcAddr(instance, "vkSetPrivateData") SetPrivateDataEXT = auto_cast GetInstanceProcAddr(instance, "vkSetPrivateDataEXT") SignalSemaphore = auto_cast GetInstanceProcAddr(instance, "vkSignalSemaphore") SignalSemaphoreKHR = auto_cast GetInstanceProcAddr(instance, "vkSignalSemaphoreKHR") diff --git a/vendor/vulkan/structs.odin b/vendor/vulkan/structs.odin index 3c655a4fa..3bc3e1935 100644 --- a/vendor/vulkan/structs.odin +++ b/vendor/vulkan/structs.odin @@ -2170,6 +2170,537 @@ DeviceMemoryOpaqueCaptureAddressInfo :: struct { memory: DeviceMemory, } +PhysicalDeviceVulkan13Features :: struct { + sType: StructureType, + pNext: rawptr, + robustImageAccess: b32, + inlineUniformBlock: b32, + descriptorBindingInlineUniformBlockUpdateAfterBind: b32, + pipelineCreationCacheControl: b32, + privateData: b32, + shaderDemoteToHelperInvocation: b32, + shaderTerminateInvocation: b32, + subgroupSizeControl: b32, + computeFullSubgroups: b32, + synchronization2: b32, + textureCompressionASTC_HDR: b32, + shaderZeroInitializeWorkgroupMemory: b32, + dynamicRendering: b32, + shaderIntegerDotProduct: b32, + maintenance4: b32, +} + +PhysicalDeviceVulkan13Properties :: struct { + sType: StructureType, + pNext: rawptr, + minSubgroupSize: u32, + maxSubgroupSize: u32, + maxComputeWorkgroupSubgroups: u32, + requiredSubgroupSizeStages: ShaderStageFlags, + maxInlineUniformBlockSize: u32, + maxPerStageDescriptorInlineUniformBlocks: u32, + maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks: u32, + maxDescriptorSetInlineUniformBlocks: u32, + maxDescriptorSetUpdateAfterBindInlineUniformBlocks: u32, + maxInlineUniformTotalSize: u32, + integerDotProduct8BitUnsignedAccelerated: b32, + integerDotProduct8BitSignedAccelerated: b32, + integerDotProduct8BitMixedSignednessAccelerated: b32, + integerDotProduct4x8BitPackedUnsignedAccelerated: b32, + integerDotProduct4x8BitPackedSignedAccelerated: b32, + integerDotProduct4x8BitPackedMixedSignednessAccelerated: b32, + integerDotProduct16BitUnsignedAccelerated: b32, + integerDotProduct16BitSignedAccelerated: b32, + integerDotProduct16BitMixedSignednessAccelerated: b32, + integerDotProduct32BitUnsignedAccelerated: b32, + integerDotProduct32BitSignedAccelerated: b32, + integerDotProduct32BitMixedSignednessAccelerated: b32, + integerDotProduct64BitUnsignedAccelerated: b32, + integerDotProduct64BitSignedAccelerated: b32, + integerDotProduct64BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating8BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating8BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated: b32, + integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating16BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating16BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating32BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating32BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating64BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating64BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated: b32, + storageTexelBufferOffsetAlignmentBytes: DeviceSize, + storageTexelBufferOffsetSingleTexelAlignment: b32, + uniformTexelBufferOffsetAlignmentBytes: DeviceSize, + uniformTexelBufferOffsetSingleTexelAlignment: b32, + maxBufferSize: DeviceSize, +} + +PipelineCreationFeedback :: struct { + flags: PipelineCreationFeedbackFlags, + duration: u64, +} + +PipelineCreationFeedbackCreateInfo :: struct { + sType: StructureType, + pNext: rawptr, + pPipelineCreationFeedback: ^PipelineCreationFeedback, + pipelineStageCreationFeedbackCount: u32, + pPipelineStageCreationFeedbacks: [^]PipelineCreationFeedback, +} + +PhysicalDeviceShaderTerminateInvocationFeatures :: struct { + sType: StructureType, + pNext: rawptr, + shaderTerminateInvocation: b32, +} + +PhysicalDeviceToolProperties :: struct { + sType: StructureType, + pNext: rawptr, + name: [MAX_EXTENSION_NAME_SIZE]byte, + version: [MAX_EXTENSION_NAME_SIZE]byte, + purposes: ToolPurposeFlags, + description: [MAX_DESCRIPTION_SIZE]byte, + layer: [MAX_EXTENSION_NAME_SIZE]byte, +} + +PhysicalDeviceShaderDemoteToHelperInvocationFeatures :: struct { + sType: StructureType, + pNext: rawptr, + shaderDemoteToHelperInvocation: b32, +} + +PhysicalDevicePrivateDataFeatures :: struct { + sType: StructureType, + pNext: rawptr, + privateData: b32, +} + +DevicePrivateDataCreateInfo :: struct { + sType: StructureType, + pNext: rawptr, + privateDataSlotRequestCount: u32, +} + +PrivateDataSlotCreateInfo :: struct { + sType: StructureType, + pNext: rawptr, + flags: PrivateDataSlotCreateFlags, +} + +PhysicalDevicePipelineCreationCacheControlFeatures :: struct { + sType: StructureType, + pNext: rawptr, + pipelineCreationCacheControl: b32, +} + +MemoryBarrier2 :: struct { + sType: StructureType, + pNext: rawptr, + srcStageMask: PipelineStageFlags2, + srcAccessMask: AccessFlags2, + dstStageMask: PipelineStageFlags2, + dstAccessMask: AccessFlags2, +} + +BufferMemoryBarrier2 :: struct { + sType: StructureType, + pNext: rawptr, + srcStageMask: PipelineStageFlags2, + srcAccessMask: AccessFlags2, + dstStageMask: PipelineStageFlags2, + dstAccessMask: AccessFlags2, + srcQueueFamilyIndex: u32, + dstQueueFamilyIndex: u32, + buffer: Buffer, + offset: DeviceSize, + size: DeviceSize, +} + +ImageMemoryBarrier2 :: struct { + sType: StructureType, + pNext: rawptr, + srcStageMask: PipelineStageFlags2, + srcAccessMask: AccessFlags2, + dstStageMask: PipelineStageFlags2, + dstAccessMask: AccessFlags2, + oldLayout: ImageLayout, + newLayout: ImageLayout, + srcQueueFamilyIndex: u32, + dstQueueFamilyIndex: u32, + image: Image, + subresourceRange: ImageSubresourceRange, +} + +DependencyInfo :: struct { + sType: StructureType, + pNext: rawptr, + dependencyFlags: DependencyFlags, + memoryBarrierCount: u32, + pMemoryBarriers: [^]MemoryBarrier2, + bufferMemoryBarrierCount: u32, + pBufferMemoryBarriers: [^]BufferMemoryBarrier2, + imageMemoryBarrierCount: u32, + pImageMemoryBarriers: [^]ImageMemoryBarrier2, +} + +SemaphoreSubmitInfo :: struct { + sType: StructureType, + pNext: rawptr, + semaphore: Semaphore, + value: u64, + stageMask: PipelineStageFlags2, + deviceIndex: u32, +} + +CommandBufferSubmitInfo :: struct { + sType: StructureType, + pNext: rawptr, + commandBuffer: CommandBuffer, + deviceMask: u32, +} + +SubmitInfo2 :: struct { + sType: StructureType, + pNext: rawptr, + flags: SubmitFlags, + waitSemaphoreInfoCount: u32, + pWaitSemaphoreInfos: [^]SemaphoreSubmitInfo, + commandBufferInfoCount: u32, + pCommandBufferInfos: [^]CommandBufferSubmitInfo, + signalSemaphoreInfoCount: u32, + pSignalSemaphoreInfos: [^]SemaphoreSubmitInfo, +} + +PhysicalDeviceSynchronization2Features :: struct { + sType: StructureType, + pNext: rawptr, + synchronization2: b32, +} + +PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures :: struct { + sType: StructureType, + pNext: rawptr, + shaderZeroInitializeWorkgroupMemory: b32, +} + +PhysicalDeviceImageRobustnessFeatures :: struct { + sType: StructureType, + pNext: rawptr, + robustImageAccess: b32, +} + +BufferCopy2 :: struct { + sType: StructureType, + pNext: rawptr, + srcOffset: DeviceSize, + dstOffset: DeviceSize, + size: DeviceSize, +} + +CopyBufferInfo2 :: struct { + sType: StructureType, + pNext: rawptr, + srcBuffer: Buffer, + dstBuffer: Buffer, + regionCount: u32, + pRegions: [^]BufferCopy2, +} + +ImageCopy2 :: struct { + sType: StructureType, + pNext: rawptr, + srcSubresource: ImageSubresourceLayers, + srcOffset: Offset3D, + dstSubresource: ImageSubresourceLayers, + dstOffset: Offset3D, + extent: Extent3D, +} + +CopyImageInfo2 :: struct { + sType: StructureType, + pNext: rawptr, + srcImage: Image, + srcImageLayout: ImageLayout, + dstImage: Image, + dstImageLayout: ImageLayout, + regionCount: u32, + pRegions: [^]ImageCopy2, +} + +BufferImageCopy2 :: struct { + sType: StructureType, + pNext: rawptr, + bufferOffset: DeviceSize, + bufferRowLength: u32, + bufferImageHeight: u32, + imageSubresource: ImageSubresourceLayers, + imageOffset: Offset3D, + imageExtent: Extent3D, +} + +CopyBufferToImageInfo2 :: struct { + sType: StructureType, + pNext: rawptr, + srcBuffer: Buffer, + dstImage: Image, + dstImageLayout: ImageLayout, + regionCount: u32, + pRegions: [^]BufferImageCopy2, +} + +CopyImageToBufferInfo2 :: struct { + sType: StructureType, + pNext: rawptr, + srcImage: Image, + srcImageLayout: ImageLayout, + dstBuffer: Buffer, + regionCount: u32, + pRegions: [^]BufferImageCopy2, +} + +ImageBlit2 :: struct { + sType: StructureType, + pNext: rawptr, + srcSubresource: ImageSubresourceLayers, + srcOffsets: [2]Offset3D, + dstSubresource: ImageSubresourceLayers, + dstOffsets: [2]Offset3D, +} + +BlitImageInfo2 :: struct { + sType: StructureType, + pNext: rawptr, + srcImage: Image, + srcImageLayout: ImageLayout, + dstImage: Image, + dstImageLayout: ImageLayout, + regionCount: u32, + pRegions: [^]ImageBlit2, + filter: Filter, +} + +ImageResolve2 :: struct { + sType: StructureType, + pNext: rawptr, + srcSubresource: ImageSubresourceLayers, + srcOffset: Offset3D, + dstSubresource: ImageSubresourceLayers, + dstOffset: Offset3D, + extent: Extent3D, +} + +ResolveImageInfo2 :: struct { + sType: StructureType, + pNext: rawptr, + srcImage: Image, + srcImageLayout: ImageLayout, + dstImage: Image, + dstImageLayout: ImageLayout, + regionCount: u32, + pRegions: [^]ImageResolve2, +} + +PhysicalDeviceSubgroupSizeControlFeatures :: struct { + sType: StructureType, + pNext: rawptr, + subgroupSizeControl: b32, + computeFullSubgroups: b32, +} + +PhysicalDeviceSubgroupSizeControlProperties :: struct { + sType: StructureType, + pNext: rawptr, + minSubgroupSize: u32, + maxSubgroupSize: u32, + maxComputeWorkgroupSubgroups: u32, + requiredSubgroupSizeStages: ShaderStageFlags, +} + +PipelineShaderStageRequiredSubgroupSizeCreateInfo :: struct { + sType: StructureType, + pNext: rawptr, + requiredSubgroupSize: u32, +} + +PhysicalDeviceInlineUniformBlockFeatures :: struct { + sType: StructureType, + pNext: rawptr, + inlineUniformBlock: b32, + descriptorBindingInlineUniformBlockUpdateAfterBind: b32, +} + +PhysicalDeviceInlineUniformBlockProperties :: struct { + sType: StructureType, + pNext: rawptr, + maxInlineUniformBlockSize: u32, + maxPerStageDescriptorInlineUniformBlocks: u32, + maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks: u32, + maxDescriptorSetInlineUniformBlocks: u32, + maxDescriptorSetUpdateAfterBindInlineUniformBlocks: u32, +} + +WriteDescriptorSetInlineUniformBlock :: struct { + sType: StructureType, + pNext: rawptr, + dataSize: u32, + pData: rawptr, +} + +DescriptorPoolInlineUniformBlockCreateInfo :: struct { + sType: StructureType, + pNext: rawptr, + maxInlineUniformBlockBindings: u32, +} + +PhysicalDeviceTextureCompressionASTCHDRFeatures :: struct { + sType: StructureType, + pNext: rawptr, + textureCompressionASTC_HDR: b32, +} + +RenderingAttachmentInfo :: struct { + sType: StructureType, + pNext: rawptr, + imageView: ImageView, + imageLayout: ImageLayout, + resolveMode: ResolveModeFlags, + resolveImageView: ImageView, + resolveImageLayout: ImageLayout, + loadOp: AttachmentLoadOp, + storeOp: AttachmentStoreOp, + clearValue: ClearValue, +} + +RenderingInfo :: struct { + sType: StructureType, + pNext: rawptr, + flags: RenderingFlags, + renderArea: Rect2D, + layerCount: u32, + viewMask: u32, + colorAttachmentCount: u32, + pColorAttachments: [^]RenderingAttachmentInfo, + pDepthAttachment: ^RenderingAttachmentInfo, + pStencilAttachment: ^RenderingAttachmentInfo, +} + +PipelineRenderingCreateInfo :: struct { + sType: StructureType, + pNext: rawptr, + viewMask: u32, + colorAttachmentCount: u32, + pColorAttachmentFormats: [^]Format, + depthAttachmentFormat: Format, + stencilAttachmentFormat: Format, +} + +PhysicalDeviceDynamicRenderingFeatures :: struct { + sType: StructureType, + pNext: rawptr, + dynamicRendering: b32, +} + +CommandBufferInheritanceRenderingInfo :: struct { + sType: StructureType, + pNext: rawptr, + flags: RenderingFlags, + viewMask: u32, + colorAttachmentCount: u32, + pColorAttachmentFormats: [^]Format, + depthAttachmentFormat: Format, + stencilAttachmentFormat: Format, + rasterizationSamples: SampleCountFlags, +} + +PhysicalDeviceShaderIntegerDotProductFeatures :: struct { + sType: StructureType, + pNext: rawptr, + shaderIntegerDotProduct: b32, +} + +PhysicalDeviceShaderIntegerDotProductProperties :: struct { + sType: StructureType, + pNext: rawptr, + integerDotProduct8BitUnsignedAccelerated: b32, + integerDotProduct8BitSignedAccelerated: b32, + integerDotProduct8BitMixedSignednessAccelerated: b32, + integerDotProduct4x8BitPackedUnsignedAccelerated: b32, + integerDotProduct4x8BitPackedSignedAccelerated: b32, + integerDotProduct4x8BitPackedMixedSignednessAccelerated: b32, + integerDotProduct16BitUnsignedAccelerated: b32, + integerDotProduct16BitSignedAccelerated: b32, + integerDotProduct16BitMixedSignednessAccelerated: b32, + integerDotProduct32BitUnsignedAccelerated: b32, + integerDotProduct32BitSignedAccelerated: b32, + integerDotProduct32BitMixedSignednessAccelerated: b32, + integerDotProduct64BitUnsignedAccelerated: b32, + integerDotProduct64BitSignedAccelerated: b32, + integerDotProduct64BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating8BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating8BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated: b32, + integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating16BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating16BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating32BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating32BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated: b32, + integerDotProductAccumulatingSaturating64BitUnsignedAccelerated: b32, + integerDotProductAccumulatingSaturating64BitSignedAccelerated: b32, + integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated: b32, +} + +PhysicalDeviceTexelBufferAlignmentProperties :: struct { + sType: StructureType, + pNext: rawptr, + storageTexelBufferOffsetAlignmentBytes: DeviceSize, + storageTexelBufferOffsetSingleTexelAlignment: b32, + uniformTexelBufferOffsetAlignmentBytes: DeviceSize, + uniformTexelBufferOffsetSingleTexelAlignment: b32, +} + +FormatProperties3 :: struct { + sType: StructureType, + pNext: rawptr, + linearTilingFeatures: FormatFeatureFlags2, + optimalTilingFeatures: FormatFeatureFlags2, + bufferFeatures: FormatFeatureFlags2, +} + +PhysicalDeviceMaintenance4Features :: struct { + sType: StructureType, + pNext: rawptr, + maintenance4: b32, +} + +PhysicalDeviceMaintenance4Properties :: struct { + sType: StructureType, + pNext: rawptr, + maxBufferSize: DeviceSize, +} + +DeviceBufferMemoryRequirements :: struct { + sType: StructureType, + pNext: rawptr, + pCreateInfo: ^BufferCreateInfo, +} + +DeviceImageMemoryRequirements :: struct { + sType: StructureType, + pNext: rawptr, + pCreateInfo: ^ImageCreateInfo, + planeAspect: ImageAspectFlags, +} + SurfaceCapabilitiesKHR :: struct { minImageCount: u32, maxImageCount: u32, @@ -2329,6 +2860,36 @@ DisplayPresentInfoKHR :: struct { persistent: b32, } +RenderingFragmentShadingRateAttachmentInfoKHR :: struct { + sType: StructureType, + pNext: rawptr, + imageView: ImageView, + imageLayout: ImageLayout, + shadingRateAttachmentTexelSize: Extent2D, +} + +RenderingFragmentDensityMapAttachmentInfoEXT :: struct { + sType: StructureType, + pNext: rawptr, + imageView: ImageView, + imageLayout: ImageLayout, +} + +AttachmentSampleCountInfoAMD :: struct { + sType: StructureType, + pNext: rawptr, + colorAttachmentCount: u32, + pColorAttachmentSamples: [^]SampleCountFlags, + depthStencilAttachmentSamples: SampleCountFlags, +} + +MultiviewPerViewAttributesInfoNVX :: struct { + sType: StructureType, + pNext: rawptr, + perViewAttributes: b32, + perViewAttributesPositionXOnly: b32, +} + ImportMemoryFdInfoKHR :: struct { sType: StructureType, pNext: rawptr, @@ -2528,10 +3089,23 @@ PhysicalDeviceShaderClockFeaturesKHR :: struct { shaderDeviceClock: b32, } -PhysicalDeviceShaderTerminateInvocationFeaturesKHR :: struct { - sType: StructureType, - pNext: rawptr, - shaderTerminateInvocation: b32, +DeviceQueueGlobalPriorityCreateInfoKHR :: struct { + sType: StructureType, + pNext: rawptr, + globalPriority: QueueGlobalPriorityKHR, +} + +PhysicalDeviceGlobalPriorityQueryFeaturesKHR :: struct { + sType: StructureType, + pNext: rawptr, + globalPriorityQuery: b32, +} + +QueueFamilyGlobalPriorityPropertiesKHR :: struct { + sType: StructureType, + pNext: rawptr, + priorityCount: u32, + priorities: [MAX_GLOBAL_PRIORITY_SIZE_KHR]QueueGlobalPriorityKHR, } FragmentShadingRateAttachmentInfoKHR :: struct { @@ -2651,47 +3225,6 @@ PipelineExecutableInternalRepresentationKHR :: struct { pData: rawptr, } -PhysicalDeviceShaderIntegerDotProductFeaturesKHR :: struct { - sType: StructureType, - pNext: rawptr, - shaderIntegerDotProduct: b32, -} - -PhysicalDeviceShaderIntegerDotProductPropertiesKHR :: struct { - sType: StructureType, - pNext: rawptr, - integerDotProduct8BitUnsignedAccelerated: b32, - integerDotProduct8BitSignedAccelerated: b32, - integerDotProduct8BitMixedSignednessAccelerated: b32, - integerDotProduct4x8BitPackedUnsignedAccelerated: b32, - integerDotProduct4x8BitPackedSignedAccelerated: b32, - integerDotProduct4x8BitPackedMixedSignednessAccelerated: b32, - integerDotProduct16BitUnsignedAccelerated: b32, - integerDotProduct16BitSignedAccelerated: b32, - integerDotProduct16BitMixedSignednessAccelerated: b32, - integerDotProduct32BitUnsignedAccelerated: b32, - integerDotProduct32BitSignedAccelerated: b32, - integerDotProduct32BitMixedSignednessAccelerated: b32, - integerDotProduct64BitUnsignedAccelerated: b32, - integerDotProduct64BitSignedAccelerated: b32, - integerDotProduct64BitMixedSignednessAccelerated: b32, - integerDotProductAccumulatingSaturating8BitUnsignedAccelerated: b32, - integerDotProductAccumulatingSaturating8BitSignedAccelerated: b32, - integerDotProductAccumulatingSaturating8BitMixedSignednessAccelerated: b32, - integerDotProductAccumulatingSaturating4x8BitPackedUnsignedAccelerated: b32, - integerDotProductAccumulatingSaturating4x8BitPackedSignedAccelerated: b32, - integerDotProductAccumulatingSaturating4x8BitPackedMixedSignednessAccelerated: b32, - integerDotProductAccumulatingSaturating16BitUnsignedAccelerated: b32, - integerDotProductAccumulatingSaturating16BitSignedAccelerated: b32, - integerDotProductAccumulatingSaturating16BitMixedSignednessAccelerated: b32, - integerDotProductAccumulatingSaturating32BitUnsignedAccelerated: b32, - integerDotProductAccumulatingSaturating32BitSignedAccelerated: b32, - integerDotProductAccumulatingSaturating32BitMixedSignednessAccelerated: b32, - integerDotProductAccumulatingSaturating64BitUnsignedAccelerated: b32, - integerDotProductAccumulatingSaturating64BitSignedAccelerated: b32, - integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated: b32, -} - PipelineLibraryCreateInfoKHR :: struct { sType: StructureType, pNext: rawptr, @@ -2712,100 +3245,16 @@ PhysicalDevicePresentIdFeaturesKHR :: struct { presentId: b32, } -MemoryBarrier2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcStageMask: PipelineStageFlags2KHR, - srcAccessMask: AccessFlags2KHR, - dstStageMask: PipelineStageFlags2KHR, - dstAccessMask: AccessFlags2KHR, -} - -BufferMemoryBarrier2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcStageMask: PipelineStageFlags2KHR, - srcAccessMask: AccessFlags2KHR, - dstStageMask: PipelineStageFlags2KHR, - dstAccessMask: AccessFlags2KHR, - srcQueueFamilyIndex: u32, - dstQueueFamilyIndex: u32, - buffer: Buffer, - offset: DeviceSize, - size: DeviceSize, -} - -ImageMemoryBarrier2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcStageMask: PipelineStageFlags2KHR, - srcAccessMask: AccessFlags2KHR, - dstStageMask: PipelineStageFlags2KHR, - dstAccessMask: AccessFlags2KHR, - oldLayout: ImageLayout, - newLayout: ImageLayout, - srcQueueFamilyIndex: u32, - dstQueueFamilyIndex: u32, - image: Image, - subresourceRange: ImageSubresourceRange, -} - -DependencyInfoKHR :: struct { - sType: StructureType, - pNext: rawptr, - dependencyFlags: DependencyFlags, - memoryBarrierCount: u32, - pMemoryBarriers: [^]MemoryBarrier2KHR, - bufferMemoryBarrierCount: u32, - pBufferMemoryBarriers: [^]BufferMemoryBarrier2KHR, - imageMemoryBarrierCount: u32, - pImageMemoryBarriers: [^]ImageMemoryBarrier2KHR, -} - -SemaphoreSubmitInfoKHR :: struct { - sType: StructureType, - pNext: rawptr, - semaphore: Semaphore, - value: u64, - stageMask: PipelineStageFlags2KHR, - deviceIndex: u32, -} - -CommandBufferSubmitInfoKHR :: struct { - sType: StructureType, - pNext: rawptr, - commandBuffer: CommandBuffer, - deviceMask: u32, -} - -SubmitInfo2KHR :: struct { - sType: StructureType, - pNext: rawptr, - flags: SubmitFlagsKHR, - waitSemaphoreInfoCount: u32, - pWaitSemaphoreInfos: [^]SemaphoreSubmitInfoKHR, - commandBufferInfoCount: u32, - pCommandBufferInfos: [^]CommandBufferSubmitInfoKHR, - signalSemaphoreInfoCount: u32, - pSignalSemaphoreInfos: [^]SemaphoreSubmitInfoKHR, -} - -PhysicalDeviceSynchronization2FeaturesKHR :: struct { - sType: StructureType, - pNext: rawptr, - synchronization2: b32, -} - QueueFamilyCheckpointProperties2NV :: struct { sType: StructureType, pNext: rawptr, - checkpointExecutionStageMask: PipelineStageFlags2KHR, + checkpointExecutionStageMask: PipelineStageFlags2, } CheckpointData2NV :: struct { sType: StructureType, pNext: rawptr, - stage: PipelineStageFlags2KHR, + stage: PipelineStageFlags2, pCheckpointMarker: rawptr, } @@ -2815,12 +3264,6 @@ PhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR :: struct { shaderSubgroupUniformControlFlow: b32, } -PhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR :: struct { - sType: StructureType, - pNext: rawptr, - shaderZeroInitializeWorkgroupMemory: b32, -} - PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR :: struct { sType: StructureType, pNext: rawptr, @@ -2830,117 +3273,6 @@ PhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR :: struct { workgroupMemoryExplicitLayout16BitAccess: b32, } -BufferCopy2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcOffset: DeviceSize, - dstOffset: DeviceSize, - size: DeviceSize, -} - -CopyBufferInfo2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcBuffer: Buffer, - dstBuffer: Buffer, - regionCount: u32, - pRegions: [^]BufferCopy2KHR, -} - -ImageCopy2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcSubresource: ImageSubresourceLayers, - srcOffset: Offset3D, - dstSubresource: ImageSubresourceLayers, - dstOffset: Offset3D, - extent: Extent3D, -} - -CopyImageInfo2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcImage: Image, - srcImageLayout: ImageLayout, - dstImage: Image, - dstImageLayout: ImageLayout, - regionCount: u32, - pRegions: [^]ImageCopy2KHR, -} - -BufferImageCopy2KHR :: struct { - sType: StructureType, - pNext: rawptr, - bufferOffset: DeviceSize, - bufferRowLength: u32, - bufferImageHeight: u32, - imageSubresource: ImageSubresourceLayers, - imageOffset: Offset3D, - imageExtent: Extent3D, -} - -CopyBufferToImageInfo2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcBuffer: Buffer, - dstImage: Image, - dstImageLayout: ImageLayout, - regionCount: u32, - pRegions: [^]BufferImageCopy2KHR, -} - -CopyImageToBufferInfo2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcImage: Image, - srcImageLayout: ImageLayout, - dstBuffer: Buffer, - regionCount: u32, - pRegions: [^]BufferImageCopy2KHR, -} - -ImageBlit2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcSubresource: ImageSubresourceLayers, - srcOffsets: [2]Offset3D, - dstSubresource: ImageSubresourceLayers, - dstOffsets: [2]Offset3D, -} - -BlitImageInfo2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcImage: Image, - srcImageLayout: ImageLayout, - dstImage: Image, - dstImageLayout: ImageLayout, - regionCount: u32, - pRegions: [^]ImageBlit2KHR, - filter: Filter, -} - -ImageResolve2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcSubresource: ImageSubresourceLayers, - srcOffset: Offset3D, - dstSubresource: ImageSubresourceLayers, - dstOffset: Offset3D, - extent: Extent3D, -} - -ResolveImageInfo2KHR :: struct { - sType: StructureType, - pNext: rawptr, - srcImage: Image, - srcImageLayout: ImageLayout, - dstImage: Image, - dstImageLayout: ImageLayout, - regionCount: u32, - pRegions: [^]ImageResolve2KHR, -} - DebugReportCallbackCreateInfoEXT :: struct { sType: StructureType, pNext: rawptr, @@ -3130,12 +3462,6 @@ ValidationFlagsEXT :: struct { pDisabledValidationChecks: [^]ValidationCheckEXT, } -PhysicalDeviceTextureCompressionASTCHDRFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - textureCompressionASTC_HDR: b32, -} - ImageViewASTCDecodeModeEXT :: struct { sType: StructureType, pNext: rawptr, @@ -3385,36 +3711,6 @@ DebugUtilsObjectTagInfoEXT :: struct { pTag: rawptr, } -PhysicalDeviceInlineUniformBlockFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - inlineUniformBlock: b32, - descriptorBindingInlineUniformBlockUpdateAfterBind: b32, -} - -PhysicalDeviceInlineUniformBlockPropertiesEXT :: struct { - sType: StructureType, - pNext: rawptr, - maxInlineUniformBlockSize: u32, - maxPerStageDescriptorInlineUniformBlocks: u32, - maxPerStageDescriptorUpdateAfterBindInlineUniformBlocks: u32, - maxDescriptorSetInlineUniformBlocks: u32, - maxDescriptorSetUpdateAfterBindInlineUniformBlocks: u32, -} - -WriteDescriptorSetInlineUniformBlockEXT :: struct { - sType: StructureType, - pNext: rawptr, - dataSize: u32, - pData: rawptr, -} - -DescriptorPoolInlineUniformBlockCreateInfoEXT :: struct { - sType: StructureType, - pNext: rawptr, - maxInlineUniformBlockBindings: u32, -} - SampleLocationEXT :: struct { x: f32, y: f32, @@ -3570,6 +3866,19 @@ ImageDrmFormatModifierPropertiesEXT :: struct { drmFormatModifier: u64, } +DrmFormatModifierProperties2EXT :: struct { + drmFormatModifier: u64, + drmFormatModifierPlaneCount: u32, + drmFormatModifierTilingFeatures: FormatFeatureFlags2, +} + +DrmFormatModifierPropertiesList2EXT :: struct { + sType: StructureType, + pNext: rawptr, + drmFormatModifierCount: u32, + pDrmFormatModifierProperties: [^]DrmFormatModifierProperties2EXT, +} + ValidationCacheCreateInfoEXT :: struct { sType: StructureType, pNext: rawptr, @@ -3792,12 +4101,6 @@ FilterCubicImageViewImageFormatPropertiesEXT :: struct { filterCubicMinmax: b32, } -DeviceQueueGlobalPriorityCreateInfoEXT :: struct { - sType: StructureType, - pNext: rawptr, - globalPriority: QueueGlobalPriorityEXT, -} - ImportMemoryHostPointerInfoEXT :: struct { sType: StructureType, pNext: rawptr, @@ -3879,19 +4182,6 @@ PhysicalDeviceVertexAttributeDivisorFeaturesEXT :: struct { vertexAttributeInstanceRateZeroDivisor: b32, } -PipelineCreationFeedbackEXT :: struct { - flags: PipelineCreationFeedbackFlagsEXT, - duration: u64, -} - -PipelineCreationFeedbackCreateInfoEXT :: struct { - sType: StructureType, - pNext: rawptr, - pPipelineCreationFeedback: ^PipelineCreationFeedbackEXT, - pipelineStageCreationFeedbackCount: u32, - pPipelineStageCreationFeedbacks: [^]PipelineCreationFeedbackEXT, -} - PhysicalDeviceComputeShaderDerivativesFeaturesNV :: struct { sType: StructureType, pNext: rawptr, @@ -4067,28 +4357,6 @@ RenderPassFragmentDensityMapCreateInfoEXT :: struct { fragmentDensityMapAttachment: AttachmentReference, } -PhysicalDeviceSubgroupSizeControlFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - subgroupSizeControl: b32, - computeFullSubgroups: b32, -} - -PhysicalDeviceSubgroupSizeControlPropertiesEXT :: struct { - sType: StructureType, - pNext: rawptr, - minSubgroupSize: u32, - maxSubgroupSize: u32, - maxComputeWorkgroupSubgroups: u32, - requiredSubgroupSizeStages: ShaderStageFlags, -} - -PipelineShaderStageRequiredSubgroupSizeCreateInfoEXT :: struct { - sType: StructureType, - pNext: rawptr, - requiredSubgroupSize: u32, -} - PhysicalDeviceShaderCoreProperties2AMD :: struct { sType: StructureType, pNext: rawptr, @@ -4148,16 +4416,6 @@ BufferDeviceAddressCreateInfoEXT :: struct { deviceAddress: DeviceAddress, } -PhysicalDeviceToolPropertiesEXT :: struct { - sType: StructureType, - pNext: rawptr, - name: [MAX_EXTENSION_NAME_SIZE]byte, - version: [MAX_EXTENSION_NAME_SIZE]byte, - purposes: ToolPurposeFlagsEXT, - description: [MAX_DESCRIPTION_SIZE]byte, - layer: [MAX_EXTENSION_NAME_SIZE]byte, -} - ValidationFeaturesEXT :: struct { sType: StructureType, pNext: rawptr, @@ -4327,12 +4585,6 @@ PhysicalDeviceShaderAtomicFloat2FeaturesEXT :: struct { sparseImageFloat32AtomicMinMax: b32, } -PhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - shaderDemoteToHelperInvocation: b32, -} - PhysicalDeviceDeviceGeneratedCommandsPropertiesNV :: struct { sType: StructureType, pNext: rawptr, @@ -4472,15 +4724,6 @@ PhysicalDeviceTexelBufferAlignmentFeaturesEXT :: struct { texelBufferAlignment: b32, } -PhysicalDeviceTexelBufferAlignmentPropertiesEXT :: struct { - sType: StructureType, - pNext: rawptr, - storageTexelBufferOffsetAlignmentBytes: DeviceSize, - storageTexelBufferOffsetSingleTexelAlignment: b32, - uniformTexelBufferOffsetAlignmentBytes: DeviceSize, - uniformTexelBufferOffsetSingleTexelAlignment: b32, -} - RenderPassTransformBeginInfoQCOM :: struct { sType: StructureType, pNext: rawptr, @@ -4555,30 +4798,6 @@ PhysicalDeviceCustomBorderColorFeaturesEXT :: struct { customBorderColorWithoutFormat: b32, } -PhysicalDevicePrivateDataFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - privateData: b32, -} - -DevicePrivateDataCreateInfoEXT :: struct { - sType: StructureType, - pNext: rawptr, - privateDataSlotRequestCount: u32, -} - -PrivateDataSlotCreateInfoEXT :: struct { - sType: StructureType, - pNext: rawptr, - flags: PrivateDataSlotCreateFlagsEXT, -} - -PhysicalDevicePipelineCreationCacheControlFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - pipelineCreationCacheControl: b32, -} - PhysicalDeviceDiagnosticsConfigFeaturesNV :: struct { sType: StructureType, pNext: rawptr, @@ -4591,6 +4810,25 @@ DeviceDiagnosticsConfigCreateInfoNV :: struct { flags: DeviceDiagnosticsConfigFlagsNV, } +PhysicalDeviceGraphicsPipelineLibraryFeaturesEXT :: struct { + sType: StructureType, + pNext: rawptr, + graphicsPipelineLibrary: b32, +} + +PhysicalDeviceGraphicsPipelineLibraryPropertiesEXT :: struct { + sType: StructureType, + pNext: rawptr, + graphicsPipelineLibraryFastLinking: b32, + graphicsPipelineLibraryIndependentInterpolationDecoration: b32, +} + +GraphicsPipelineLibraryCreateInfoEXT :: struct { + sType: StructureType, + pNext: rawptr, + flags: GraphicsPipelineLibraryFlagsEXT, +} + PhysicalDeviceFragmentShadingRateEnumsFeaturesNV :: struct { sType: StructureType, pNext: rawptr, @@ -4708,12 +4946,6 @@ CopyCommandTransformInfoQCOM :: struct { transform: SurfaceTransformFlagsKHR, } -PhysicalDeviceImageRobustnessFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - robustImageAccess: b32, -} - PhysicalDevice4444FormatsFeaturesEXT :: struct { sType: StructureType, pNext: rawptr, @@ -4721,6 +4953,20 @@ PhysicalDevice4444FormatsFeaturesEXT :: struct { formatA4B4G4R4: b32, } +PhysicalDeviceRasterizationOrderAttachmentAccessFeaturesARM :: struct { + sType: StructureType, + pNext: rawptr, + rasterizationOrderColorAttachmentAccess: b32, + rasterizationOrderDepthAttachmentAccess: b32, + rasterizationOrderStencilAttachmentAccess: b32, +} + +PhysicalDeviceRGBA10X6FormatsFeaturesEXT :: struct { + sType: StructureType, + pNext: rawptr, + formatRgba10x6WithoutYCbCrSampler: b32, +} + PhysicalDeviceMutableDescriptorTypeFeaturesVALVE :: struct { sType: StructureType, pNext: rawptr, @@ -4774,6 +5020,18 @@ PhysicalDeviceDrmPropertiesEXT :: struct { renderMinor: i64, } +PhysicalDeviceDepthClipControlFeaturesEXT :: struct { + sType: StructureType, + pNext: rawptr, + depthClipControl: b32, +} + +PipelineViewportDepthClipControlCreateInfoEXT :: struct { + sType: StructureType, + pNext: rawptr, + negativeOneToOne: b32, +} + PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT :: struct { sType: StructureType, pNext: rawptr, @@ -4840,17 +5098,24 @@ PipelineColorWriteCreateInfoEXT :: struct { pColorWriteEnables: [^]b32, } -PhysicalDeviceGlobalPriorityQueryFeaturesEXT :: struct { - sType: StructureType, - pNext: rawptr, - globalPriorityQuery: b32, +PhysicalDevicePrimitivesGeneratedQueryFeaturesEXT :: struct { + sType: StructureType, + pNext: rawptr, + primitivesGeneratedQuery: b32, + primitivesGeneratedQueryWithRasterizerDiscard: b32, + primitivesGeneratedQueryWithNonZeroStreams: b32, } -QueueFamilyGlobalPriorityPropertiesEXT :: struct { - sType: StructureType, - pNext: rawptr, - priorityCount: u32, - priorities: [MAX_GLOBAL_PRIORITY_SIZE_EXT]QueueGlobalPriorityEXT, +PhysicalDeviceImageViewMinLodFeaturesEXT :: struct { + sType: StructureType, + pNext: rawptr, + minLod: b32, +} + +ImageViewMinLodCreateInfoEXT :: struct { + sType: StructureType, + pNext: rawptr, + minLod: f32, } PhysicalDeviceMultiDrawFeaturesEXT :: struct { @@ -4876,12 +5141,78 @@ MultiDrawIndexedInfoEXT :: struct { vertexOffset: i32, } +PhysicalDeviceImage2DViewOf3DFeaturesEXT :: struct { + sType: StructureType, + pNext: rawptr, + image2DViewOf3D: b32, + sampler2DViewOf3D: b32, +} + +PhysicalDeviceBorderColorSwizzleFeaturesEXT :: struct { + sType: StructureType, + pNext: rawptr, + borderColorSwizzle: b32, + borderColorSwizzleFromImage: b32, +} + +SamplerBorderColorComponentMappingCreateInfoEXT :: struct { + sType: StructureType, + pNext: rawptr, + components: ComponentMapping, + srgb: b32, +} + PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT :: struct { sType: StructureType, pNext: rawptr, pageableDeviceLocalMemory: b32, } +PhysicalDeviceDescriptorSetHostMappingFeaturesVALVE :: struct { + sType: StructureType, + pNext: rawptr, + descriptorSetHostMapping: b32, +} + +DescriptorSetBindingReferenceVALVE :: struct { + sType: StructureType, + pNext: rawptr, + descriptorSetLayout: DescriptorSetLayout, + binding: u32, +} + +DescriptorSetLayoutHostMappingInfoVALVE :: struct { + sType: StructureType, + pNext: rawptr, + descriptorOffset: int, + descriptorSize: u32, +} + +PhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM :: struct { + sType: StructureType, + pNext: rawptr, + fragmentDensityMapOffset: b32, +} + +PhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM :: struct { + sType: StructureType, + pNext: rawptr, + fragmentDensityOffsetGranularity: Extent2D, +} + +SubpassFragmentDensityMapOffsetEndInfoQCOM :: struct { + sType: StructureType, + pNext: rawptr, + fragmentDensityOffsetCount: u32, + pFragmentDensityOffsets: [^]Offset2D, +} + +PhysicalDeviceLinearColorAttachmentFeaturesNV :: struct { + sType: StructureType, + pNext: rawptr, + linearColorAttachment: b32, +} + DeviceOrHostAddressKHR :: struct #raw_union { deviceAddress: DeviceAddress, hostAddress: rawptr, @@ -5283,178 +5614,252 @@ IOSSurfaceCreateInfoMVK :: struct { } // Aliases -PhysicalDeviceVariablePointerFeatures :: PhysicalDeviceVariablePointersFeatures -PhysicalDeviceShaderDrawParameterFeatures :: PhysicalDeviceShaderDrawParametersFeatures -RenderPassMultiviewCreateInfoKHR :: RenderPassMultiviewCreateInfo -PhysicalDeviceMultiviewFeaturesKHR :: PhysicalDeviceMultiviewFeatures -PhysicalDeviceMultiviewPropertiesKHR :: PhysicalDeviceMultiviewProperties -PhysicalDeviceFeatures2KHR :: PhysicalDeviceFeatures2 -PhysicalDeviceProperties2KHR :: PhysicalDeviceProperties2 -FormatProperties2KHR :: FormatProperties2 -ImageFormatProperties2KHR :: ImageFormatProperties2 -PhysicalDeviceImageFormatInfo2KHR :: PhysicalDeviceImageFormatInfo2 -QueueFamilyProperties2KHR :: QueueFamilyProperties2 -PhysicalDeviceMemoryProperties2KHR :: PhysicalDeviceMemoryProperties2 -SparseImageFormatProperties2KHR :: SparseImageFormatProperties2 -PhysicalDeviceSparseImageFormatInfo2KHR :: PhysicalDeviceSparseImageFormatInfo2 -PeerMemoryFeatureFlagsKHR :: PeerMemoryFeatureFlags -PeerMemoryFeatureFlagKHR :: PeerMemoryFeatureFlag -MemoryAllocateFlagsKHR :: MemoryAllocateFlags -MemoryAllocateFlagKHR :: MemoryAllocateFlag -MemoryAllocateFlagsInfoKHR :: MemoryAllocateFlagsInfo -DeviceGroupRenderPassBeginInfoKHR :: DeviceGroupRenderPassBeginInfo -DeviceGroupCommandBufferBeginInfoKHR :: DeviceGroupCommandBufferBeginInfo -DeviceGroupSubmitInfoKHR :: DeviceGroupSubmitInfo -DeviceGroupBindSparseInfoKHR :: DeviceGroupBindSparseInfo -BindBufferMemoryDeviceGroupInfoKHR :: BindBufferMemoryDeviceGroupInfo -BindImageMemoryDeviceGroupInfoKHR :: BindImageMemoryDeviceGroupInfo -CommandPoolTrimFlagsKHR :: CommandPoolTrimFlags -PhysicalDeviceGroupPropertiesKHR :: PhysicalDeviceGroupProperties -DeviceGroupDeviceCreateInfoKHR :: DeviceGroupDeviceCreateInfo -ExternalMemoryHandleTypeFlagsKHR :: ExternalMemoryHandleTypeFlags -ExternalMemoryHandleTypeFlagKHR :: ExternalMemoryHandleTypeFlag -ExternalMemoryFeatureFlagsKHR :: ExternalMemoryFeatureFlags -ExternalMemoryFeatureFlagKHR :: ExternalMemoryFeatureFlag -ExternalMemoryPropertiesKHR :: ExternalMemoryProperties -PhysicalDeviceExternalImageFormatInfoKHR :: PhysicalDeviceExternalImageFormatInfo -ExternalImageFormatPropertiesKHR :: ExternalImageFormatProperties -PhysicalDeviceExternalBufferInfoKHR :: PhysicalDeviceExternalBufferInfo -ExternalBufferPropertiesKHR :: ExternalBufferProperties -PhysicalDeviceIDPropertiesKHR :: PhysicalDeviceIDProperties -ExternalMemoryImageCreateInfoKHR :: ExternalMemoryImageCreateInfo -ExternalMemoryBufferCreateInfoKHR :: ExternalMemoryBufferCreateInfo -ExportMemoryAllocateInfoKHR :: ExportMemoryAllocateInfo -ExternalSemaphoreHandleTypeFlagsKHR :: ExternalSemaphoreHandleTypeFlags -ExternalSemaphoreHandleTypeFlagKHR :: ExternalSemaphoreHandleTypeFlag -ExternalSemaphoreFeatureFlagsKHR :: ExternalSemaphoreFeatureFlags -ExternalSemaphoreFeatureFlagKHR :: ExternalSemaphoreFeatureFlag -PhysicalDeviceExternalSemaphoreInfoKHR :: PhysicalDeviceExternalSemaphoreInfo -ExternalSemaphorePropertiesKHR :: ExternalSemaphoreProperties -SemaphoreImportFlagsKHR :: SemaphoreImportFlags -SemaphoreImportFlagKHR :: SemaphoreImportFlag -ExportSemaphoreCreateInfoKHR :: ExportSemaphoreCreateInfo -PhysicalDeviceShaderFloat16Int8FeaturesKHR :: PhysicalDeviceShaderFloat16Int8Features -PhysicalDeviceFloat16Int8FeaturesKHR :: PhysicalDeviceShaderFloat16Int8Features -PhysicalDevice16BitStorageFeaturesKHR :: PhysicalDevice16BitStorageFeatures -DescriptorUpdateTemplateKHR :: DescriptorUpdateTemplate -DescriptorUpdateTemplateTypeKHR :: DescriptorUpdateTemplateType -DescriptorUpdateTemplateCreateFlagsKHR :: DescriptorUpdateTemplateCreateFlags -DescriptorUpdateTemplateEntryKHR :: DescriptorUpdateTemplateEntry -DescriptorUpdateTemplateCreateInfoKHR :: DescriptorUpdateTemplateCreateInfo -PhysicalDeviceImagelessFramebufferFeaturesKHR :: PhysicalDeviceImagelessFramebufferFeatures -FramebufferAttachmentsCreateInfoKHR :: FramebufferAttachmentsCreateInfo -FramebufferAttachmentImageInfoKHR :: FramebufferAttachmentImageInfo -RenderPassAttachmentBeginInfoKHR :: RenderPassAttachmentBeginInfo -RenderPassCreateInfo2KHR :: RenderPassCreateInfo2 -AttachmentDescription2KHR :: AttachmentDescription2 -AttachmentReference2KHR :: AttachmentReference2 -SubpassDescription2KHR :: SubpassDescription2 -SubpassDependency2KHR :: SubpassDependency2 -SubpassBeginInfoKHR :: SubpassBeginInfo -SubpassEndInfoKHR :: SubpassEndInfo -ExternalFenceHandleTypeFlagsKHR :: ExternalFenceHandleTypeFlags -ExternalFenceHandleTypeFlagKHR :: ExternalFenceHandleTypeFlag -ExternalFenceFeatureFlagsKHR :: ExternalFenceFeatureFlags -ExternalFenceFeatureFlagKHR :: ExternalFenceFeatureFlag -PhysicalDeviceExternalFenceInfoKHR :: PhysicalDeviceExternalFenceInfo -ExternalFencePropertiesKHR :: ExternalFenceProperties -FenceImportFlagsKHR :: FenceImportFlags -FenceImportFlagKHR :: FenceImportFlag -ExportFenceCreateInfoKHR :: ExportFenceCreateInfo -PointClippingBehaviorKHR :: PointClippingBehavior -TessellationDomainOriginKHR :: TessellationDomainOrigin -PhysicalDevicePointClippingPropertiesKHR :: PhysicalDevicePointClippingProperties -RenderPassInputAttachmentAspectCreateInfoKHR :: RenderPassInputAttachmentAspectCreateInfo -InputAttachmentAspectReferenceKHR :: InputAttachmentAspectReference -ImageViewUsageCreateInfoKHR :: ImageViewUsageCreateInfo -PipelineTessellationDomainOriginStateCreateInfoKHR :: PipelineTessellationDomainOriginStateCreateInfo -PhysicalDeviceVariablePointerFeaturesKHR :: PhysicalDeviceVariablePointersFeatures -PhysicalDeviceVariablePointersFeaturesKHR :: PhysicalDeviceVariablePointersFeatures -MemoryDedicatedRequirementsKHR :: MemoryDedicatedRequirements -MemoryDedicatedAllocateInfoKHR :: MemoryDedicatedAllocateInfo -BufferMemoryRequirementsInfo2KHR :: BufferMemoryRequirementsInfo2 -ImageMemoryRequirementsInfo2KHR :: ImageMemoryRequirementsInfo2 -ImageSparseMemoryRequirementsInfo2KHR :: ImageSparseMemoryRequirementsInfo2 -MemoryRequirements2KHR :: MemoryRequirements2 -SparseImageMemoryRequirements2KHR :: SparseImageMemoryRequirements2 -ImageFormatListCreateInfoKHR :: ImageFormatListCreateInfo -SamplerYcbcrConversionKHR :: SamplerYcbcrConversion -SamplerYcbcrModelConversionKHR :: SamplerYcbcrModelConversion -SamplerYcbcrRangeKHR :: SamplerYcbcrRange -ChromaLocationKHR :: ChromaLocation -SamplerYcbcrConversionCreateInfoKHR :: SamplerYcbcrConversionCreateInfo -SamplerYcbcrConversionInfoKHR :: SamplerYcbcrConversionInfo -BindImagePlaneMemoryInfoKHR :: BindImagePlaneMemoryInfo -ImagePlaneMemoryRequirementsInfoKHR :: ImagePlaneMemoryRequirementsInfo -PhysicalDeviceSamplerYcbcrConversionFeaturesKHR :: PhysicalDeviceSamplerYcbcrConversionFeatures -SamplerYcbcrConversionImageFormatPropertiesKHR :: SamplerYcbcrConversionImageFormatProperties -BindBufferMemoryInfoKHR :: BindBufferMemoryInfo -BindImageMemoryInfoKHR :: BindImageMemoryInfo -PhysicalDeviceMaintenance3PropertiesKHR :: PhysicalDeviceMaintenance3Properties -DescriptorSetLayoutSupportKHR :: DescriptorSetLayoutSupport -PhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR :: PhysicalDeviceShaderSubgroupExtendedTypesFeatures -PhysicalDevice8BitStorageFeaturesKHR :: PhysicalDevice8BitStorageFeatures -PhysicalDeviceShaderAtomicInt64FeaturesKHR :: PhysicalDeviceShaderAtomicInt64Features -DriverIdKHR :: DriverId -ConformanceVersionKHR :: ConformanceVersion -PhysicalDeviceDriverPropertiesKHR :: PhysicalDeviceDriverProperties -ShaderFloatControlsIndependenceKHR :: ShaderFloatControlsIndependence -PhysicalDeviceFloatControlsPropertiesKHR :: PhysicalDeviceFloatControlsProperties -ResolveModeFlagKHR :: ResolveModeFlag -ResolveModeFlagsKHR :: ResolveModeFlags -SubpassDescriptionDepthStencilResolveKHR :: SubpassDescriptionDepthStencilResolve -PhysicalDeviceDepthStencilResolvePropertiesKHR :: PhysicalDeviceDepthStencilResolveProperties -SemaphoreTypeKHR :: SemaphoreType -SemaphoreWaitFlagKHR :: SemaphoreWaitFlag -SemaphoreWaitFlagsKHR :: SemaphoreWaitFlags -PhysicalDeviceTimelineSemaphoreFeaturesKHR :: PhysicalDeviceTimelineSemaphoreFeatures -PhysicalDeviceTimelineSemaphorePropertiesKHR :: PhysicalDeviceTimelineSemaphoreProperties -SemaphoreTypeCreateInfoKHR :: SemaphoreTypeCreateInfo -TimelineSemaphoreSubmitInfoKHR :: TimelineSemaphoreSubmitInfo -SemaphoreWaitInfoKHR :: SemaphoreWaitInfo -SemaphoreSignalInfoKHR :: SemaphoreSignalInfo -PhysicalDeviceVulkanMemoryModelFeaturesKHR :: PhysicalDeviceVulkanMemoryModelFeatures -PhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR :: PhysicalDeviceSeparateDepthStencilLayoutsFeatures -AttachmentReferenceStencilLayoutKHR :: AttachmentReferenceStencilLayout -AttachmentDescriptionStencilLayoutKHR :: AttachmentDescriptionStencilLayout -PhysicalDeviceUniformBufferStandardLayoutFeaturesKHR :: PhysicalDeviceUniformBufferStandardLayoutFeatures -PhysicalDeviceBufferDeviceAddressFeaturesKHR :: PhysicalDeviceBufferDeviceAddressFeatures -BufferDeviceAddressInfoKHR :: BufferDeviceAddressInfo -BufferOpaqueCaptureAddressCreateInfoKHR :: BufferOpaqueCaptureAddressCreateInfo -MemoryOpaqueCaptureAddressAllocateInfoKHR :: MemoryOpaqueCaptureAddressAllocateInfo -DeviceMemoryOpaqueCaptureAddressInfoKHR :: DeviceMemoryOpaqueCaptureAddressInfo -PipelineStageFlags2KHR :: Flags64 -PipelineStageFlag2KHR :: Flags64 -AccessFlags2KHR :: Flags64 -AccessFlag2KHR :: Flags64 -SamplerReductionModeEXT :: SamplerReductionMode -SamplerReductionModeCreateInfoEXT :: SamplerReductionModeCreateInfo -PhysicalDeviceSamplerFilterMinmaxPropertiesEXT :: PhysicalDeviceSamplerFilterMinmaxProperties -DescriptorBindingFlagEXT :: DescriptorBindingFlag -DescriptorBindingFlagsEXT :: DescriptorBindingFlags -DescriptorSetLayoutBindingFlagsCreateInfoEXT :: DescriptorSetLayoutBindingFlagsCreateInfo -PhysicalDeviceDescriptorIndexingFeaturesEXT :: PhysicalDeviceDescriptorIndexingFeatures -PhysicalDeviceDescriptorIndexingPropertiesEXT :: PhysicalDeviceDescriptorIndexingProperties -DescriptorSetVariableDescriptorCountAllocateInfoEXT :: DescriptorSetVariableDescriptorCountAllocateInfo -DescriptorSetVariableDescriptorCountLayoutSupportEXT :: DescriptorSetVariableDescriptorCountLayoutSupport -RayTracingShaderGroupTypeNV :: RayTracingShaderGroupTypeKHR -GeometryTypeNV :: GeometryTypeKHR -AccelerationStructureTypeNV :: AccelerationStructureTypeKHR -CopyAccelerationStructureModeNV :: CopyAccelerationStructureModeKHR -GeometryFlagsNV :: GeometryFlagsKHR -GeometryFlagNV :: GeometryFlagKHR -GeometryInstanceFlagsNV :: GeometryInstanceFlagsKHR -GeometryInstanceFlagNV :: GeometryInstanceFlagKHR -BuildAccelerationStructureFlagsNV :: BuildAccelerationStructureFlagsKHR -BuildAccelerationStructureFlagNV :: BuildAccelerationStructureFlagKHR -TransformMatrixNV :: TransformMatrixKHR -AabbPositionsNV :: AabbPositionsKHR -AccelerationStructureInstanceNV :: AccelerationStructureInstanceKHR -QueryPoolCreateInfoINTEL :: QueryPoolPerformanceQueryCreateInfoINTEL -PhysicalDeviceScalarBlockLayoutFeaturesEXT :: PhysicalDeviceScalarBlockLayoutFeatures -PhysicalDeviceBufferAddressFeaturesEXT :: PhysicalDeviceBufferDeviceAddressFeaturesEXT -BufferDeviceAddressInfoEXT :: BufferDeviceAddressInfo -ImageStencilUsageCreateInfoEXT :: ImageStencilUsageCreateInfo -PhysicalDeviceHostQueryResetFeaturesEXT :: PhysicalDeviceHostQueryResetFeatures +PhysicalDeviceVariablePointerFeatures :: PhysicalDeviceVariablePointersFeatures +PhysicalDeviceShaderDrawParameterFeatures :: PhysicalDeviceShaderDrawParametersFeatures +PipelineStageFlags2 :: Flags64 +PipelineStageFlag2 :: Flags64 +AccessFlags2 :: Flags64 +AccessFlag2 :: Flags64 +FormatFeatureFlags2 :: Flags64 +FormatFeatureFlag2 :: Flags64 +RenderingFlagsKHR :: RenderingFlags +RenderingFlagKHR :: RenderingFlag +RenderingInfoKHR :: RenderingInfo +RenderingAttachmentInfoKHR :: RenderingAttachmentInfo +PipelineRenderingCreateInfoKHR :: PipelineRenderingCreateInfo +PhysicalDeviceDynamicRenderingFeaturesKHR :: PhysicalDeviceDynamicRenderingFeatures +CommandBufferInheritanceRenderingInfoKHR :: CommandBufferInheritanceRenderingInfo +AttachmentSampleCountInfoNV :: AttachmentSampleCountInfoAMD +RenderPassMultiviewCreateInfoKHR :: RenderPassMultiviewCreateInfo +PhysicalDeviceMultiviewFeaturesKHR :: PhysicalDeviceMultiviewFeatures +PhysicalDeviceMultiviewPropertiesKHR :: PhysicalDeviceMultiviewProperties +PhysicalDeviceFeatures2KHR :: PhysicalDeviceFeatures2 +PhysicalDeviceProperties2KHR :: PhysicalDeviceProperties2 +FormatProperties2KHR :: FormatProperties2 +ImageFormatProperties2KHR :: ImageFormatProperties2 +PhysicalDeviceImageFormatInfo2KHR :: PhysicalDeviceImageFormatInfo2 +QueueFamilyProperties2KHR :: QueueFamilyProperties2 +PhysicalDeviceMemoryProperties2KHR :: PhysicalDeviceMemoryProperties2 +SparseImageFormatProperties2KHR :: SparseImageFormatProperties2 +PhysicalDeviceSparseImageFormatInfo2KHR :: PhysicalDeviceSparseImageFormatInfo2 +PeerMemoryFeatureFlagsKHR :: PeerMemoryFeatureFlags +PeerMemoryFeatureFlagKHR :: PeerMemoryFeatureFlag +MemoryAllocateFlagsKHR :: MemoryAllocateFlags +MemoryAllocateFlagKHR :: MemoryAllocateFlag +MemoryAllocateFlagsInfoKHR :: MemoryAllocateFlagsInfo +DeviceGroupRenderPassBeginInfoKHR :: DeviceGroupRenderPassBeginInfo +DeviceGroupCommandBufferBeginInfoKHR :: DeviceGroupCommandBufferBeginInfo +DeviceGroupSubmitInfoKHR :: DeviceGroupSubmitInfo +DeviceGroupBindSparseInfoKHR :: DeviceGroupBindSparseInfo +BindBufferMemoryDeviceGroupInfoKHR :: BindBufferMemoryDeviceGroupInfo +BindImageMemoryDeviceGroupInfoKHR :: BindImageMemoryDeviceGroupInfo +CommandPoolTrimFlagsKHR :: CommandPoolTrimFlags +PhysicalDeviceGroupPropertiesKHR :: PhysicalDeviceGroupProperties +DeviceGroupDeviceCreateInfoKHR :: DeviceGroupDeviceCreateInfo +ExternalMemoryHandleTypeFlagsKHR :: ExternalMemoryHandleTypeFlags +ExternalMemoryHandleTypeFlagKHR :: ExternalMemoryHandleTypeFlag +ExternalMemoryFeatureFlagsKHR :: ExternalMemoryFeatureFlags +ExternalMemoryFeatureFlagKHR :: ExternalMemoryFeatureFlag +ExternalMemoryPropertiesKHR :: ExternalMemoryProperties +PhysicalDeviceExternalImageFormatInfoKHR :: PhysicalDeviceExternalImageFormatInfo +ExternalImageFormatPropertiesKHR :: ExternalImageFormatProperties +PhysicalDeviceExternalBufferInfoKHR :: PhysicalDeviceExternalBufferInfo +ExternalBufferPropertiesKHR :: ExternalBufferProperties +PhysicalDeviceIDPropertiesKHR :: PhysicalDeviceIDProperties +ExternalMemoryImageCreateInfoKHR :: ExternalMemoryImageCreateInfo +ExternalMemoryBufferCreateInfoKHR :: ExternalMemoryBufferCreateInfo +ExportMemoryAllocateInfoKHR :: ExportMemoryAllocateInfo +ExternalSemaphoreHandleTypeFlagsKHR :: ExternalSemaphoreHandleTypeFlags +ExternalSemaphoreHandleTypeFlagKHR :: ExternalSemaphoreHandleTypeFlag +ExternalSemaphoreFeatureFlagsKHR :: ExternalSemaphoreFeatureFlags +ExternalSemaphoreFeatureFlagKHR :: ExternalSemaphoreFeatureFlag +PhysicalDeviceExternalSemaphoreInfoKHR :: PhysicalDeviceExternalSemaphoreInfo +ExternalSemaphorePropertiesKHR :: ExternalSemaphoreProperties +SemaphoreImportFlagsKHR :: SemaphoreImportFlags +SemaphoreImportFlagKHR :: SemaphoreImportFlag +ExportSemaphoreCreateInfoKHR :: ExportSemaphoreCreateInfo +PhysicalDeviceShaderFloat16Int8FeaturesKHR :: PhysicalDeviceShaderFloat16Int8Features +PhysicalDeviceFloat16Int8FeaturesKHR :: PhysicalDeviceShaderFloat16Int8Features +PhysicalDevice16BitStorageFeaturesKHR :: PhysicalDevice16BitStorageFeatures +DescriptorUpdateTemplateKHR :: DescriptorUpdateTemplate +DescriptorUpdateTemplateTypeKHR :: DescriptorUpdateTemplateType +DescriptorUpdateTemplateCreateFlagsKHR :: DescriptorUpdateTemplateCreateFlags +DescriptorUpdateTemplateEntryKHR :: DescriptorUpdateTemplateEntry +DescriptorUpdateTemplateCreateInfoKHR :: DescriptorUpdateTemplateCreateInfo +PhysicalDeviceImagelessFramebufferFeaturesKHR :: PhysicalDeviceImagelessFramebufferFeatures +FramebufferAttachmentsCreateInfoKHR :: FramebufferAttachmentsCreateInfo +FramebufferAttachmentImageInfoKHR :: FramebufferAttachmentImageInfo +RenderPassAttachmentBeginInfoKHR :: RenderPassAttachmentBeginInfo +RenderPassCreateInfo2KHR :: RenderPassCreateInfo2 +AttachmentDescription2KHR :: AttachmentDescription2 +AttachmentReference2KHR :: AttachmentReference2 +SubpassDescription2KHR :: SubpassDescription2 +SubpassDependency2KHR :: SubpassDependency2 +SubpassBeginInfoKHR :: SubpassBeginInfo +SubpassEndInfoKHR :: SubpassEndInfo +ExternalFenceHandleTypeFlagsKHR :: ExternalFenceHandleTypeFlags +ExternalFenceHandleTypeFlagKHR :: ExternalFenceHandleTypeFlag +ExternalFenceFeatureFlagsKHR :: ExternalFenceFeatureFlags +ExternalFenceFeatureFlagKHR :: ExternalFenceFeatureFlag +PhysicalDeviceExternalFenceInfoKHR :: PhysicalDeviceExternalFenceInfo +ExternalFencePropertiesKHR :: ExternalFenceProperties +FenceImportFlagsKHR :: FenceImportFlags +FenceImportFlagKHR :: FenceImportFlag +ExportFenceCreateInfoKHR :: ExportFenceCreateInfo +PointClippingBehaviorKHR :: PointClippingBehavior +TessellationDomainOriginKHR :: TessellationDomainOrigin +PhysicalDevicePointClippingPropertiesKHR :: PhysicalDevicePointClippingProperties +RenderPassInputAttachmentAspectCreateInfoKHR :: RenderPassInputAttachmentAspectCreateInfo +InputAttachmentAspectReferenceKHR :: InputAttachmentAspectReference +ImageViewUsageCreateInfoKHR :: ImageViewUsageCreateInfo +PipelineTessellationDomainOriginStateCreateInfoKHR :: PipelineTessellationDomainOriginStateCreateInfo +PhysicalDeviceVariablePointerFeaturesKHR :: PhysicalDeviceVariablePointersFeatures +PhysicalDeviceVariablePointersFeaturesKHR :: PhysicalDeviceVariablePointersFeatures +MemoryDedicatedRequirementsKHR :: MemoryDedicatedRequirements +MemoryDedicatedAllocateInfoKHR :: MemoryDedicatedAllocateInfo +BufferMemoryRequirementsInfo2KHR :: BufferMemoryRequirementsInfo2 +ImageMemoryRequirementsInfo2KHR :: ImageMemoryRequirementsInfo2 +ImageSparseMemoryRequirementsInfo2KHR :: ImageSparseMemoryRequirementsInfo2 +MemoryRequirements2KHR :: MemoryRequirements2 +SparseImageMemoryRequirements2KHR :: SparseImageMemoryRequirements2 +ImageFormatListCreateInfoKHR :: ImageFormatListCreateInfo +SamplerYcbcrConversionKHR :: SamplerYcbcrConversion +SamplerYcbcrModelConversionKHR :: SamplerYcbcrModelConversion +SamplerYcbcrRangeKHR :: SamplerYcbcrRange +ChromaLocationKHR :: ChromaLocation +SamplerYcbcrConversionCreateInfoKHR :: SamplerYcbcrConversionCreateInfo +SamplerYcbcrConversionInfoKHR :: SamplerYcbcrConversionInfo +BindImagePlaneMemoryInfoKHR :: BindImagePlaneMemoryInfo +ImagePlaneMemoryRequirementsInfoKHR :: ImagePlaneMemoryRequirementsInfo +PhysicalDeviceSamplerYcbcrConversionFeaturesKHR :: PhysicalDeviceSamplerYcbcrConversionFeatures +SamplerYcbcrConversionImageFormatPropertiesKHR :: SamplerYcbcrConversionImageFormatProperties +BindBufferMemoryInfoKHR :: BindBufferMemoryInfo +BindImageMemoryInfoKHR :: BindImageMemoryInfo +PhysicalDeviceMaintenance3PropertiesKHR :: PhysicalDeviceMaintenance3Properties +DescriptorSetLayoutSupportKHR :: DescriptorSetLayoutSupport +PhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR :: PhysicalDeviceShaderSubgroupExtendedTypesFeatures +PhysicalDevice8BitStorageFeaturesKHR :: PhysicalDevice8BitStorageFeatures +PhysicalDeviceShaderAtomicInt64FeaturesKHR :: PhysicalDeviceShaderAtomicInt64Features +DriverIdKHR :: DriverId +ConformanceVersionKHR :: ConformanceVersion +PhysicalDeviceDriverPropertiesKHR :: PhysicalDeviceDriverProperties +ShaderFloatControlsIndependenceKHR :: ShaderFloatControlsIndependence +PhysicalDeviceFloatControlsPropertiesKHR :: PhysicalDeviceFloatControlsProperties +ResolveModeFlagKHR :: ResolveModeFlag +ResolveModeFlagsKHR :: ResolveModeFlags +SubpassDescriptionDepthStencilResolveKHR :: SubpassDescriptionDepthStencilResolve +PhysicalDeviceDepthStencilResolvePropertiesKHR :: PhysicalDeviceDepthStencilResolveProperties +SemaphoreTypeKHR :: SemaphoreType +SemaphoreWaitFlagKHR :: SemaphoreWaitFlag +SemaphoreWaitFlagsKHR :: SemaphoreWaitFlags +PhysicalDeviceTimelineSemaphoreFeaturesKHR :: PhysicalDeviceTimelineSemaphoreFeatures +PhysicalDeviceTimelineSemaphorePropertiesKHR :: PhysicalDeviceTimelineSemaphoreProperties +SemaphoreTypeCreateInfoKHR :: SemaphoreTypeCreateInfo +TimelineSemaphoreSubmitInfoKHR :: TimelineSemaphoreSubmitInfo +SemaphoreWaitInfoKHR :: SemaphoreWaitInfo +SemaphoreSignalInfoKHR :: SemaphoreSignalInfo +PhysicalDeviceVulkanMemoryModelFeaturesKHR :: PhysicalDeviceVulkanMemoryModelFeatures +PhysicalDeviceShaderTerminateInvocationFeaturesKHR :: PhysicalDeviceShaderTerminateInvocationFeatures +PhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR :: PhysicalDeviceSeparateDepthStencilLayoutsFeatures +AttachmentReferenceStencilLayoutKHR :: AttachmentReferenceStencilLayout +AttachmentDescriptionStencilLayoutKHR :: AttachmentDescriptionStencilLayout +PhysicalDeviceUniformBufferStandardLayoutFeaturesKHR :: PhysicalDeviceUniformBufferStandardLayoutFeatures +PhysicalDeviceBufferDeviceAddressFeaturesKHR :: PhysicalDeviceBufferDeviceAddressFeatures +BufferDeviceAddressInfoKHR :: BufferDeviceAddressInfo +BufferOpaqueCaptureAddressCreateInfoKHR :: BufferOpaqueCaptureAddressCreateInfo +MemoryOpaqueCaptureAddressAllocateInfoKHR :: MemoryOpaqueCaptureAddressAllocateInfo +DeviceMemoryOpaqueCaptureAddressInfoKHR :: DeviceMemoryOpaqueCaptureAddressInfo +PhysicalDeviceShaderIntegerDotProductFeaturesKHR :: PhysicalDeviceShaderIntegerDotProductFeatures +PhysicalDeviceShaderIntegerDotProductPropertiesKHR :: PhysicalDeviceShaderIntegerDotProductProperties +PipelineStageFlags2KHR :: PipelineStageFlags2 +PipelineStageFlag2KHR :: PipelineStageFlag2 +AccessFlags2KHR :: AccessFlags2 +AccessFlag2KHR :: AccessFlag2 +SubmitFlagKHR :: SubmitFlag +SubmitFlagsKHR :: SubmitFlags +MemoryBarrier2KHR :: MemoryBarrier2 +BufferMemoryBarrier2KHR :: BufferMemoryBarrier2 +ImageMemoryBarrier2KHR :: ImageMemoryBarrier2 +DependencyInfoKHR :: DependencyInfo +SubmitInfo2KHR :: SubmitInfo2 +SemaphoreSubmitInfoKHR :: SemaphoreSubmitInfo +CommandBufferSubmitInfoKHR :: CommandBufferSubmitInfo +PhysicalDeviceSynchronization2FeaturesKHR :: PhysicalDeviceSynchronization2Features +PhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR :: PhysicalDeviceZeroInitializeWorkgroupMemoryFeatures +CopyBufferInfo2KHR :: CopyBufferInfo2 +CopyImageInfo2KHR :: CopyImageInfo2 +CopyBufferToImageInfo2KHR :: CopyBufferToImageInfo2 +CopyImageToBufferInfo2KHR :: CopyImageToBufferInfo2 +BlitImageInfo2KHR :: BlitImageInfo2 +ResolveImageInfo2KHR :: ResolveImageInfo2 +BufferCopy2KHR :: BufferCopy2 +ImageCopy2KHR :: ImageCopy2 +ImageBlit2KHR :: ImageBlit2 +BufferImageCopy2KHR :: BufferImageCopy2 +ImageResolve2KHR :: ImageResolve2 +FormatFeatureFlags2KHR :: FormatFeatureFlags2 +FormatFeatureFlag2KHR :: FormatFeatureFlag2 +FormatProperties3KHR :: FormatProperties3 +PhysicalDeviceMaintenance4FeaturesKHR :: PhysicalDeviceMaintenance4Features +PhysicalDeviceMaintenance4PropertiesKHR :: PhysicalDeviceMaintenance4Properties +DeviceBufferMemoryRequirementsKHR :: DeviceBufferMemoryRequirements +DeviceImageMemoryRequirementsKHR :: DeviceImageMemoryRequirements +PhysicalDeviceTextureCompressionASTCHDRFeaturesEXT :: PhysicalDeviceTextureCompressionASTCHDRFeatures +SamplerReductionModeEXT :: SamplerReductionMode +SamplerReductionModeCreateInfoEXT :: SamplerReductionModeCreateInfo +PhysicalDeviceSamplerFilterMinmaxPropertiesEXT :: PhysicalDeviceSamplerFilterMinmaxProperties +PhysicalDeviceInlineUniformBlockFeaturesEXT :: PhysicalDeviceInlineUniformBlockFeatures +PhysicalDeviceInlineUniformBlockPropertiesEXT :: PhysicalDeviceInlineUniformBlockProperties +WriteDescriptorSetInlineUniformBlockEXT :: WriteDescriptorSetInlineUniformBlock +DescriptorPoolInlineUniformBlockCreateInfoEXT :: DescriptorPoolInlineUniformBlockCreateInfo +DescriptorBindingFlagEXT :: DescriptorBindingFlag +DescriptorBindingFlagsEXT :: DescriptorBindingFlags +DescriptorSetLayoutBindingFlagsCreateInfoEXT :: DescriptorSetLayoutBindingFlagsCreateInfo +PhysicalDeviceDescriptorIndexingFeaturesEXT :: PhysicalDeviceDescriptorIndexingFeatures +PhysicalDeviceDescriptorIndexingPropertiesEXT :: PhysicalDeviceDescriptorIndexingProperties +DescriptorSetVariableDescriptorCountAllocateInfoEXT :: DescriptorSetVariableDescriptorCountAllocateInfo +DescriptorSetVariableDescriptorCountLayoutSupportEXT :: DescriptorSetVariableDescriptorCountLayoutSupport +RayTracingShaderGroupTypeNV :: RayTracingShaderGroupTypeKHR +GeometryTypeNV :: GeometryTypeKHR +AccelerationStructureTypeNV :: AccelerationStructureTypeKHR +CopyAccelerationStructureModeNV :: CopyAccelerationStructureModeKHR +GeometryFlagsNV :: GeometryFlagsKHR +GeometryFlagNV :: GeometryFlagKHR +GeometryInstanceFlagsNV :: GeometryInstanceFlagsKHR +GeometryInstanceFlagNV :: GeometryInstanceFlagKHR +BuildAccelerationStructureFlagsNV :: BuildAccelerationStructureFlagsKHR +BuildAccelerationStructureFlagNV :: BuildAccelerationStructureFlagKHR +TransformMatrixNV :: TransformMatrixKHR +AabbPositionsNV :: AabbPositionsKHR +AccelerationStructureInstanceNV :: AccelerationStructureInstanceKHR +QueueGlobalPriorityEXT :: QueueGlobalPriorityKHR +DeviceQueueGlobalPriorityCreateInfoEXT :: DeviceQueueGlobalPriorityCreateInfoKHR +PipelineCreationFeedbackFlagEXT :: PipelineCreationFeedbackFlag +PipelineCreationFeedbackFlagsEXT :: PipelineCreationFeedbackFlags +PipelineCreationFeedbackCreateInfoEXT :: PipelineCreationFeedbackCreateInfo +PipelineCreationFeedbackEXT :: PipelineCreationFeedback +QueryPoolCreateInfoINTEL :: QueryPoolPerformanceQueryCreateInfoINTEL +PhysicalDeviceScalarBlockLayoutFeaturesEXT :: PhysicalDeviceScalarBlockLayoutFeatures +PhysicalDeviceSubgroupSizeControlFeaturesEXT :: PhysicalDeviceSubgroupSizeControlFeatures +PhysicalDeviceSubgroupSizeControlPropertiesEXT :: PhysicalDeviceSubgroupSizeControlProperties +PipelineShaderStageRequiredSubgroupSizeCreateInfoEXT :: PipelineShaderStageRequiredSubgroupSizeCreateInfo +PhysicalDeviceBufferAddressFeaturesEXT :: PhysicalDeviceBufferDeviceAddressFeaturesEXT +BufferDeviceAddressInfoEXT :: BufferDeviceAddressInfo +ToolPurposeFlagEXT :: ToolPurposeFlag +ToolPurposeFlagsEXT :: ToolPurposeFlags +PhysicalDeviceToolPropertiesEXT :: PhysicalDeviceToolProperties +ImageStencilUsageCreateInfoEXT :: ImageStencilUsageCreateInfo +PhysicalDeviceHostQueryResetFeaturesEXT :: PhysicalDeviceHostQueryResetFeatures +PhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT :: PhysicalDeviceShaderDemoteToHelperInvocationFeatures +PhysicalDeviceTexelBufferAlignmentPropertiesEXT :: PhysicalDeviceTexelBufferAlignmentProperties +PrivateDataSlotEXT :: PrivateDataSlot +PrivateDataSlotCreateFlagsEXT :: PrivateDataSlotCreateFlags +PhysicalDevicePrivateDataFeaturesEXT :: PhysicalDevicePrivateDataFeatures +DevicePrivateDataCreateInfoEXT :: DevicePrivateDataCreateInfo +PrivateDataSlotCreateInfoEXT :: PrivateDataSlotCreateInfo +PhysicalDevicePipelineCreationCacheControlFeaturesEXT :: PhysicalDevicePipelineCreationCacheControlFeatures +PhysicalDeviceImageRobustnessFeaturesEXT :: PhysicalDeviceImageRobustnessFeatures +PhysicalDeviceGlobalPriorityQueryFeaturesEXT :: PhysicalDeviceGlobalPriorityQueryFeaturesKHR +QueueFamilyGlobalPriorityPropertiesEXT :: QueueFamilyGlobalPriorityPropertiesKHR From cfae39c29d4c795c3236670bf7453f16d4b5b4cf Mon Sep 17 00:00:00 2001 From: hikari Date: Fri, 15 Apr 2022 19:16:31 +0300 Subject: [PATCH 035/245] sys/windows: add procedures and types --- core/sys/windows/kernel32.odin | 14 +++++++++ core/sys/windows/types.odin | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/core/sys/windows/kernel32.odin b/core/sys/windows/kernel32.odin index f81c51311..735e065e2 100644 --- a/core/sys/windows/kernel32.odin +++ b/core/sys/windows/kernel32.odin @@ -92,6 +92,20 @@ foreign kernel32 { CreateSemaphoreW :: proc(attributes: LPSECURITY_ATTRIBUTES, initial_count, maximum_count: LONG, name: LPCSTR) -> HANDLE --- ReleaseSemaphore :: proc(semaphore: HANDLE, release_count: LONG, previous_count: ^LONG) -> BOOL --- + CreateWaitableTimerW :: proc( + lpTimerAttributes: LPSECURITY_ATTRIBUTES, + bManualReset: BOOL, + lpTimerName: LPCWSTR, + ) -> HANDLE --- + SetWaitableTimerEx :: proc( + hTimer: HANDLE, + lpDueTime: ^LARGE_INTEGER, + lPeriod: LONG, + pfnCompletionRoutine: PTIMERAPCROUTINE, + lpArgToCompletionRoutine: LPVOID, + WakeContext: PREASON_CONTEXT, + TolerableDelay: ULONG, + ) -> BOOL --- WaitForSingleObject :: proc(hHandle: HANDLE, dwMilliseconds: DWORD) -> DWORD --- Sleep :: proc(dwMilliseconds: DWORD) --- GetProcessId :: proc(handle: HANDLE) -> DWORD --- diff --git a/core/sys/windows/types.odin b/core/sys/windows/types.odin index de19cd6cc..f05dd3310 100644 --- a/core/sys/windows/types.odin +++ b/core/sys/windows/types.odin @@ -123,6 +123,8 @@ PCONDITION_VARIABLE :: ^CONDITION_VARIABLE PLARGE_INTEGER :: ^LARGE_INTEGER PSRWLOCK :: ^SRWLOCK +MMRESULT :: UINT + SOCKET :: distinct uintptr // TODO socklen_t :: c_int ADDRESS_FAMILY :: USHORT @@ -195,6 +197,56 @@ GET_FILEEX_INFO_LEVELS :: distinct i32 GetFileExInfoStandard: GET_FILEEX_INFO_LEVELS : 0 GetFileExMaxInfoLevel: GET_FILEEX_INFO_LEVELS : 1 +// String resource number bases (internal use) + +MMSYSERR_BASE :: 0 +WAVERR_BASE :: 32 +MIDIERR_BASE :: 64 +TIMERR_BASE :: 96 +JOYERR_BASE :: 160 +MCIERR_BASE :: 256 +MIXERR_BASE :: 1024 + +MCI_STRING_OFFSET :: 512 +MCI_VD_OFFSET :: 1024 +MCI_CD_OFFSET :: 1088 +MCI_WAVE_OFFSET :: 1152 +MCI_SEQ_OFFSET :: 1216 + +// timer error return values +TIMERR_NOERROR :: 0 // no error +TIMERR_NOCANDO :: TIMERR_BASE + 1 // request not completed +TIMERR_STRUCT :: TIMERR_BASE + 33 // time struct size + +DIAGNOSTIC_REASON_VERSION :: 0 + +DIAGNOSTIC_REASON_SIMPLE_STRING :: 0x00000001 +DIAGNOSTIC_REASON_DETAILED_STRING :: 0x00000002 +DIAGNOSTIC_REASON_NOT_SPECIFIED :: 0x80000000 + +// Defines for power request APIs + +POWER_REQUEST_CONTEXT_VERSION :: DIAGNOSTIC_REASON_VERSION + +POWER_REQUEST_CONTEXT_SIMPLE_STRING :: DIAGNOSTIC_REASON_SIMPLE_STRING +POWER_REQUEST_CONTEXT_DETAILED_STRING :: DIAGNOSTIC_REASON_DETAILED_STRING + +REASON_CONTEXT :: struct { + Version: ULONG, + Flags: DWORD, + Reason: struct #raw_union { + Detailed: struct { + LocalizedReasonModule: HMODULE, + LocalizedReasonId: ULONG, + ReasonStringCount: ULONG, + ReasonStrings: ^LPWSTR, + }, + SimpleReasonString: LPWSTR, + }, +} +PREASON_CONTEXT :: ^REASON_CONTEXT + +PTIMERAPCROUTINE :: #type proc "stdcall" (lpArgToCompletionRoutine: LPVOID, dwTimerLowValue, dwTimerHighValue: DWORD) TIMERPROC :: #type proc "stdcall" (HWND, UINT, UINT_PTR, DWORD) From d3fbf36df7cddf2cf69f7d761ccf4dfea863a40c Mon Sep 17 00:00:00 2001 From: hikari Date: Fri, 15 Apr 2022 19:18:22 +0300 Subject: [PATCH 036/245] sys/windows: add winmm bindings file --- core/sys/windows/winmm.odin | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/sys/windows/winmm.odin diff --git a/core/sys/windows/winmm.odin b/core/sys/windows/winmm.odin new file mode 100644 index 000000000..6d3fc409e --- /dev/null +++ b/core/sys/windows/winmm.odin @@ -0,0 +1,9 @@ +// +build windows +package sys_windows + +foreign import winmm "system:Winmm.lib" + +@(default_calling_convention="stdcall") +foreign winmm { + timeBeginPeriod :: proc(uPeriod: UINT) -> MMRESULT --- +} From 1b4d5b73abf8d582e3493f0d52c91d0f0d3ec102 Mon Sep 17 00:00:00 2001 From: hikari Date: Fri, 15 Apr 2022 22:04:34 +0300 Subject: [PATCH 037/245] sys/windows: add some constants --- core/sys/windows/types.odin | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/sys/windows/types.odin b/core/sys/windows/types.odin index f05dd3310..6bded29e1 100644 --- a/core/sys/windows/types.odin +++ b/core/sys/windows/types.odin @@ -786,6 +786,10 @@ HOVER_DEFAULT :: 0xFFFFFFFF USER_TIMER_MAXIMUM :: 0x7FFFFFFF USER_TIMER_MINIMUM :: 0x0000000A +// WM_ACTIVATE state values +WA_INACTIVE :: 0 +WA_ACTIVE :: 1 +WA_CLICKACTIVE :: 2 // SetWindowsHook() codes WH_MIN :: -1 From b05fbaacdaf8ffe37ad04f9d4439b06d8b538869 Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 16 Apr 2022 00:32:17 +0300 Subject: [PATCH 038/245] time: add accurate sleep procedure --- core/time/time.odin | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/core/time/time.odin b/core/time/time.odin index fddb09d85..7056f83f8 100644 --- a/core/time/time.odin +++ b/core/time/time.odin @@ -213,6 +213,37 @@ time_add :: proc(t: Time, d: Duration) -> Time { return Time{t._nsec + i64(d)} } +// Accurate sleep borrowed from: https://blat-blatnik.github.io/computerBear/making-accurate-sleep-function/ +accurate_sleep :: proc(d: Duration) { + to_sleep, estimate, mean, m2, count: Duration + + to_sleep = d + estimate = 5 * Millisecond + mean = 5 * Millisecond + count = 1 + + for to_sleep > estimate { + start := tick_now() + sleep(1 * Millisecond) + + observed := tick_since(start) + to_sleep -= observed + + count += 1 + + delta := observed - mean + mean += delta / count + m2 += delta * (observed - mean) + stddev := intrinsics.sqrt(f64(m2) / f64(count - 1)) + estimate = mean + Duration(stddev) + } + + start := tick_now() + for to_sleep > tick_since(start) { + intrinsics.cpu_relax() // prevent the spinlock from taking the thread hostage, still accurate enough + // NOTE: it is possible that sometimes cpu can relax a bit too much, in that case it should spinlock freely for a while (TODO) + } +} ABSOLUTE_ZERO_YEAR :: i64(-292277022399) // Day is chosen so that 2001-01-01 is Monday in the calculations ABSOLUTE_TO_INTERNAL :: i64(-9223371966579724800) // i64((ABSOLUTE_ZERO_YEAR - 1) * 365.2425 * SECONDS_PER_DAY); From 44316401c915cd96a9c97a0747d7487bac905ac7 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 16 Apr 2022 02:07:57 +0200 Subject: [PATCH 039/245] Add uleb128 byte-at-a-time decoder. --- core/encoding/varint/leb128.odin | 54 +++++++++++------- .../encoding/varint/test_core_varint.odin | 2 +- tests/core/encoding/varint/varint | Bin 0 -> 308984 bytes 3 files changed, 34 insertions(+), 22 deletions(-) create mode 100755 tests/core/encoding/varint/varint diff --git a/core/encoding/varint/leb128.odin b/core/encoding/varint/leb128.odin index 476b9c2c9..4cad1da76 100644 --- a/core/encoding/varint/leb128.odin +++ b/core/encoding/varint/leb128.odin @@ -10,8 +10,6 @@ // the LEB128 format as used by DWARF debug info, Android .dex and other file formats. package varint -import "core:fmt" - // In theory we should use the bigint package. In practice, varints bigger than this indicate a corrupted file. // Instead we'll set limits on the values we'll encode/decode // 18 * 7 bits = 126, which means that a possible 19th byte may at most be `0b0000_0011`. @@ -25,32 +23,47 @@ Error :: enum { // Decode a slice of bytes encoding an unsigned LEB128 integer into value and number of bytes used. // Returns `size` == 0 for an invalid value, empty slice, or a varint > 18 bytes. -decode_uleb128 :: proc(buf: []u8) -> (val: u128, size: int, err: Error) { - more := true +decode_uleb128_buffer :: proc(buf: []u8) -> (val: u128, size: int, err: Error) { + if len(buf) == 0 { + return 0, 0, .Buffer_Too_Small + } - for v, i in buf { - size = i + 1 - - // 18 * 7 bits = 126, which means that a possible 19th byte may at most be 0b0000_0011. - if size > LEB128_MAX_BYTES || size == LEB128_MAX_BYTES && v > 0b0000_0011 { - return 0, 0, .Value_Too_Large - } - - val |= u128(v & 0x7f) << uint(i * 7) - - if v < 128 { - more = false - break + for v in buf { + val, size, err = decode_uleb128_byte(v, size, val) + if err != .Buffer_Too_Small { + return } } - // If the buffer runs out before the number ends, return an error. - if more { - return 0, 0, .Buffer_Too_Small + if err == .Buffer_Too_Small { + val, size = 0, 0 } return } +// Decodes an unsigned LEB128 integer into value a byte at a time. +// Returns `.None` when decoded properly, `.Value_Too_Large` when they value +// exceeds the limits of a u128, and `.Buffer_Too_Small` when it's not yet fully decoded. +decode_uleb128_byte :: proc(input: u8, offset: int, accumulator: u128) -> (val: u128, size: int, err: Error) { + size = offset + 1 + + // 18 * 7 bits = 126, which means that a possible 19th byte may at most be 0b0000_0011. + if size > LEB128_MAX_BYTES || size == LEB128_MAX_BYTES && input > 0b0000_0011 { + return 0, 0, .Value_Too_Large + } + + val = accumulator | u128(input & 0x7f) << uint(offset * 7) + + if input < 128 { + // We're done + return + } + + // If the buffer runs out before the number ends, return an error. + return val, size, .Buffer_Too_Small +} +decode_uleb128 :: proc {decode_uleb128_buffer, decode_uleb128_byte} + // Decode a slice of bytes encoding a signed LEB128 integer into value and number of bytes used. // Returns `size` == 0 for an invalid value, empty slice, or a varint > 18 bytes. decode_ileb128 :: proc(buf: []u8) -> (val: i128, size: int, err: Error) { @@ -89,7 +102,6 @@ encode_uleb128 :: proc(buf: []u8, val: u128) -> (size: int, err: Error) { size += 1 if size > len(buf) { - fmt.println(val, buf[:size - 1]) return 0, .Buffer_Too_Small } diff --git a/tests/core/encoding/varint/test_core_varint.odin b/tests/core/encoding/varint/test_core_varint.odin index 093b043d7..2c3669afa 100644 --- a/tests/core/encoding/varint/test_core_varint.odin +++ b/tests/core/encoding/varint/test_core_varint.odin @@ -51,7 +51,7 @@ test_leb128 :: proc(t: ^testing.T) { msg := fmt.tprintf("Expected %02x to decode to %v consuming %v bytes, got %v and %v", vector.encoded, vector.value, vector.size, val, size) expect(t, size == vector.size && val == vector.value, msg) - msg = fmt.tprintf("Expected decoder to return error %v, got %v", vector.error, err) + msg = fmt.tprintf("Expected decoder to return error %v, got %v for vector %v", vector.error, err, vector) expect(t, err == vector.error, msg) if err == .None { // Try to roundtrip diff --git a/tests/core/encoding/varint/varint b/tests/core/encoding/varint/varint new file mode 100755 index 0000000000000000000000000000000000000000..1e982544582db7a8f719d5229759a019afa45103 GIT binary patch literal 308984 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 Date: Sat, 16 Apr 2022 13:46:36 +0300 Subject: [PATCH 040/245] runtime: update comment description --- core/runtime/core.odin | 1 + 1 file changed, 1 insertion(+) diff --git a/core/runtime/core.odin b/core/runtime/core.odin index 4ab21d8cf..4269450de 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -401,6 +401,7 @@ Raw_Cstring :: struct { Linux, Essence, FreeBSD, + OpenBSD, WASI, JS, Freestanding, From 0a0440a6e869e8d8791608f14fb55f37f323a23e Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 16 Apr 2022 14:08:37 +0300 Subject: [PATCH 041/245] time: yield accurate_sleep instead of relaxing the cpu --- core/time/time.odin | 10 ++++++++-- core/time/time_unix.odin | 6 ++++++ core/time/time_windows.odin | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/core/time/time.odin b/core/time/time.odin index 7056f83f8..f2e974647 100644 --- a/core/time/time.odin +++ b/core/time/time.odin @@ -213,6 +213,10 @@ time_add :: proc(t: Time, d: Duration) -> Time { return Time{t._nsec + i64(d)} } +yield :: proc "contextless" () { + _yield() +} + // Accurate sleep borrowed from: https://blat-blatnik.github.io/computerBear/making-accurate-sleep-function/ accurate_sleep :: proc(d: Duration) { to_sleep, estimate, mean, m2, count: Duration @@ -240,8 +244,10 @@ accurate_sleep :: proc(d: Duration) { start := tick_now() for to_sleep > tick_since(start) { - intrinsics.cpu_relax() // prevent the spinlock from taking the thread hostage, still accurate enough - // NOTE: it is possible that sometimes cpu can relax a bit too much, in that case it should spinlock freely for a while (TODO) + // prevent the spinlock from taking the thread hostage, still accurate enough + yield() + // NOTE: it might be possible that it yields for too long, in that case it should spinlock freely for a while + // TODO: needs actual testing done to check if that's the case } } diff --git a/core/time/time_unix.odin b/core/time/time_unix.odin index 37fc1fd3e..db15a824a 100644 --- a/core/time/time_unix.odin +++ b/core/time/time_unix.odin @@ -1,6 +1,8 @@ //+build linux, darwin, freebsd, openbsd package time +import "core:sys/unix" + IS_SUPPORTED :: true // NOTE: Times on Darwin are UTC. when ODIN_OS == .Darwin { @@ -17,6 +19,10 @@ foreign libc { @(link_name="nanosleep") _unix_nanosleep :: proc(requested: ^TimeSpec, remaining: ^TimeSpec) -> i32 --- } +_yield :: proc "contextless" () { + unix.sched_yield() +} + TimeSpec :: struct { tv_sec : i64, /* seconds */ tv_nsec : i64, /* nanoseconds */ diff --git a/core/time/time_windows.odin b/core/time/time_windows.odin index 0fb9eaa0f..397741126 100644 --- a/core/time/time_windows.odin +++ b/core/time/time_windows.odin @@ -35,3 +35,7 @@ _tick_now :: proc "contextless" () -> Tick { _nsec := mul_div_u64(i64(now), 1e9, i64(qpc_frequency)) return Tick{_nsec = _nsec} } + +_yield :: proc "contextless" () { + win32.SwitchToThread() +} From 4f4793817cfb1782c1b2e6cf55ffdbfb01bcffaf Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 16 Apr 2022 14:35:49 +0300 Subject: [PATCH 042/245] time: fix unix build --- core/time/time_unix.odin | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/time/time_unix.odin b/core/time/time_unix.odin index db15a824a..0cfa196a2 100644 --- a/core/time/time_unix.odin +++ b/core/time/time_unix.odin @@ -1,8 +1,6 @@ //+build linux, darwin, freebsd, openbsd package time -import "core:sys/unix" - IS_SUPPORTED :: true // NOTE: Times on Darwin are UTC. when ODIN_OS == .Darwin { @@ -19,8 +17,18 @@ foreign libc { @(link_name="nanosleep") _unix_nanosleep :: proc(requested: ^TimeSpec, remaining: ^TimeSpec) -> i32 --- } +foreign import "system:pthread" + +import "core:c" + +@(private="file") +@(default_calling_convention="c") +foreign pthread { + sched_yield :: proc() -> c.int --- +} + _yield :: proc "contextless" () { - unix.sched_yield() + sched_yield() } TimeSpec :: struct { From 8bf73950fa3bfaea940f8c14e69824b06908aa5e Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 16 Apr 2022 14:36:48 +0300 Subject: [PATCH 043/245] time: remove unnecessary yield --- core/time/time.odin | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/time/time.odin b/core/time/time.odin index f2e974647..ac233fbd2 100644 --- a/core/time/time.odin +++ b/core/time/time.odin @@ -213,10 +213,6 @@ time_add :: proc(t: Time, d: Duration) -> Time { return Time{t._nsec + i64(d)} } -yield :: proc "contextless" () { - _yield() -} - // Accurate sleep borrowed from: https://blat-blatnik.github.io/computerBear/making-accurate-sleep-function/ accurate_sleep :: proc(d: Duration) { to_sleep, estimate, mean, m2, count: Duration @@ -245,7 +241,7 @@ accurate_sleep :: proc(d: Duration) { start := tick_now() for to_sleep > tick_since(start) { // prevent the spinlock from taking the thread hostage, still accurate enough - yield() + _yield() // NOTE: it might be possible that it yields for too long, in that case it should spinlock freely for a while // TODO: needs actual testing done to check if that's the case } From 91037766d2b583ac34d23eee5a46f10df9d3cba0 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 16 Apr 2022 16:48:08 +0200 Subject: [PATCH 044/245] Update time.odin Add caveats. --- core/time/time.odin | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/time/time.odin b/core/time/time.odin index ac233fbd2..1f778a8de 100644 --- a/core/time/time.odin +++ b/core/time/time.odin @@ -214,12 +214,17 @@ time_add :: proc(t: Time, d: Duration) -> Time { } // Accurate sleep borrowed from: https://blat-blatnik.github.io/computerBear/making-accurate-sleep-function/ +// +// Accuracy seems to be pretty good out of the box on Linux, to within around 4µs worst case. +// On Windows it depends but is comparable with regular sleep in the worst case. +// To get the same kind of accuracy as on Linux, have your program call `win32.time_begin_period(1)` to +// tell Windows to use a more accurate timer for your process. accurate_sleep :: proc(d: Duration) { to_sleep, estimate, mean, m2, count: Duration to_sleep = d estimate = 5 * Millisecond - mean = 5 * Millisecond + mean = 5 * Millisecond count = 1 for to_sleep > estimate { From 6d0ba8d1898adabceafc6a181395f5d158176a04 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 16 Apr 2022 18:14:01 +0200 Subject: [PATCH 045/245] [LEB128] Add byte-at-a-time ILEB decoder. --- core/encoding/varint/leb128.odin | 44 +++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/core/encoding/varint/leb128.odin b/core/encoding/varint/leb128.odin index 4cad1da76..f8fcc7de5 100644 --- a/core/encoding/varint/leb128.odin +++ b/core/encoding/varint/leb128.odin @@ -66,33 +66,47 @@ decode_uleb128 :: proc {decode_uleb128_buffer, decode_uleb128_byte} // Decode a slice of bytes encoding a signed LEB128 integer into value and number of bytes used. // Returns `size` == 0 for an invalid value, empty slice, or a varint > 18 bytes. -decode_ileb128 :: proc(buf: []u8) -> (val: i128, size: int, err: Error) { - shift: uint - +decode_ileb128_buffer :: proc(buf: []u8) -> (val: i128, size: int, err: Error) { if len(buf) == 0 { return 0, 0, .Buffer_Too_Small } for v in buf { - size += 1 - - // 18 * 7 bits = 126, which including sign means we can have a 19th byte. - if size > LEB128_MAX_BYTES || size == LEB128_MAX_BYTES && v > 0x7f { - return 0, 0, .Value_Too_Large + val, size, err = decode_ileb128_byte(v, size, val) + if err != .Buffer_Too_Small { + return } - - val |= i128(v & 0x7f) << shift - shift += 7 - - if v < 128 { break } } - if buf[size - 1] & 0x40 == 0x40 { - val |= max(i128) << shift + if err == .Buffer_Too_Small { + val, size = 0, 0 } return } +// Decode a a signed LEB128 integer into value and number of bytes used, one byte at a time. +// Returns `size` == 0 for an invalid value, empty slice, or a varint > 18 bytes. +decode_ileb128_byte :: proc(input: u8, offset: int, accumulator: i128) -> (val: i128, size: int, err: Error) { + size = offset + 1 + shift := uint(offset * 7) + + // 18 * 7 bits = 126, which including sign means we can have a 19th byte. + if size > LEB128_MAX_BYTES || size == LEB128_MAX_BYTES && input > 0x7f { + return 0, 0, .Value_Too_Large + } + + val = accumulator | i128(input & 0x7f) << shift + + if input < 128 { + if input & 0x40 == 0x40 { + val |= max(i128) << (shift + 7) + } + return val, size, .None + } + return val, size, .Buffer_Too_Small +} +decode_ileb128 :: proc{decode_ileb128_buffer, decode_ileb128_byte} + // Encode `val` into `buf` as an unsigned LEB128 encoded series of bytes. // `buf` must be appropriately sized. encode_uleb128 :: proc(buf: []u8, val: u128) -> (size: int, err: Error) { From 939973acd7a8ea17cc9dfda2a55e79dd0109a49c Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 17 Apr 2022 12:35:34 +0200 Subject: [PATCH 046/245] [QOI] Add to examples/all. --- examples/all/all_main.odin | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/all/all_main.odin b/examples/all/all_main.odin index 6a039e4dd..4f5bfbdc1 100644 --- a/examples/all/all_main.odin +++ b/examples/all/all_main.odin @@ -61,6 +61,7 @@ import hash "core:hash" import image "core:image" import png "core:image/png" +import qoi "core:image/qoi" import io "core:io" import log "core:log" @@ -159,6 +160,7 @@ _ :: fmt _ :: hash _ :: image _ :: png +_ :: qoi _ :: io _ :: log _ :: math From b78f3a806930fe026c027aedf511696bc6691b96 Mon Sep 17 00:00:00 2001 From: hikari Date: Sun, 17 Apr 2022 19:17:38 +0300 Subject: [PATCH 047/245] sys/windows: add timeEndPeriod --- core/sys/windows/winmm.odin | 1 + 1 file changed, 1 insertion(+) diff --git a/core/sys/windows/winmm.odin b/core/sys/windows/winmm.odin index 6d3fc409e..9edd56acc 100644 --- a/core/sys/windows/winmm.odin +++ b/core/sys/windows/winmm.odin @@ -6,4 +6,5 @@ foreign import winmm "system:Winmm.lib" @(default_calling_convention="stdcall") foreign winmm { timeBeginPeriod :: proc(uPeriod: UINT) -> MMRESULT --- + timeEndPeriod :: proc(uPeriod: UINT) -> MMRESULT --- } From 4247ba67ed83a16c321363cdf8260f71826325ca Mon Sep 17 00:00:00 2001 From: hanabi1224 Date: Mon, 18 Apr 2022 15:24:54 +0800 Subject: [PATCH 048/245] Fix bugs in core:container/lru --- core/container/lru/lru_cache.odin | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/core/container/lru/lru_cache.odin b/core/container/lru/lru_cache.odin index f8e6f7b46..81f0142b0 100644 --- a/core/container/lru/lru_cache.odin +++ b/core/container/lru/lru_cache.odin @@ -60,6 +60,8 @@ clear :: proc(c: ^$C/Cache($Key, $Value), call_on_remove: bool) { set :: proc(c: ^$C/Cache($Key, $Value), key: Key, value: Value) -> runtime.Allocator_Error { if e, ok := c.entries[key]; ok { e.value = value + _pop_node(c, e) + _push_front_node(c, e) return nil } @@ -67,10 +69,14 @@ set :: proc(c: ^$C/Cache($Key, $Value), key: Key, value: Value) -> runtime.Alloc e.key = key e.value = value - _push_front_node(c, e) - if c.count > c.capacity { + assert(c.count <= c.capacity) + if c.count == c.capacity { _remove_node(c, c.tail) } + else { + c.count += 1 + } + _push_front_node(c, e) c.entries[key] = e return nil @@ -122,6 +128,7 @@ remove :: proc(c: ^$C/Cache($Key, $Value), key: Key) -> bool { return false } _remove_node(c, e) + c.count -= 1 return true } @@ -143,8 +150,6 @@ _remove_node :: proc(c: ^$C/Cache($Key, $Value), node: ^Node(Key, Value)) { node.prev = nil node.next = nil - c.count -= 1 - delete_key(&c.entries, node.key) _call_on_remove(c, node) @@ -171,8 +176,6 @@ _push_front_node :: proc(c: ^$C/Cache($Key, $Value), e: ^Node(Key, Value)) { c.tail = e } e.prev = nil - - c.count += 1 } @(private) @@ -180,6 +183,12 @@ _pop_node :: proc(c: ^$C/Cache($Key, $Value), e: ^Node(Key, Value)) { if e == nil { return } + if c.head == e { + c.head = e.next + } + if c.tail == e { + c.tail = e.prev + } if e.prev != nil { e.prev.next = e.next } From 7428e5226426d1d19601d5b557c3df51db233857 Mon Sep 17 00:00:00 2001 From: Tetralux Date: Thu, 14 Apr 2022 16:53:48 +0000 Subject: [PATCH 049/245] Duplicate some basic slice procedures from core:mem into core:slice --- core/slice/slice.odin | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/core/slice/slice.odin b/core/slice/slice.odin index 520e3e1e0..b8fb29ab3 100644 --- a/core/slice/slice.odin +++ b/core/slice/slice.odin @@ -10,6 +10,53 @@ _ :: builtin _ :: bits _ :: mem +/* + Turn a pointer and a length into a slice. +*/ +from_ptr :: proc "contextless" (ptr: ^$T, count: int) -> []T { + return ([^]T)(ptr)[:count] +} + +/* + Turn a pointer and a length into a byte slice. +*/ +bytes_from_ptr :: proc "contextless" (ptr: rawptr, byte_count: int) -> []byte { + return ([^]byte)(ptr)[:byte_count] +} + +/* + Turn a slice into a byte slice. + + See `slice.reinterpret` to go the other way. +*/ +to_bytes :: proc "contextless" (s: []$T) -> []byte { + return ([^]byte)(raw_data(s))[:len(s) * size_of(T)] +} + +/* + Turn a slice of one type, into a slice of another type. + + Only converts the type and length of the slice itself. + The length is rounded down to the nearest whole number of items. + + ``` + large_items := []i64{1, 2, 3, 4} + small_items := slice.reinterpret([]i32, large_items) + assert(len(small_items) == 8) + ``` + ``` + small_items := []byte{1, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0} + large_items := slice.reinterpret([]i64, small_items) + assert(len(large_items) == 1) // only enough bytes to make 1 x i64; two would need at least 8 bytes. + ``` +*/ +reinterpret :: proc "contextless" ($T: typeid/[]$U, s: []$V) -> []U { + bytes := to_bytes(s) + n := len(bytes) / size_of(U) + return ([^]U)(raw_data(bytes))[:n] +} + swap :: proc(array: $T/[]$E, a, b: int) { when size_of(E) > 8 { From df4a0c62add28af74ac8c926b3a6e0612296ccd1 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Mon, 18 Apr 2022 19:10:53 +0200 Subject: [PATCH 050/245] Delete accidentally added test artefact. --- tests/core/encoding/varint/varint | Bin 308984 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 tests/core/encoding/varint/varint diff --git a/tests/core/encoding/varint/varint b/tests/core/encoding/varint/varint deleted file mode 100755 index 1e982544582db7a8f719d5229759a019afa45103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308984 zcmeFadz{_V_5VMSyqSY6aJO*Z_cJgMb{L~2Ne}<&%c;|qel;~ zJ96mBLw|g%xErQ!8)m;ZCp}d(FnaXJp`%7_SjFUPdu+%I`3SE5VUnfMqZ`kf(ik$3 z@9G<~2c3cc+`rYMq9Wxt(A=YFniYgUqeoxVIQjI8I$7Vs(dS$+?m}4K)z^P_?{BZ5MEMQu`%n7L8b5m6q_O9pRnWiT_}1>}`dYT} za^-zwzN08)6(>_HPKMNttm{&Tc(6EW4ZIK^MYW!nPW>a6EsY+1!GzHlU3&iM7fu*G zv2hap{C<7Kp?(qiy4t1j+@eqh9XQg^UHqdwG*v7F5HHsXiX% zp-JVt+P8ILiXrB$>pT4-n{40Jw<72(^jAV%?fb!h(iap3{&)5DKh5p?nFKI#*P^0n{Z&N0T1YLlM){DYke>%G zo8F^n4T6Mvk$gDjnjS?5ksp3bkD>(?9(%)s%n#t}-wx#WhISqIP^FWsnb*Vgbut3j z5?aYW#o)e^FPgOPgmX^c_smNtoJn43NB+rJ+RRO8$Gbm0~J+RRO8$Gbm0~J+RRO8$Gbm0~J@Egv z2ac~hvF?Pr`vQ}XTsvZCZx<#JJRO{W!qroe=9(Xs$@QEP#@IJ_6qElzLq zD9mxW=n;t7up7GcatQirtAjb2Z4Ls$IUsOy(f%N7;0gUD)y3)RyQ4M5n zga(EC{-m>idk2_{_5``6!(9{otKJ1>oT)ynPW`LiQMp_+6QcLOfPE+k2jZ z>&Z1_qEX};($P;XSMriby5tnkO|i0)LF8!jGKlHSMP~l#4VjAN&iMzgJ}JeSiVuL<=&IXcG-Rr$K+)FI)C{`a)C{`Yh2}#d3FV@P z5t2>W=tvhFbS!2xqzA41namh;t_xn~f|n$MGZ55V$ws9?@YRD&@HZ}apbL(0!DApH z#*RZ!FF0kR*KRXY2VF7H1TS{MZZ25mf_)&tzq=w>X@YkK!QQltsi)!ihII82kT_kj zujMMrjg)i~llcu%0v;D&Hac1;8y)WC5GOx!vX_(Hob2diYY|lFy+@^N)WO;SS>q({ zq}|C%Co7yRchV|?ia$WZ5Zsu+OA>f$0_zfZFHmm@qTz0!%mB_0Fc;kcQn=PHl8Z?P z5Lh?CWO_USVJ7@WBvYbyEh)Rfb91+~+(oLHixxtZfVT&ji>?RxOqdQ@i^P&^J@0LuoZw$T% zCMNFgMm_4ej^1YCE#%m6W{KpYJ0W4($)^Fn1JnXcg|~p}0q~6gbJ5>GYQBC^c<;3v zjjn*nHuM6-st?3LLEqoln!;NDYJj=u6;SBei@?y|BiOw3P9*I$)%aW6z-d5V7_S5= z)i2u0XwlX*JsBqb{l!7n!xLv&Zn%+(yDUa3j`G}tLsX?=i09rPYPmx_x80GJtMS}# zJ-46d4vDR7Z_k}yZ@Jw)x88G=p1a{FE8D?yyB%%0-kv+Y!E#%A?nBQNd+wxTt!xv| zH4nGkH)%+w;@>~E+&a(gJJND%JlE#Ak34tLC@XuSGH1FiOyn} zItHQy92Q_M8Vr)^Tr>bw>%~6=h6SNJFf0h|m>bqhwH>C-VZdOpbh*KULV5in`G%yE z!~QTi>uxjCEZx#bMV*;gv4)7lu75yeB;od!bKbZi7@etj1(=PFx(Nm+hr^+q>0Y=_ z+6JvJQ%?sia-m0p8Z_RGkRJekAVJ!{$0Yi^WD5@*^jEIoZ+4)=su?(%s3|)u!_^C##+O zU4*7rKxGH;;ROCNfmbE)%mh9SRG1=`<*X%-0G|YUY_x$qn0XgoNx|F#lVE-aLNGrg zk}28i5ami9@?5`C%l$$%bJ5EXC17iSx#&+I59VKk^jk;$TeTg6 z`C(u%Si0Qcg`vED(GRUj3+CUzB$&qYZaV&Emv{3Z-KML%tfC$1ysMN(lu#XOoz#|_#K34@pF+( z$-gXDa)swk;Okt}98Hc^Zi6TR(*fq9%R%1A`Jf}b_+((17K4FdTI>YWnFe{a9j1l+ z9BfZ?T^h>k7ww`JeT|<86B9M&7^OfLY=9&hUiB9)ewu$OvOdc=|9_T zXFl`=W}~w;U5K?Y(1uLEfi^q(RhYJZmzcJGN4o3~NI0>5+U#~`qbkYA=^?2yZd!ga zN3BQOnPq*7j8v~;q%r9w2=jJ{a=ECIG9{qmLn#|YLfPowRDpc%}nPkZH9l2g-Mf7LA3e-+X~fqjtDRpJyu}0?B=rjBl{psqV-J((fViQ zGSTihj~ZXgvlPdZ@NT4;Lmd z(RE*e*^;t$ih5&|#sCw4?nXW2x#K z3SPHMJC7z6ew{$YLeN`yuA+(a60YJjR2Z7T{Svry0u?7ABGSOn*J}gJMKc1bU$Tek z)ZwGza+r*WY+^(*BAJR$ELU-f=kD9gM&u-N7^m0>7U}s=DHrMa&qqY_HHJsck-#t_ z2LZ!~Yzqu0X|)}!oRYvq*F}L@zeMK}l1AiQm<{QEJ6>Uy_J+jie#54jZAU?DCCpSD z;+*`oZX)aIJ3!6=oLRN5ZVqK#J(C3!ZCWGP(T^}vy)T57vD|VM-IU{g3Zeu&EH$qFaSowSOe;t$Z^y&DsF zNdiwzpq`0B-Ftx{O6~?Kp=^Gr!2MJ}^-J^}MUtZACYVIY6A+^0HL?$ zv>7IrJ_Nzi+btLUOu07IPsBpmNDtzWgPrW>WKSo%I@!U=4@6L5_aJEdU$_d%Mlbji zW6sG^5mfvh8a#JH0xwRW9#=z!+63MM3={BIz|f^TLj~@01FB!5{hy?;o(q#;c^pEp z+-te$X5}&!(>4*a;!-gSpF){|cf(QQju#|La?y2?0a3FN7^37PV2F|ffMEjO3Jmto z11cew==ymmuV1o{6`G~9U}EWm5G=jTa#2RPOhvw%S$d(E?!Tb(7C1_|s2SvzUI7{g zkDBKKgQdp;gQa@|^__7lbn*Ys;3~mQbfsZRYyFaat5(v7mor4 zg9ibF!8-thKh<_HSp5tJOP3pbNuj)De`~Vn2L->Ss~??YmM(-a^KRlNd6;=$O*Rw1 zfauX)tDSSMU?Wr_&@TqE11iq7146mQ{i&(xcf6_T_oNH8LW0pl5t2>W=p++NmmKL5 zd%472E^!AW1jvp^_#Ii5H`Px*V9spof?t0li~CJ+!O0NYvvbi$m;1EmIC`bo*sqae zG*utpU!>2yMyjtjQZWUBQ^tyL-w9CyJ{Vv&x=$z@-R#|FMDk`3B6++>I{H*)ndp~a+thnmxm;96nG*2daFlY43_&pms1H@BptggR>Sut7u74DmE#bFa^z{E8OpN-o8@0}J+j(xK za_N$%MYy+wgz$JWfpT(q`mX?n>9YgSr%yS^y>y`Z=JUN2CSKC0;iX-a%S2ZjGulGT zOvSU9z+{rmw7n-xCE#`e=Axb;_tMwY;$l|Cd0_C;bHL!G-vPt3rrHj!=>-f1OP3q0 zF;jW{k{Y$>+nC0h8T#P`W?MUi{c8l1h!&55$U3I=VCOuD0Q1`=LQ7>1b7 z_CsB)M~doSvj#BEGw1>H_k1ILPB2nE*hobcgpOn&O2Eqk%tn)hveCItPIq#$lOH=d z%E@6)4i-Vh9-^ddw6hm%=cLrhW=_`cXX?Lj@=qrpilE{ZXt-}$l)yU@*p$HW349J1 zChjvp4I|2OKp){hgFGY;G7D`BdJHBZ`96e@d|tUsv@b^DyB5!l{n94xFO|zhuR)Z6 zPX)-C8{{Fm05rynZvuvpybKsZ@m*=jq4r1}{QmM%B=p+b4f!D^9^#HjmV5|R`6 z*cVIB5=mEla-rF_8Y1hMM{hdkpo`sFf^AG$=zNiOlIOKjm1#fd~eBy-NZc&5 z(^07~&sPv7;Mf4!!-cZZ2q*PU>YNtPIeJN#g?L^Y_zEteB0kNt#k5;lMkG{ z<>XZ-&x@d92{eS^`~+T;z;hFLYyuwwhKcn@pyB~#_Xo&x9LOiuA!cFGSbT6dOeWT| z5GK~c%4MQ$v7E9y#mrR1>ujx`t}^b|Axgme0_0g3TYb-GI=ulv| zj#1lTVyU0OVCfRfMYo3X`XvL^A}?OD<=hA}8_ne}WVUM1)R)lkiGuvB_=fu#&^3Lk zdNAvk43ZvyR?owv>s!%Ty8ab8I(v%cD&DhP_4%Kx>(yD+%thTbpd{cLI7+$bU66PE z70@|e+y)F?zZV#~-UJNiaJ3z}{ys1mEM0DJdnm7e;!tZxSE|*o!DKNQK3CQL4>m=vsKlCEJ;w<4d7o@s=ud7Fpz1R2(f%}i6j6)yK2B&-$h z{?zTk-vzOD#6D!TAw1^D9Hvq`xG~^7codj%uKZFXSNdFtz0f@hbRG` z3y^p1KptX$1fA=}cK}0(H3372jRA&})SrPN#FhaoT}-;%(#JtcaZ9aHv-BaDSo$9j zEX^vHiT1#cjO#+rO4jKu|br8j|Iq@19F4q&-1)E0}KXF0tSPR1qOrFb}(4| ztaLHya)W;lQi@yZjM_eHe#=BDH*x4$ni>^{8ma#9Q=7fT=a{7tMB61ZWSs&&7ilk1 z(sWo!Ki6}N%SOK==#8}k)*WP2yc}G_^v4aWcpprxR#?rn0P7Lg_aG!}$StT+Y-FQT z3+h^^|J+5U;sAQ0nX??(9Rgkf{&pXmIUgFSSOLMx>O!}3(XIhzO$y~d5F;CH?qm}u zUm*u`t&@+Oyep#d5;eneUa-{3qfQ=h@*5|2I=R`&^&+U43Jo)7Yyyu+;9dzVOW{4UKu7S2VAzaXsm3o1ttPE#b!^8?UT+EN6weu-XBAnC&Qa0|RaTEdtx$BSet z9K@+`rCt#Q`TFJtMc`GqkZHEa{3k(KJ zmm7QtNU46wkw)!vx&2@^G@qJUiSfIiE_3_rERwD+8fOOno5|zzr1}#ec7Dc=phN(F z49rI93t-UCtD%|-3+2>SocbTUIVs!%Zgb%$f;#j(h_HN}jq0TUb^S1gs`pDQ6OH-A zX45%)fns3?_8pXOLT+i zCs1kQc_cN)J;tPOaOvu5 zm-yskbL423I297^`+FiW-XzAj#5P;F#4|22$R!SjgrR<$Ra)_%jrKK(Oti>?ELzr2 zL0WMiM8micd#^WE^%Nt0#;Sz-Er=5E!2r4665@W#$*oR)?xfjClatGxTqJ^uF`^{y zx4dAulh{eElNu-eom4rg6hTD^G>qWdy*uG+34APpcO`IB#KLmf9jJMOvLc{Q?r*88 z6t~1iZMpm$CgXWAweZhBmCHpRL&6A-pdc)9#{^AOIJ#45JxD7`{gQfD%A3Fy>LhOh z4~CcxzXyc%|F^)P`rZKfJQ?Ilj&dcNqeMQ(q}xQe8``JyOG%poL+82!y>s0_O7%mXtAJB8YzSEGUo+Bm*b+i@T_NS~;YWYAGC(RMV1$}NyBC;>hU z41M}jfP5zbo8naes(QLg$^BYl?S<+(n4X}#cmNQiZp6>bg@-kUrMo>Sd)pKZO; z)}58?+`yJLj0TXFks)FSCs2M1ce8ChI$iigfShMR)@F-3M$&g8AA~7;Fge7F#wUz~ zd?LuY0aA)vh8r!~3fU835^|LoO&7NJ?w&hZ%xc9bRR)UWqIyWsxlaNWAHm=`2{#iU zpQ9F-E!tQ}y7JZ-5~TM*2-3OAWuniG8C~hQ6F;=&TQ<}7?GPoPg#pmdeBQGQD6a8h z&ASk!wZIUh6+nFh33;_0x^Yzkb$)bR3M?yc(Y{8~mG@6!V&blDRFmgk`M^xHb6~pU z1TlI43L;y9!xQ)iV7T)B9k9Pw(0uVoya%Kdw;X5Go_lVCiI@Hi!Atimmx)T585pE_ zLhjFQf^4QiJ1m3{=-k$+^&t`(Ad$G>F!Apw6;H3kB;kid`n-_A?Ex=%~bh*JA zGo`p?q)~hB(O7FAT#13Njl$|o^$H_>`e7$?V%O8m&YdAr!!fVSIoEL7Q=&^(0<%%> zOc**k%!IXsjPNumpQHFeD}4RHI=MGbHLZVxgoWr(bZE9`qiL?EdX!5na*4$*@hC)g z;IH0Dl$*q{CP72mbKuSqNk5)ZgUkxLA4iG3i!rt^^4(N`}zJrtFd zfNS6=WlajwE=D$5>12hIqF1fw=ncY(B?|_6EumnM$m`?=3E0}8t-ir$``g$YPQ;d|1g)kmRiEy5QC;@K^kXu6`ZfTv& za5B|Nqmv0v&UA9B2rBADN!h5*3l4HJz)4>xyExh2$yQE!ilAcMo}Hggy^+Ay1m2Ut zSqc0nFvR4?K&@;jTLttX{t%=Tx14Cyj@@s;3xI2{0F_ zTNY3)dMYF7h|wP=+SFGn-vJ3Hjaz|LRDwGX=mz})E$0%1x#_O=4Gq*#k;E{Y)fxRHW&Cm3gI7FH$Ziq_a{ zR7?Pq8`KSoww+B)pG!?mpBG)|c}SQjZ*T&WP1$G#TcadCAEAc(onR9E9&m}@LqZ(< z5eeVy?vzAB^MurVhAQh~{atLPi(LZ=w*yxr<`e526U+4LO@9%*$pyQ);Aj^-6%zJ~ z5eQbAg#&`%j#>uN{pMQ44Z6Ze^*AFX$3htV8WGlYh!Rlot(1+f7UD$jWRjC}ot*CE zWG6p%a+C-v4iq&N`+C71PIh*(os&{0n>ktE*Bbjm1QqW=gXf=4;Qa~wc><>-@IQcI zM!pWzfT8TQ0Qo%=kWT=;V?f#)A3O__3Gg|D3GkM3nP@O(QMTN3H~)uCfZr*Xi#~)X z0bdD_y9AI=fEJKm%b@rkV3+{2fMEih4Ghy%ZHEbau(d;VaF!)Vqn45nChERSL==K!) z8@HV1_UKvVFBJ2D_02J6*5?rB-NZL-LgtP$mpuiM(@EdiXgzF}^ft2EwpBS~rD~%EDpX4V0*iAk} zmht^e%4qa<5q@U|5=KZa3-DjS(CDYYO6kuMth@LY5xwBK3(;+#Lg~pk4yY2kvI|wUt+g#3oGi_5(tMq=`UxOt&LQFQ>9$V`w)Eb zya@N2lqmr#1I$L{LR_^vDRxriqyst1);P&KX%|7obE2ed^k*-4+{wdE{@~;uC$~Gf z$w@{86_-J!1UNc@LlW3Gfm6tmmrS-~r@NeE~!XcuIgg z6M)>{!JuDz@!r5-@K(TJ@Fy4?UIbFx=0EReFj%_W;G;u%{h~9hNqyc@Vtz|kudX*s z-!oD%|26rv;u9@Z%om7S<0|Y;=S*kSQexU&2IOsMPWRL$D^I7fQgjaFnvqM?%@? zT_>+QdCAE$PL?@Y?Bq`(sJK(qRNU+Z*E_k+$yH7+adM%Pvz?3JY!L$zxNQQz z-o3Lzdjf}2AJRw{xAuz(;$S`5h9tA-&n4szvsUE ztIdZWki)oRAxgl30rDGZAP=uf&;l2ibj4(0WW z&ax&gymo_0K-_kuS$dO^iVMxeiU(LTvFrB`t*eCB?atYcbyJD(+6$PCUT3u@H|S-p z`swNuP(xf@<+Z0mLR@vDw#U_PB|!)tqQg1wsnQMN>Nz9Tj~J=A(@4oo2xj~Pq6B|N1lRr86os(ZV`K1Udt`jA3%<+OtoLuPSY$v0goap3OCr65)Vt;6e ztL+o`ZJ$o=-xIhzf&Hi(;%ZM|m3L_mpbt|YkPTzYIJ3|m$aaEBTn&W~SNkZJiLN(h zRPMR9mu)hCMN1fWAWS7-DnP!|3i7xr2L0ZPKSvBPR)#fJR-Nq)P_jRmN|3 z2%}kQq`D)eT=b4eE;<6H67WX>W~04?ve9l%c673}lP#Qdck(q_sQH-)D%wR!+~|41 z3Mb2*v^r^Vve3x_C-X&6k%5L|)uaTTn81Mv+$Dk60z;Ue5kduJV>+YeC!JAqo>|Cy zc)b4rlaC5VLagmJK$v1zawlp5nTamZ^(gOMLOcQ|ft2DWRGGvJ8rA2h7QfHnmCuHR zAbu7YPQX36>vp9jo9KF;?+bES>q`F(GKnYDdlCj#{|hDteg-iE#~>99JPjyGqWT2a zbzI=^9s$U7E!9;SiBDDr#j2GVRKG%Y4m#I!`+BaybAJ#?4?4her+Hbqa(q4sQ34(o zAZrpx4dtTULE&j+YoOj+q-F<(hugZp0>ii-9HgjlAkcc@y4)4}70Q=tbs+IM%b>n6 zF@JM6>JZO8`+^xW&6_qw=Rxyi|D-k4u9_ z!lcp28@ru9m5uiAEb4bc>t+$Dua=?}ykL zoEdbdbG~6=QDQm#9GHzRIvNIx$^@Gdiymi5{PJt` zBFt>`GJhd|Q4I{J!Je>=XkMD8O!PdE!oNUV;nN@`m|0-hZZ!A8e%OJ&V8-V_m-O87h-rV?x zDwIE=8*LKnQuQ~;(}zBk;f*atGSP*WvtNE7w}p4?b=Bm1PLwGDdj!a54wSjU`hAEn z2!90zgBJsX!8a#RZJRf}pTS`1a)b3-1McmgTa$J^Gry&``Q{L_^m8L6=l?~%FVS!A zV%M1vb6Te4c<0>6^f#k3)y+V@F>wS8R@o1rEKfh=q|fo@H5z2j>jx}w&2NpA=(iK_ zkbZjr-R%(5#C=DA+;<3NqsN^*>_k6*0rMUw`k@DM`ke|$Mg(n_iITV_@`7`nobKdg zCqH)bJwGLYiajU{PVAMyPY>wizM8-#39O`USOIR|v9sKpqwoGi-+ck{`;KZ% zRa?$U%$W}}8~uvE5HlU|%@R$&-m9}?cLm6Ed4bu|EWk9e(?=^>xGz7@!^dMI;J5f;wlM{xDQ1JjXsQ4JI0j>&=&q+Y8;;KZ& zTQK=qQWc>>_ccMT9vC{JyA;7(Gz8=-rX?y4ftj@{6shyUB zZqY~gB#lTp%xtv1Dxu<9Xi#xRqHRoo+*yKL#q>nQ@i4Q|3H+6cCqrdmD=>8A@c@Y% zkgK>lQK5^kZ1f<1rJ|C{v|z=*_vwUR0o5nY^B`C8Ggr}rj{FlQvU;yQY}>ug zKxyRn&_OPHT_SrNOk|fsg6yAx;b^c7=wqPI!CiJ{BKs&zWcOw!2ia9v61x3Cr_Jvb zZ00--ydDKe>D~J9Wb#?k;u@e^`$?fi?mK~Lml{J`LFzPMrE^aPx}BpyW+%@}z*%1Y z3@}K2m{=&gT-K_g4{t9U4@Q* zzktbdeUr+hWRtKk1K-}RQ^}hFa?b^FB@nwaw&n3!{~%4E*gi8*V~8V&YP09I*Iq$;cr!rKOjbysasZY$w zqCJGblL7L3duq}&O-jsZfr&Yfs!Zmj5_7ttFDUtzCVZ5>QJbdZg2bH9VDj6AD&lwo zkvS(P=6q4n>8O7N$UQa4HBCv(Sp_p2tyZOM^mo-j)9@d5iuX&*+cQAUp&-}PnAo&4 z%xtuaDzUymWYe|E%6j%glm=%P1<2=ooi<&X*z~#CWPQj+{|q*rn%Hy@N`s~Y0^~U! z9WM8ZZNaf2Q+;hY#I+UXc~&r zpy{vxdFBSWri&As4uqMF)CV*TfXJphly#eS+`e-qDhGNLYzuNt7bP~8z$BD4W1# zW*Dn+%K@zgC#M*hzZlPhVg~>XGUt8$}o!lG^Qr5 z>bHLVdc`~q${@zXoi^K?rtZ!#q!F|dI^8N2)8Az-Fl{xE&&27hx*V&^wbEWA?fo0a zs=GtX;D!{vO_w2VdHA))Z%oxTADXT?WUl4AcC@FJOKW6JVPGvCHB37+F(lPrw)02X z#4<+qJC?DwG-z!Z$$EliWvmZaaA>fsYFzVHOFZ+5JnwsoWTHx*Y00fx#G03hCNT!&9`xK(rX;$_b6GDtQ8_*@ zhA07VN#L~!yeNUA5;!PBbW8)CA8B z^W34HTk74Y^4vQv_XE$_>-OpB8}y^a< z+S!&ESr(!e*{Tq_v@Hew%7*OorAPK?U@xxd_`XuvvcY4oedEhQXUyHv#`EK>Qkv%G3qzD(N# zLU;yWnacd~P+FcpT_?WjPpS1ToyNaYGzsvb8fO)nyqWc8ialy!4xaYYFXP!3H?>i7 zj-3dbKH|2=7GTVnY@IeE*~QiTa2m?jTk~2y(>+qFH(9+!+#E)4_3zbU8Gf76#T@x( zfw^L;f<^jdl0RCgz^uX(80%JH;RaTvUyYkSF~cnWaMH+Babu}hE{>b>+cc(D50O7d z+1L;=Zt5Lr`O(hrn95Jr>42#tiE31-GgCti*w&dX3!SN4H7OjY%ki+8nXETcQyr@n zAd9G?L?c?HcX?(3R`QAA6A9RG=Z~~`< zK^H6))B!NvE5&5;{i==tR}|G%%9WIjsETuS{Y_jAB?nHMZwgi|S;OV4SiY*&sz69i z)uwF29OfeWVf!;soYBJ)qmM{<9KX{IPIu^8i^X@V_I(ng7I$oQ^L_6zKXT0Pm z<~QTNSrqe>Xd}T>Ba6Cqt5Pb;^Z5$0O^>Cf!7jRTFxu8X;Mzt>+Zd)b;!}0XX-tjD zFH&_ZWquqKH~*CW+a$yj`8z0Ds*m#X?}19Uu>H11ou?_*mD-t8Q!Gj5wEa6*Qd^Z# z!x?4P$kcZ0mUWwqhqcl+>LjDX1I< z7{{sx+Uvi51^w=P{*W>4GHYcxeC9RcE8}MCFBxqK%_Az~ZY$I>b4R}%hP7)7`v>z^ z@@ufErO$4=&Uo*(wSSS=nz$Qx2>j4q=_6$L30F8NvPRIiGWjGKMox%+gk4;&7@IPK zvEeAsaE9YwnT@!OMShu$l}^tr0XC{rcU2Tuc7|0|{tnx*^a$O(u0NqQ>Pg#s*eE;K zPqU9U6vP<0!P7jI83>HjytX(c2!~6*MIr%WeVUr8kx6j_hyEH4rlpg&SLZN0F7}zM zXj=cGie~Z83@P1t8Xe%ixSJ21mTdi;C3se=8;LT2XMh0=M zv`{6P$HLUdqPiCOkSjcid++jlG~rNeu6bg;Dbo6~weeU56tY}&#!X*h4Q?pCR`*(Q z^9*Zfz|)*`Z5X~-r}k`#DYQ2|SEjb;^O#}H#lxC=);ITlQMKl)8Jn(@G0Qu(mzB<5 zVJ6sv6FZ>XJ3jx3)o-(@G$S>wvxcsLbQby9H=4k9$;2usC-X;FX5YPtVi9!daN*{| zQQXj6Ya=oy--D%~a4$PbI+*e!80q0y!iBF^JuZNCiKYmf{*(sE&IZ;Cnww|F=_#&x zgetDup1sG{mH%aZ+RyM#=lrLw4j%^EWr<*(V^23+xt!HP9pb*D>*_OZ&Uf?7x3~dc z`G^BjxT{iORj#JWY~yE^(Or2RK1k~+g|)uO9mL6i75pkLXf!48O@D4ouh1qNn+xbN zLKBNIv69l1i>Y4z_A7Wjv~zJ(|E7Pu(mXXI)eeRM?|yRZ0Qj$t}pTf3II}=am+8XdLW0YdD|*Iee}ik8xmVtsg$`H3YE3 z#W{YMkF-+3Cj~5@7-k53WqQaLC5Ax#)^acnil<_RK-Dz_4H^Q!!1i)3F!DEh*M~3A z5EQ!Z&hPB{*0@4$CqC?irM2vZ9pPo7{y}bxTsGbv9@d%h`8RsI9D!%279EgoM$V5l zCDKX(GehSctv6l6xt8dAO zMd9>ASs5PgttnKl<3(luWLBo6&HvZtvstp?e2&xa$k_gIdMj>NhRB*B>1QC!aNIjA z{bIh~cN`*rj8edikyC2rlp4VPI0ZGfPudnq?+PnV?7pB7q^B@qZn*ki)8H#l*;V^_ z2-31XrMqgk&TOr+wl38wFs)P`9cAkhi>9qhp&!hLtrTMYhoqNLd4IXLW>|W;Xl?!s z?x(vxPuLK4eW>uqR30l(!M@c|bj9X^JaO;{pyP{O5GqPmT&``kP?U_FeSSypcs^5c zhXQMj(3--LCEvJ{^7&~sMU6i&6h{`Xs=4|V=U{F}+*dn*?i=hru=55`Pe0p*lV_!> z^M|1dK}NOwpd?@!5!J_M3Qq-PLI0@FO1B!48sblJ!+AJc%tdff{-evf z7kyS*Mv0XVN7wN5^KIXjP5+>XiCvdoUf0&KUETC{oh|B`@)M`Ovwr6BQ^&e1N&&Uw(rx3?%WVt?w4$?S`qM?|TP!!Q#trPd*5c_!+`a$H>zlr+ zEIlljUN-&RqOzhQJ|yBJN=BG)+qo6O#A9VKY2?b+FaS{|hLZ6?B}FIwWa3D6XKSl zvU^_1(*uoQTzHJ{e4uIS;AP|p6f5&r2QKSJ7w!bOtmZZN@)Br&=#g3i%EoDm z?=wzucU4{KqpfZ2CA3g0U1b)oHJ_E91jB;1wsaq4?JOCmd#5Iq%1y=1#TIi{rHjXz zu0BQ6N*`U`_KwYs;w?5$Gx7INp=?t^B<}L~&-yXk^m40jZS}}M#sYa#mny^Mj7?V; zN%N+qk9OqWV0rKI{BeBUiFGH`9bY%{IA%6$Vd0z>=BC!Tp35iq=9qV4E3H>`dA&hZ z%Hy_S{aW3kX)5m97H_|PX!@DD_0OkPOrQ*_GFYgw2ds<_% zQn9*X)mnv-0v08Ci8RrrYXEhkhCNQzx~V(Y4o$hNb_~P_$G1b;t#6h^rx)N^yNK8O^bZDP_9@Y zt@9a{+b-JI)h?9U7I}KG;$&g`;#W+!_tx8I>r@{}^~Tg~_Q}+3sykoRtYD5b&P4T$ z)$G>z{*TpFZTO){H9E}YrT47G9Zm7e9}HN}({0lNdHmJ7bO)|kgAdI-^o&H$RP<=I zoS{}`O2-_X(JJvAL(Um0{l)YT!PDB>dvh1FW^m73eR@TGTfS2Bdwprqke)e|*fR|) zkhZ%G=fs>1=2N*mL)3QtzGt7|Un7HXWL)taUD>s-SbkFW(37pOuf-;{WOvb_tS&_^TdhdXc-{Muso*Q&d~ClUqoq;U?aXRn?- zpmkBTqQ~Y&-xqaj@r6#dYZ|uC)y=duZrYHUPiq08Ctv^a-|O%d%gD`1$=dqT!#+co^<`cI=6Iu;PP1jw95p*n(}|N&Q4upJ zwne0J`Ujdh>0DiU&0(1tytBJzFy`8Gi_IZB(RSHaHrVgk?uldD@1toy?XG>FRe5dc zsms^KrF*xxYB)=v#7QWc&W=?sPk|aedv`A#-%N8`;uMk8NV-# z<hlQlnMgzfM)>flQhlvbulwg;?c3dm_7ax==%k*fTC^dPuF@d!X;&L3V^7mG zc5s&YJ7gSG8u|36Rh1QK_&%>rwy)mC-pR0wP4Y1Lkjqz@b}7vdcu6i=!#=z}yZd^* zDYH~sG@InmHTAo6#7n)=vZDH)9el7M%`4T$3JvXYMOy1*K9=-@I$nLoo+p>bgQg)k z=}hgZD_Huwsl}DroOa%zbGbIPCxtCiy>RsoNk854k%bb1S0@1USk(m@L_Dz|G}zR! z|3!z}f8$S8mh(V4bD6dTEsQUJG5`nXYuU6pwPeLySzr3V8a*k~ksnb>1xr2rUA>SJ4!a(Ok<4os0 zqQ8iQEyelx?}SVhlTYGvLiK4zx!h94G5RxHe`@uCM{WL|cO{b4HY3QpR4@jWwWU=& zhL=|Her9RasZw@ZFmP_F)mreIJGDHYeDk1VuhnJ6L!rBK{Z(7Wxj26p-y)C)`}@*_ zU;4{~HQav7Wu5l}R{9X#!sX){Nr#%aEk@v^Btslu=ty~3mb z4DJg(MBNX1tx44N+E88FN1G-ZQCM6%?SsL!)1IGJJF_u$wyo1cntA0((Mlus8$)WO zQoYxO&v*u?mPPh|oG(l-rVkrW{!aTi<-eLUo%ccdRJSzTA=PH-7jbT3Qm~~kq}amz znKd$1I+MAnk-_zBG}^LgFwXB28l==NMYUIBemUmrZJZ%RMaLh<4AtApcyq$iJ@91y zQdU6pPH1ZTGW~qhDvmXLMpk;=<5c3Z_hzlj6px9|=sh#;wru^oFrU4VAWzRo)u;}a z*0oR%m&csP1Q0L(99zq(TB+baTp5I_f{;G`DhL@5A@TC_B(#MKjSoV$sL)bn7a`*z zBwqdu3B8IwS~?&I6;mMd%DM;{4fzvMz@)dUxM z=>~U%-54RHb)?WI;~^wo{wWC^=tA>@5EIB+YVRUsJcPu{UoW9eT`Rw+vGDUN7q8>1&EE+-faks$^+17S>`kC~qVd)jNo~!BN{O{Pk!a~EU zWKDm_-TCUCsG5-1_wrWrKcA}4Q^0l+GbE>+_T(j4_M@@;;Im$Iw3nTsuGkejdgVu|WyT7pX`?asv9b)em4)83v=9KQc`&QI?{HLS ziDtnjF#5An@z&Nz{-B^zs#qk$+XPkl$zQno?_IbyI3G{{xPz87u6$-6;<8PBqXimT%ZJpSn9W4FCpgfYH+((x)O zkNe?#1ZUe6)#^&I*4gxm0qfFh?PIR^i!X-E>cPj{?94-E4(T;IRI?fshI19|tiHjG zqb9H1jO=DJpj{0teePLLiaBedSSPqNj}2dZ7`J`2N!;}Aw{fP&jrDz7kC@eKQyEu0 zWM)IR^^32Td|zHC*q=uX!Z{2XGeNt=@O<$)oIU+1`SD4116vXC=kNjRbc_x@)vCoj ze(Wlr$CkyX5;C9q;D1$ATY6hA?)#!W43sv!s3)ZhwV@r$_3|Qj_(-{z@0#!oneTDB zye@~MfRm>kFzs10@%oqCu@}5Pb%Z)rnRwj{L6&oxf2WYcF9P3HSZoSwXVI(LbvYhFdZl>iu+Pbg-LmYE9vAkD(>+pg zGygITJuX~qeeY|xr=v6iV-)VAGy-Gt*Z#{!K%Vb%c23S0oOJw2iTOi(PAtyPV1g{I zQa|Z-mCd1it0oP;>>rZ5-exsvW_lSLGecN-4$pr?G_A((d?)0ESJ9TviDPwr_lBZ8Eeorju57DJiGQspv)MkV@Le2+HB z0;^JXeEm5aWUZ-i{o|U8$MN}nnaRx!woEFIm)6UlypT|zUQ^$Ffap$;fb($mLM#zRQF{7w?m#){C7gHU@A%0q2v5i%Y^;^jXioL8T)j)NBM zc5B>X;W;yBq&7qU>Ma&dF2JH$&MSSSBflxFBm>76h(6%=5m**6jILumSO1r~mj~Ug()~sUy5~!G*Y3}h_RKc(uagt!rlu%M z7)*oO?-Vei#-lOu^4rkZs*{5jpI&i!ym(g(BW=clKY4$P#^X)njMSK*aXhpzEXG5l zc=;#S5+ehao{o5av;VRyEukw5)s-@J<*((kJX)*AYQ`uI?F@%f$J}H*+7T~*3hk_# z??P=ssDBWuffl-JJcPu{?=GS9OlU@`O0}7jws`29o^zeW8@?(sGZxVHG}B*e?#fQ0N&TY6QP-p?1ro_Wyx zU78(_@Y+scr1feWD^ZaYXG&hVMjo4;TGNxPraTleYsYxBBVN9*wey(E(a4<82!UCY zAE-t~Y|sebHAHP*YV}Iva2n;S(8|JIDVixcB{aTVSsGsfErf;fXk5Jf@7K`DOpwFF zk~c-uXnnFCUA8e*ypI-CwL&)u{V*P?#LJIG)v7;I6ld5+;0$;=&fqJ_rC&=wU)NG; zx(R=D+nbxz17bFBMi=GBpM=MlHEKF;rkAh9({qw(fT@bw#l}EcFKARUbuGRp&rOXo z{<8dTL5bCmtVQ0~Qfb_@SUVIy(>EhEocv_o{$}E+M1Gtbn&885UTaMs1xubjstn3G z<|wY)W}94=UmQSCD)imcxu#;q)1^1H@yn2>+Oye1sWIv`jvo*82a~`f%EYTrx7Vi` zy2Z7aMB1-DUB;8v({)YnbX)W>jJg(H)hdb?>qo*!TdVIeO%6$OH$K;(#=RC+L;58> zunFeh+}?d?-N%RcN#52s1T0ccP{hzJz8=s#oNk>^Zl{|3zdlhMu+(9jl+Bloxn+Jk z%Ph5KW~cfaWkO0PPB0qz^zl;OV3LC?sc^+5sv^u)xNq6 zr&W1v6toay#-khJ<^TN;%}JNcSK8^y+fth{X4N>|C$laDjkQ5z3@yxZN7}dZGw6A7)DaVh>QWQ!9e}N~llB$DGHw ziMRM$lrHMcAFVcKFeWXhsr<~BU9&QpP*&JHaE%-;n{nJ@sa6WFT2)3bmO~4@Fdp^AlN(yp46a!S&G)iix%&LRc63UtllNCm=B9z8od$M6 zH-=X8>1^xtjMT!=Tnn@i{l=p?@$!H8h+tgHpnoSA=SeUG<9x>!j0?a^Poc~CCy`Wd z#gWwug4Oe7^{fBn0p~PTyDd~Rg;bjts?AZg(K_Wc(z-qQE>mQWF?BDn@Yk4Q`2hyi z9Cn-{l5YS>9OE@_7OO^n4@x-s&OxqQqxwGSN)MRf(xkNnS~x5k4{`DGe_Vx;)|W3p z(mq}y7&$E%IYmt`=4|49SrMwajciGw+IUs_xsEUk_?B;1PlnAoHodISqM4GFAsG5A ztEB`=&{_wLhlS$hOGASuhh1YrgQL{ou4?eW?{Bb5nhCc`(M-utLxW|?(qK6h71p5f zA>w>jwoxCrMezZ zG3xE9J|$Kvi&5>+!h&i%j1n*3GZKmQEPaHx?_uc^R9=nwi02{PhiK__hiehbM2A_=o!R-=x@vbX z+|D|K!=zO~2aSS1q=To6H zGd5IHuCPIys?H61g{%u3^h(1#2B~&ogYMvbX|}2mH!X(}rRJtq6JTqD=IiW^pItXF zr7gd=n3>Id4yZ(5&B~$&^OQeqv zGlISa(88{7JoJfI*D@3>b&I)YFr72W@$rOAnP%`sod&GGv^+&EUiKG_Hk$+)1*{cv z8pz+k>{UUbwp_nz3cK^tD>UFYV(F^ubj+fTpZnq}H8f8)Hv3XK$FUvuW;(W|bedtE z-H9$9pp->)qG+b%Z`NC!pe)`S59R+h1jfTm@$ygbu{-lhEp}@hL5$yQlB`>BBsmI- z2Tjs=NQ#%Af#i2%e4;#nHRI)$zq4YY`W92Iefa30x;Chep@k`HJXDL9?~7`m6Bnux zW`uQ%Vs*2=@M;U)v-U6u+Q4uOR~}~?jmVIjZKdHMB!=e?Atvfid17{b2&pA+C(V5= z2H7}*!8OoA3>puM#LG|N#eXeXlFZ*~2OL&isSQRI9zsS0jg>)T6_je`UE`rqy!`HH zTy>s8H;Ii(4RE<6!`52n*y5qsaA!OeDNFSZ_8j8jjmbWn^2#!*YoPq!+BF{SikH8i zmrm6alf(EL>%?6D7`RQRk4!YzlyTG#%G#j?w-^s);^oJp%vZGKs@i2mt1`8=qE!O( zSJh)5E1ESMevOM`ggTL|Xyqovvre$7SQPgd?Hp|@{l92?8~8ep>OkLi>_mZ>t3Xmz z%7*{}atT4u1eD+;S3!a6RxX0Npz={vk_J%%sEG_JXli+?MT% zHt?67w2_n45uqdsX^DZBitzOcLs6hjl$7Fqo-^}aT{%vmyZgUC%V*}ynKNh3oH_IL zzVjxJrfMq_ABlRV_mi;eqlqIhC)34ahIUmLl`KkW0f;l}1$h-|$obuNY z`ylYa*4p^U-bms}v@~B@h$yB49ICNDiSUNKHKKCu?+|j&l9`Gkc_{*x12WwX@vE;y zUNTq=r!K{XIFv=7Sw|#mS{w{HH#A4RSnbP%dUXKH)(IS3#T9q|ldZ#L1VnfQo*K=| zni|aki_2kmyAaK9o3q78p}d20KX%)PaNd*I+MuDBw&^P-=G@Se@QXXO3dV8(!9 zVtrG=1`66~U~DS9GMCmQ9d&62mURgnrHLyxei7USLC9#ZSSmVjun|{WpV>t59Jvj|(P8l^ z*eu>bS3Qoz`{aqlQ^JXjS4B~nolzv-3oIoL97TyMUX+VU`MZ5pm;?Rd=aa-;S>ln* zW)xUT95~pBE57}uRPiVtiEFZ{7AGiiIKCAR(i-kThIvRCOyRJPfe6>zq2DOA>J#z- z&vzyJs2QbJy})v!5IDpUSG*yM6RZ)ZQ*kamj(XqwA4iX#!94IQ{M`lq@A>Ox_5R2F`8e1#qC1~Sqc7X2 z+8J&t4V(Czh_mSl^vVXN1%bijgzN?*@zG4?ES~j{!3%!U_axcku1!3hZUePCz*MgNs4+J1 zEPl=QH`=c|&C4WUsNGmuP37fL=?CwxlW=Ro?bRl-QORTJIQ!YGdL=KdRcb6?TwlR%iKSC{hu6xr92BFZOj(~$S+#WCMLG0c z7en9np?X!U?axvyFV>YKZ{qpr^$j(ShXsTX*WS5o^nXOT<>y zq||A^ToVUOYvRyWxpt2+7}WLk^T$dzCxr^$lcxGQBP#08jE1$nzJScwg<~9hjPZz0 zdO)z2q@Rx*b?NsRP0|}YR(kSA$uF=h%|Bv1mrpe+*B%IDgV?`hVOGgeC&`p8(CatS zqk`U5d-Sf_Gas(k1-TRLO=*z>59Qx7Hr&Md(2D$c={;#SQ@QEIH&-pD(*0o9C<>>a z673#6=*Vp_UKIQcPh?bi?{VuGui*GfAg|?pex+&3%01%!Fp4SU!Rui+UlW1u2YpX$ z)BQUiI-jzx2lwu(g4G-B8OElNy6z)jl3IZ?wXt=_F>+C4lG)B#dINhMz@jzLIv&H@ECuuDbRQOy$Bm^;`oX0LvVy#-HHZK@azg-M!_W#VtD@ zhWh%T=DnjY_KaPhmHh z7T-qN;$NYJu+d}8&?cBsUpzrJuxV**)`wPlycXr5+CBGi8y8m9%{>v73vbaXk^v^2 z_KdF^Tk3MWsvCkUwf+U@zxV&%{UAy2F@6VQLbjgm&ksw; zYSnM2E^>a%vEzwKpM>pL{N08YNF*V9-q+qiB74-&3B`Lu^Z zRroTE!{?eS7t)n@94MNfQ;8qc?m3b&GaDxL)~zSs+L$L{5BW+~)hC-feKNYEh8X-8 zuMfs^ptLF>(GE0_4C8EB1Z9H>Yd>uN%or=ggq?kv`#o6|~NE#Ac% zK)NJqW9{m-d9Zf!vQlJOH~5>eADDe`PpU zth6ORSv*TS`o7e3hEo|%0&U-Upg&K^0*7(5R5q<|D|mYd?1tKc3xbVZ0ZzYAu<7nf z`}#Jyjz~jwhieo5hqeNz3lZf3y}g zpZDH>W`Mr>aW^Yx@rCoqvEw#1cg*v_@&3Jww!?Ax)J^Fz51%c~Q}C%Ll68XVEU;8K zr0Df7Uq;{;x+g50%5V~R2<1uQLsJHv6%Go?I}B7Z^YjxI_GVbkG<`sS(wkO>2O7fW zm5(&F2E06i9#Pt2E?}t;nxlns^Wk8tF~@bq;Y1&k^=#*u3&FysrT-4}VT#qD*AAOl6i%S)@V6 zNx+CQ8W2Asgx@Hz)axMOuz?JFGtB@n%7MPWAv{dD)TMb#n!bjxJOb}9N7zxvGL=y} zWswFMF9e(b>;fJIRx`XH!}BvdFT>3lzAVFYGdw55&J16g;Y%_+JHxXw{J9KYoZ*Wy z>=1@65>U=oAv$OW@`x3Ei6NVZdem7nxUk6##Y@{nobCCehSxNNTL_0_akXw_M`(Bjc?(Zr?NBlH>M2_oXKB zq${`l=AvGVsyRNJjaPt<_s!Bi&R%!3VSgD?y#?=(m}vH9J#gWp>3-rpd6-TNCq?OZ0B z=dzXX#&er{#)r=3Du^r3ZLN)OJGWi4-3wh0W;_`XmjJA>RvwA?^=-oe87{=@wgR#& z6e9lsuvB+{L%6RY+?&H&-GI6wSh+Npbsjsb2I;&Vz}m$12_n^;wer0}ww(y}jD1Pn zItcT=gWvgZnK2!ZoyvfCTA<7(fyHZH0tfO0XUwM45)i@??Z!1B?5#(bQ9xW`KvrHt z%%K$+ud-+6#x+AF47U?;P7I0L?VF7&p+9!s+1Hf=Vyy|vvTisG;#+1mB+9i`s3}t} z@l>!o9;xd14dPqkN;!zTTvINCk>`Sx=&hfe?sP;PPDM_ik93yBk&Yo5C;#D`J`1!p zXMp|;Pd9}3HH4=c!h0LSlMUg~hVV!Z>*UmmPHhmJQ*-O?bI#USdCaE<%wzgez*JAu zEzfkzGJPSZTTj!K({yDteLkmKPt&cR>C-}cNsi9~t@9kvmf$1EUwo~v!7|R~qygXs zss^J897ZJ0V$5ze%&sww((du(JJZ?-#`7hbZSmn(B$B=$WeO*RML>#cMH9x$^!73? z!0PT#gz;BLKhbs#{I{Q3X-3dYY2lUTrb{bB2QRJMJGX=LeGqZ=-{_v8=Q&cd z?V7Fp?rdq>+HxwJ>6V-(&U-Q%&~U5PZel}UZ&FCR5~Hgc&_}EYZYD_O40aMcOEnSh zAiR|@PrT3d;5*D|$8UyK#)F|7dN-OR$ZE`Yiw#Ck49LbE${@(=y!M4q;#Ei1MW@`0 zpxJ{o!`oZ|_v=yloh7D)l<0R-AVu_O8fi_=(UjAdnn|aGeYyOIABc^&_&7LL2u1WZ zDXHIKpg+U&4dJ6T?pf)6!W zFpdlb&}QHjq_=Og?eK*;X&>+$lPE55Sg$z6i0o9{>{@fE_}ech5e9oDq6sF0xP+YR zz5|la@$k2#8!aw2cH8w!tIL-jZ=@G78MLbtS=U zTf+ojn)N+MINR30b+L%IH%D$NsC{*hJy4p9;`dTO@rp&vhQlB&fW6vv?BaUABMvst zk@{e2@%_M<2cjLjQ*E4UO&J>_cr}+^VUm)9lhn4Wk;X=lNd`5%YM>Z`lS&z}E&x+> zPz6QO7pvj0M>!gw*m!@BEywOdmZcYHMPsnag^D|{8RY)A@L$({W!>Uy%k(*mnAn%L zACy33XU=D$y{$?-_nX#8S{aRuuO5xsCEkSf0zO42!q?$!b#>2{{=96aZ5hjW|xj`1l3pGq@!_ zEV`#Hk+atWS-tLm@vU{v&lHrQMv#UYbkrYgI2+@N{)w|c^(v*u9azZ3*$?=@7|}kX zRAv~My})Gz>8_420|c#&6#ay)E^oW;{8spY$V;X50d&h&%Nu*Jo1zUe#Kd%iMDKw< z`x`g}YBV2IX~w;{!`CmI8^jBKv=p$Mrc#^+*pXo?ko9ph0QvVsz(!vKLh+h_&fm?m z#DnF+g$(C?&>Wfq=+CfeWq7$EY~FJ1a<~C6kD$k5qD(4onJQ5_WswFMX8{)|qXF^L zLdu*0mNHHeR>sK;M>5S`V3Y&BX)zBXysrUo-crWV2E05XFEU1%$Y_~iTmi8nATkaD zs>*0U8T*BlGXN}Q>?N#>)eJi_O$}JC?@gP{YyCdLQ9gXkTguqkfR{(mAY+t?jFzd4 z(kY8H$oMS4Fz}hc8-cCBS!FgLU9*s~T7WteWnDv9xU@0B1)wy`z*1(@W}o(>*q>;E zKIDPMyz-I0fTqODBf`iWWg@d>DzkLTA`LQr9&k1AZr})TKEt~*yfeekW%zd)em289 zGW<-2a~a;A;h_xwHpAO8yfwpHGCY{!tT1emfO1X?soxAR#$EPvMhL63sSGDG6kqco z-rtD1_lhC66#fkFYY59BxPl*Tz{@GaH+xe2E3et2F)pfBY+Y(J&;b`QJVW= zr?@Zn8D0;j2Wq4($sa3yGr|0(a8tNq#%^G7-qX?^*}VOyoq;YzD(bjMPuXn0g_J5X+O6=!8CEkUIRb=pz$@US?oF&%@8@tO(^GhW9tiz_>73l>Cy z0XGm~8L)hk^QOZ@Dihx)OWIKj^GiEwCe_Lvwej_AqxGE2)PI}XXm321_r%}Wu#Gn0 zWPy#BeqcOm5|DlwklB1ddJ-`DZ9saB5TU&vp=^d1%fz1Ybj81IS$ z%f+xkeCHaI*cKAn7w4%`T+_u?MFhDUw7#8odth+F0h#&&!vO<}&psCp&;}=3sPPH~ z{bpRkKu@+FVaWlRM&^=Rg;>lIZ^k&4pUTXQ+u}-QVG9vwhCo~=5%E>qXoVc0oDa%W zr>Gn8Ei)A3kIgaKHdD?5T@IuwGwqjh)i&B(rks}2?MK+yiV=s?OirJQbbMQ+Qw!tN zdS6bT1lpRTK!1iu8p6X3;lYORKts5{A>7vx?#`YO}9MLEz9)joIaD&hjaR1PM^x@`*QkdP9G6!jX6FEw9b2hc^mD+FHgHh9XY8J zSZ<>Qj%kZH#W1^;Z1xz~F@n5}HW|T{ZM0wbxkS<)q)fwvun0)amU6sIUoPX?A=_yE zK)2B}dbiO&1Wem#w!NJ8f_e09H0fE}2r}_JeJ-`3qguuqy$YZM0L* zOA1+LXGvYPfX0owvN?sIQ$2!B1TV@Kw1)6j!sRxaIUBdpMi3%;HHWzb^ER46d*Wcg z*hU*5*tm`MlEY~mZGb9g&#|CX45rMRg5BM}Nq?3|R%wFL0O~N4s4%-r^ zgNf`q0pi+PY;tXQ5s8#JDiKyQ62v8B{LPuQzJ^V%s5-pVTf-(-YIpVlXfGYJ?V=AG z3@-V>DGZ^{IN}ZibIV^wFt_}GsabFRgmcT+H@PA=6+F%+S3d<7zsBvHZgMH)aW}bY z7C`a6z?jt8;}kV*a;0F}_a2U*_aGN|r*1J$_6^(rvMe{;M*qsjkgYeDT1 zpV)ZHxvAwkvn*Ah6}9C8N1@^lh;Zi15d3a>=l`>c6ZumBEmc zfhS7EZAP4(J>zMU%V4?5mB^WHLsqZ*XZ}7mxfGOvKv3W08Vok&CfEFCrDvzuLMF~W zH7b+d)wePOptBcvBf-4M)ko0UNYP8!>aJ{Z)xc=#d6TQd^2TD5%iuAaT)m%9n_P#3 zDouhH|AkF1A9{>wko~wlQt7C`^h%#09dxAZT;>du!78ZOc?DKJ@LZN9@#Lh}PGX@s zaSbrBFcdRP;m(J+XS;mg5WBTTANr$>G4rODRqEu=8h18?I~v06Ib3#YqS0xAKE}32 zh+0BQy9{>DKIHe{D%m`+_-zV|iEPk9lk+qOWFjl1GK!;K6h+sk7`CD!DB^NHVro1- zD8QMv1S~yks{VuXMR?x}GrIWBKQ6=M4 zZB}j!%1K&AJL7+|0V;kxj7d3}aylqEQxa0Ih~G@aALnIkfn>@lDX7ifoM?D5hn<94 zhLg|{>8P2UtcLk@o#vCDd2F4aBVO{|2R;qt=e;S00}ccwrI=x09Q43eoNUGE@64`0 zG`kg>L2eYNcBUhUEpmt#!TNkr!GL^#S$OSi zS7i?$=tlp6X7Up-lTV!e4Q|0wre4t#XFvDnQnb@3)#?N0uHHk?<^fwH_$vgZs1mlT zcU3<9Whd5=6D8QuWxSWPv9G8GZQEK+f+^l{CtaNE9c1@sxV;QhyIFA%w}3OP6_^Z^ z&LR$difc5jHO4n#sEBFv1xC4z~W?14=}nn8gqSYcvPodsEt9zhDA z_0@g?M*-q)d?U!eemVc8;|l9O8hP)u^+pJeeQ9h_yO<(eTtAT<{45d6n-6(zh(z-q zCf-=NS<|Uh&|#AiU$xAfGY8e54o+Bia0U_&D<`g%`{0IjQ{owJt*OIr#7WjOSVQE8mO(Xird=*W&ZW>+0Co&Ge`Hcw3=>Rt`v42h@Sg2m_b z!`UjLWqGdL(=MHL_vjnjuGxNJ+L0Lv38;|p9KSw&&GzT{yn~vqG$#+8A9k31L3-BV z;K*0k@_NfPe8}sX7kws=%ju1tJj=D)@Okwn7Gxb~=M^eap@rXkVbVg2LZXFEVD7YM z5ageowjKB;c@S+Y8w$!OoA*I z1J4p5r!VF7(ATxI@h}9HNoZCKk(|jfj(&AL7|1JqO`P?X5$ZGyELVyIQNK1gK=9(M z+VH7S@`qkl9Bb2$)82k8p72wOx+AX_AI@CnH5N~jA8n50rGO5}S1XoWSI5kzSM zmV-y&w0m$}2QEeE{XP6wjvm{%A>QjVY06^o1FOf1CHkMQ4Dfyddp1PsRar2_p-)J2 zM10jKQAkc@=cO3;10i+`A{NCL5m^3Zidm8PU-hhoN1XJzoIah?t*Pk|AMepb=?{bL^JBUlRUZnpW{2Q^RhpPa7Hrdyur zmSy^MPM^u?dvp4v(8m*VysXDQ;?$S4r#0ivNL!lqbmkr$;jlY%Sb)gcyuJ$#&C^&<|ixh<{!mSnVZ`I4a*$Gpwh23BRL z1P3JCaWJB2s&O5+cs92eq{UpUs#pgm4iT$!a6MS(P%b9%1)vwFxd*|wYtyq@=*UmH2=cTd>-9KqHb)$1;l3yCpLaQ8iMy`34h>uwgLlhjn{{U-7W+A#Tnti zJIz3#e?{%J35f04y~SsLi}mx-v4`^dd0ShnoM>_UtLD>M8{dYA=iKe^!P1$AdCzuJ ztM$uS?&LmpzG3;XJ7_vDYw6(YWw@c<;^xcOI+vK`3n+3S$BSzxGd|IB-Lx~@VLUhV z+!W1ipv9I=h$jwd7T@7nE}3dvk#s`JxQP#@`6hqYjLkjDD{&9;{l?E8!9{ZM4zI^MK(ysv4?riZrv^gUbnr0bTQ_h3O+wsrK3ReHwWOltEM z2n>SRGS=6$b&N;DBG!Z846N&U1#u30u=(G>*OEqn*v@xc$JH)EWE%9 zKLUTQpYEDzi2#ilrwz1YaqExlHu+_;KAWLmE<8Msc@|s0v5v_qPTG8QpkM?IcFeuf zY4z!TardbAN-OA&+pHgVL|n;hZM1S{@tJR~TeJ8+8Ua}#A#1*tw-!Z%IaF=tD&1AN zu}jQ;&Gsu-Dv_2&4V6IO@i~m9;z$3HDuE0`Sb13q4l%97=+{#v_U1|iqlQY@K*z0w z%IkJk%a+7l2a@jAw-u97+Gbu&9I}oyiW-al(jRTleUFxymTy*UPy#B>1|c1=#`~1r zqpve>uwa&$nk^HwB5~pwRJgpYe%} z&;Qx9lCdF)77RM}rs0@DfXl54d%HKrihULjGfm z-VCi#mqW$l9zIrUNfD~A)LKoA^r8_pK|>_1b*i;0n9yveH1>v|S@}W~{#yMc(;dp! zHpQ5OoM-JUj&e=@DkU8|5TEyZG5ESTo;dFpbNKj5@{CoXN+lia+PM(c$S1;h-kJfI z#y+h$=W?!O(rD0HyJEK%-&roTpcRJkJcb&qP}n15v9^6&Jp|FElll8yd}Rw)Uf)Nj zcrZL+8eId^;yQrhZrnyZB^{{<*O5CrUyh0ak2nm;4{Ksbhou%;phsYH5+ifZCY~M@IB5!uFgs}hdCG32W^v8 zpW{v66Q(YheaPp0(=at`DlSSH_{vek_j{@7<~GUr9MT#Hj`goOy}04+s%(AR*uk;8 zin||Jw$QvLR4U$k<8PjpW`%{S=D%%V$L1PJ&;HvU;e3T`1B%{n zv!Y}g#AcvLUpv=>MJO_Vlv``VRGU-tL%!c|N`MQRcCsbojotcopFChiWw zR@`AV7Bvbz{)C?KS2UqTi)~_)7yJIzihKh7`QXcb%^;Z(=%tnEl zaQ~LE8uuT8(;mGCDZ0lwsDl%X&22;HnnJnQFY{&US>~z8-Cp@e-$N0&kYFbM*C`%)SaL z*m^Q2R#e~bouK{@f5bk)e3T*mikB+|Ek?s^!z5YLQ0{6Od$nTWIf zC}dzS;|mdA*^w){1VQ#ngU^@* zZokx~&o_`Yw0>I4LbNL~F)J%h|91K{#16BnX$b+sS~+4^>$M$2#j67df7 zks1Z_{?U_0V+BVKP9|RslYfhgxXstR`}N1KH&#QLObS`d70-@}UD?)-5isPFRy41! zYcl*}>S_rM_TSIP$M51At1V;882o%(XmwxpfkWE-Ew#!;_iB~>TXrmtP>C&LE{5l8 zl?(Z{cWQI4bLts?ebd&H@8P@YJ!7xOfO!kfv0%sTY!a=B3egEzM_zG?#@njedXI2t zm!1RWfxxAp^2OaTzQ=Ty$2G`a&gJbaM|n3g+sAl?ZSOCg?j)0)N9mZZ9|oQmdDwsi zYH8xS4!qv~Z{(SzHMUd>b9c5vEs;4UyWDPAAXHN^`cB76#{qQOviqqWBVVhI{Cjo# z+ePwqn1eXZqqPJ6&yVNEPigb|xwH6?>mPq#U-8Ws9o<(&YhU0tBpk+4bm^=-yapcQ z^ZXqul}D|z@_J6@KBL#;pJQ)oT1iXeT-hJ6+tf!;_WA58_SG;+x{mg)y#+)uR$kLj z=}Dn}>U~9xdBH^95omSh!)j4>%}^~vPfyjU);5krSuxm@J47k1C0Qb3B&7{G zoqPh5zwJ+QE|kArjO4R$D2;3;xZM!Au9?e;bsf;=!{x{2`Z)CNF^=FvF>DY#@3LfI zxCK2owHg>*f4-3piP|xP?JSy)#Ku;KGPT>YV-htIoNW+lHn{kPdRL*P_nC%t(?EYK zUMD>gQ0jGM0y)Y0rQGG5H3#+-^}(LxVx5C)>AxstIXLG%A7*kk;a{$GE6uKEZVy>z zfunocK5mpudjpn6n2c1NXEQC$6U|Fm-F-vk!~-$oNmD6JDplGk$Ga-K?#+I7gbaDc zHc{WgZ4$}jtqQl|p_2(}TmDql60kHu@tUAGRHa_R1P8MT+CamY-yuGvb|s;MM^B1* zf)|~g{E+QI3t=)^Usdbt+`ci{Rqwv)(6dsoW^-1(){w>F_Dw74m}i>d^oAE_hxesc zxm~`kN0`a#4_8cg_qMiojc$_$gORW`v1$!-A@!whAf~qB5UnSC(GlaOO1h_YkI&H_}}%v`{_vxt_uw49&z<@qUE8FE-* zMyQhLXXUUHcd@fLF3x0ZWZpXw%S;}Zx%WV;oS|;2jh)g~9P&Ns@wAiIlyLQZOQUBYXVKh=^?PQKR9Bc{O*5J;=80kcsl)YsNP>^E6!TK{l#R zti5eEBI8##*EVs$41nM7-Rv9NLGg+vNFvriGJc}#sYHEZ&sYv3S8?m4ax9lUWtmR$ zAZt>-pzMZ{-(BAMFwW!3wg>$r^aI;3Qil|{|B^_4D3U+DRtNHL+gr=TNqxkFDY3HW zP<7;+i2~#OH%fQ__&|MsKJ)-r>MQHaf6X1g|1w$ZU-OwSJ_VP2O>ONQS*rMv*dNO4 z<3V*fU>*8LxA~3mnBzEq%$FEDYNoRu+m7%p(ZJ}JT&~5&mN*>2BUHy8?wV2kac?h; z%NY!qPqNDorsr+5QK`4him=;tZrOB@&G8GgTw=eDgX+mB5H=2$qwzx(5dl%zyCpJ8B4Sdj3OYP$BX^vam^*RT4 zhQqq@>8ajSsytakwR!)o>Bw8^seHfv@k+Ce(GgKbC?<*GaLI5a;((tJ>zd(7oVp;V zv~j}MGtNM=G0F1&qx#*m+G-cCpH>1&i~nM`@6>Vw!IsCtX(F5IlhSlJ*dGnCHcVzK zhtFd#4x8bK3{#76V;iiV52aD59969hYKj$h_|+I2%4tjJAkS)$1;<@(=Y(>ZFXYX& z{`!TFgH)W#v0|%@J50Q;g_cYY;Gj|_tf=7&-@&h@t8dsMK|B zBNh|dhH6kdfj*A6;9;~{bbU9K*l*6h5Vve|`^13q;sC#87q0e1RC+;gt-ah}hLExWc_{SN3EW?jx z_&+lIBcN}uD`Lp8*FX*{Zy6rVVQ4>K5cvKKug!2*hC4I-?F@HhXtk43=5|qT)gBjf z&`#FLR*a_K&B}HTuS@S~GmW;n>$b3uNb$UX)-|%uie{lILgERgR?nXU+e=bq z;?JDjl*U49htbg5nh96E^AJw^Mt$}T>9Psj_AoM>8N%O`aCjndT{HKC?TR^P{%G7J zOk!!v3Qs|()+n&J=uK%7Z@Nyv#F5P%&#CPC8O1?f$zqUil;pq1Sa!pz>n=)3`jJ3Z z0}Yb!3_HcA&)31PL6YLuH|Ax;Y6;#~+4Xx-wMUWQsab+vOG6iZz%#Qh0*3_RN?n}0 zBEj%65_Dw=#5d^Rs-gHKMyP8;%r8)yt+#k~tmU&NX{i}Ao-V(x23ntbz?+i&(o9dqV~{ zF~7!-2CJLmHT@oJsa=!CJl6!gAzihCO$8m2cS0XeTH?)$&-{|(!k)JFV6rRS4}u(_ z0f-M<&N*{eGUqD24xIz!;wIjYeQeWx$K#UeHp?45v;fZxZQj3hW z1~W(r4F+R12S63OU!OE$df9BTX8-Y%Q!UmgF|}v{o|$VAIBFrTYsS5bt^+(kR@R~h_go9hF8=OUlJw%0 zUZhWxD{gluwLoMg+RpdUv2LmAMkrovzzIgp}$Y8;o zV$rig#-aIu90mXvcRdteZ&sYm@2l)N_`t!nqt~@vKy>?t#n_1|#ahu~W#YS!rMRHD;3$3SIXk5Q^DU73-t&gq(wO;>y+J^R^a_+^z@Q1OP>C6$S{N+RtpT_d+H@bb=Q z$L6|5jx=i|O{Bc%S6OKc*{x|_5%q`B7-7GNiLX6!KB2>gfL{i#IdTS}FGbq32>oM( zT1MD>Hnp;6wrwqYN|GK~cjReFElROs*eYr9PP}WH z;Ft+z#8ix2d@(9-v0zueq=7vz0iE&{z~W=~G8~UBM0I4t$!%;Q25obVnPRXjXLz(i zbPH;~M)tI+Z1k0(&8Jlrg{he`fSd>VpxEJvH%!r(=0y>>8esS6p0;~|m5C?D&eWs$ znF}_gW}lH8%{~h}GrCs3@5f#Xu50Ew$M%#tOK}gI#vxc-^2@2&#oO#68Q_1ma;+N= z=s6SCQa@RsbwV$;i|g^%plXIa1!2}ZOKv|Nk)J}MG?2H7KfZF!~i?e;F8>L1@ zr8NZ9Lhd(!APY6hw^B19;w<3JE!g(45ptNbz*2TAOK zo4Dz26&rM8PdK(yq?5tW4fIMKQUU1;ABrd|QQ+ctkuJ4IvUBW{hXc^z0Fta|d>Gn% z#l#@N;Scq_P}C+YME>{~n3M3o<+WfEg>@H3x6*v#^s1d_F}zN!CPbLb-hdg;PSHNSJd z@1w4xb6b3DlQA&yc%3B7QfdKN-~qeQDa7Zn#YvzKe?2}PM z9zt3uC|A}pi}#VxbH>etCIvL%ArWDzL(O+Z8j z7U$fZdZav6lZlFKqSBeU-XkwLPb3rKAf_HbY^U9*1t2by*pQl6Ka7HByn)A6PcfrX zvC-*I=1R?T3#J%+V9na?{VQJbn3cf9hSS}^qnswoqboE6eXv-00|!fSbvOC3S0*>P zCJVUC6f=h6weP_yaCq7^>GWZS@Chx&}JXEk6`hwyOKtwQlla* zN;)fTSvJ(ufTsu?O)A9RLOn;(2H?@tB zV`ch-FOT@H^bO_z>3i0Xoc2iL18YuuWYaM13Bk~5u%#k{vLmjb#dEW6BNNE^kbzM) z__0(Mk}1KAr}~G(Rq<*G9yv(UYrR))e+<*S&PUtH;1zE%2?F}ckqsX>%AW;SH_ekT zN~Y;OaAx$*IE6_i=B4V@>~n{8C{ZlYKkxI}G^AI?SsWIt}@N)+4{aI(rasfq@7B#Wz(`=W)#j&QoW>3(~dYK z#>J01_l0gG=D-QcLcHly%_)7akY)_H;}C;=^azuAbc-nyUS0voQUhMKnVOE0_#a2f zM|hI3zi2&qQ4?`0vPuRk+X-A8(!iM#MnMpzf=|E9cN);*uzBD&0_+TaHzgc(6UT=} zy7vD%30((#G}kO0u>;zPlx@S5%jIt=m8@cCew? zz(FG}ye{h89{iHz${A00vMwjc!BWq}>956x-4*W3;`L|o9Q6W6MsXLt=*t(49qzjE zZE(La{4bO3HLzh!BKr@S&2)2pKzj3*m##m!MSUv+Oi5&cr$A~ySTpc>AQIXT&d1i1F>g6%DeSqG^wOT&38&g(LWH$vagVU)kLCGSYQLDc z*nVlp^&`HOfPR|Ii6&ZrWeo#I8;I+g8MJm`(p@)NZk|FdAS+WSUYsw!^vYzzqIUPK zJ@@*k4~F&6ATDpFVg@?-h!G60uz#*0P}Zl3a9JPm)<@hU>ceuNRMO^kJe0dDjJ)j` zXzbuuPt2vXUBH|FVI52Q70Ox$k~6F$aA;rLBdlX6Pd1OMuS*|F`dY|b3t*|Qz@aa3 zT{G`#(3j(5@1^d)L{-@1{1A3;}lsjH3CH#4*v?3@cl&BL-()M3JgXSzZYi<_dvZW1Plr$%5ci#y~b2k&onlp&z z&O!JoSeBaGN4V6Scr_>PSj`<7Ds^>I=<129b#=;WU6snS&=uuP%9rx@0!awv1rFtj zJ63sVwWxbis^qR%zGmr$fjGX1qF|%Ai~gKCAOsz8az`A;IO34Y2r~>Mw;;$YfsB1ZBuHX0 zUs9}g#CptPpPh@XnVVvJfsU&d8#sy;S1m!_t$>T)!3^je?war8l~Lw~ zG3(5Gi<)3iV|zgM)vt$Mril!{71QQ9RU5mJlslMn3;-(=FQ>*KTb|8AxIi!sUJorL zm(r4z*xI1Pz@Z6oT{FKytyY~@^us-`{FSA6dRJ1Scois;mH$;LFiFNVD!~NW@4)%DE)!2x89VfQwu@5!3HA(NT_n_QSd3AAHZY#~KuX4pab3=O9i= z#VJH9e0lFrR0I)0x22pdBo&|Jsz7-i4tkyj7eX9X3Q@E25l?W%YDsD$sWMR>B_G!o ze(7J5mCni)N#}rNR}UPz7S}biJ*?CRqp~fmfqS+E3o3@sPqrZ5CK9QYt{f#FSAx60 zn(^0bWtQ>ZzuEpE(QL?=@Ek|D- z(y&#WrPXO{i!bFqo9Y}(&}gx=1XY&21f7JN>%zUj zyiqq|0jwrXawv}Y-!R?u$0Mk$Q%ymXNWoYmPWRA*?teE_^}g_$=Hx%MrTYH->2LA@ zSd3~=J~aCpH1*BtAW=ir{L&GL)UmnCZxZ(E4O-p>vF$MOjT!X_zi$d}}# z>wYTN`ngV}G}nq%&IT`zoC2=u%rl^V%z5Seznv;q&6TS)R4#BxDXwegx1(|{b#rH) zhI_7@1r>jOZmOJkD<|^!=au_NiSx>lXGzNZ$}AV3Hd zgV5$Xo^2w%Kp8-G06pO8jCkGJ?NB381icUFdF6Y6m5C?iW#4ga`a?x(_7=He)2+bL zrUOU&iR+sANHn`6QEv7DOGyVR7FgWSnVMa^%`P&XG5ii$)3`0}vCk{lCgrRp^1QMN zgU8&7f3Mq4sDFuVF?F~M+^FwCiohX-xca>MDILiX7G@yhf{-S*J`D$!okUj-ERE#@ z%bHxAw!%c%k_q4SFAN{~`4oOxfQZ3NtiBvPe;wdvp)l%8QBCVu! zs(M&@>Jdw)v!5Z7SwRr9;S5yOhmBilhMV$eSbNr3%LB_M!lv;IMLMuFaO{DlMDR18 zLfFpojrv}6w)*9QG1(y9Qa7ZAoYsO8Dt^*DIi;MHh{-prLwzKn?K}5kt(!b)sG9+c* ztl$=xBxQpt;*1->O8vkx>J#fB^k>$5U^z>0^?{`rTQ(`_#~oN+$SpsXzAsmHx}max zLuzqdGt*JomKA4$WtEk+%;K$QrOJx8vLcf+X(yDN$=+zeM>(*Z%rZ;?{T=_nQmV!S z%V~>?1Itek$_JLARFq(%eK-XC0&g0qnJ5P{-)nh4(ShZ#Wsb#xrG==lDd4ID%e_&0 z99T{U4TD0UaPk4^Y`|jlhSVeFshUi*Gng3CNnG~GziJi9ge{2ijKJO3w~ZR5<2>4d zU>P{HDX#7&fAF)(P4;I2`+(`d zQe9Y0MbpO(0O^-+jVP`k_~-|gRoJZfxL#<>#UjDtC4ZGPDwP_o$&;d_Q=_xeml}OF zJL76J5i=l>Ngvm1=B(1j1IyG+86jkrOe`N*S|Mc-Rea*-^1Le+qOn>uJs(&~l2?lb zrP^BMH)A4>293uOC=Ml9v&SJtf;P)ManlQWYYZ+znsGt6a$sq4d0@FjsgVU32R!p6 zmb=x53H!74#H(F#Dsq7g_Kd^8`hjH>1W~|=({Eg`wb)oQ53Mx^EH~T(N4FJsoCC{w z*yaPvxd_IAWf6rkI0K9Ca<8+JMSA0brFpIXbS`$Lq1eDtthh%xu#8<}YUt2cj9SRV zhJ)U~Og3?i2bTYfc>TaKBC8H8l`|h$E)h%zmVb>A=#2d|)Yc!-3^wE_*MKl&D+an3{+S>mk9(RJ3qD zu(XQlz;YC-@MfYK4lHl~ifzt;bS_~8Shl%1?Nr?H4lE~Ol@BZpGEjU7P^`CN6K6l? zGqwSr4gj}uV5uDJ|4LXtu+&V-1Iq!@OM4z9OcGoe+z4yW;vQko<$>ia)Xwv18QU-I z`F`V{tRXuH=ESP|fn^N?M;nNH)C0>ASg{`Sz;e^`lMRbX2bR`n^!he8CgQ--00)+1 zpyM2_Mxd-uFJY3SKH{y9xJT3{A6TlSd|;`OHyl`6%F4-6r#z@x6^Mg^?+x(@ceO9> z5!O*2SRPkjpZdq7ulCHf16b-SaBvs*s0WsV2$%Ks(59p>QS}4McM-|QZU*y#WeY4z zMYR$pB@`t-h6&-Zjw~NohN9AeWhiRpz_PBW^32T=S2WioQ#98MWYQa&3mlpg_Xy3E z2bRax-21+qG`FmuhwB{ zB1}qXPQ02EcdX{(z%q2Ta$wn@t8`#l*Hx)J3tds(Vfj+c1t2?yp}fGMJaNY=FRd1J zPfE2QWI&q9(#-3Sm>lZN@Wrcmms69(v0VR`S)gNYd{!v10HkY(|fO`z+k69=x82T9ySDy z(!|v#K5u?Tn)u9`fs8XkYLW`h6Q94&v!RuVPrDD5t0&1RXBt>ed;&)`#N~<4KOlG4 zOb}50PGWiDW4&UA2rT~UXOrzUY?GUwCqCxN6Q8|sb~Z9)36vCZgf=d|#hc=Bz0GlB ze1Z-r;!W>xB1d|=kcm&gm5GnZ<;15$0m;%1jEPSRiKW%I685LU#D~8SlA%?}scZ|d zKJkfyXo6Jm>9<5{@pz|s&|)*N?6`rWZsLwJ@o9!_p7=CHFeW}qY2o(8;$Pd6IwQSt z;$vQ`zpQ#F);syjVgpC9;vQwbBH1U~-3Kx1^e3YbN;&bOe*mF1$ z%_YnMOXZ8xPQ@K>;xiA&Jn=Ee#OE$R@pvmXarPOrwn4hVYh~i2987#9tWSJ2lXBuS zO?qk1GlWxZ>CuF>XK|0P=W^nc+Ak(P(NW^v*zYinP(M@V#Ju(a%NhobHW2ry6Q5aR z&BIa0vyu&qN)sRJ!^G!i5HayFz{KZn&@u6uBv968FX6I2;;oOkN7N@zd{k1N_-Nz} z6CX=i8G%ORLCr>i<-{j&XkXkTtfQRx99LgA-IMe+n7IxEOML|neTjS2iO)2`WqqxA zX403a`o!md5y`{1!94Nlhh?d#0m7xC#H%QAk5E*e_=KX;#3vNBGV!S^svNs5aYb{z zGDUNJKn6Vu;`l8J@qb;vRM4Gld9QbBCUh zG$*P)@%cj{S#t*S#HRz6rRF*bmzoo==ENPVxtREbu2v>K4Z2DbpSrF}=DK z^4fvr#3yi=ow#GoE=_zKfRw6L$bhsaOVFmlU-Av)55SXUsgh;tH3J!I!eeD(&h^-;*piFwG&jXof#s83fumS)^b9c28wML z9$V}_>MJro*>%a^SvO`V(o#q(u$;pMj@~2gzyjjdpX^e97OV2SU1Yep?y0Hggl6Nh zt|4zh@tLl;!)EmZT~1*gwu5(Sb8s>um@g)J>x`* z=jag8!mRX6l0zG`DEIz;Yklnmo;61o()UU~xOLN9OlzQazC35H+i&OoD(>Fu_Ntws ze8Hbr=&-5T&3~!I$<4QN$lcBB^Ak59ld0`|c7!Jcd&qhM&tma9^q%xt=kaQjN|>>L zpyN8+tAE8H7wB-W&LEEuZhZftWZP3A26GT#8mafBk3yqhamruUcJZ1gCPnWx7iCNe zX`ktU%!Py$SJ`umFQM{Hu0z$P@AFb7-@a8e3e~%u=*-{V1}h ztu;4wdvRBb-Jq`Sp|;kt=Mre>xvL)}I{7;k8M$b*j>R+M(WzAp(Db*d`n_4WJ|I$% zi=!8DRA1cc>fha*s$Y|W>Q{r3mm|V?vzHc-jsw29Z6n06X$OfIPxT709k+R}5uXa; zJ3;^RpN<~AH~;;A4dD{k2!AK1|F;IZgM|0b9zFWC{C8_ZxWqNWKgj7HZ=m}e;rjjG z^eT;?zOc=kq=w3irch*DIYlS#F@fG>Gjng#E!2}b4jDew9AWaOPRG61GHRDmYif*S z9)ocqQIFSAZEI_;d}x0*p8@*CVDyU~x(XNX_a|%Ns!NOLKj3lAewO;tC@uDCdR;fy zN&VSRaSy;}ECc%+YU2*N(>l8Ts^g;0d%8!rwVlLw2~T`aGgtndwE3L+N0m+_e&RlR z#^$7?=7INz1^K>3zWr)&SJEy7ghqsLI zF%d*)9py5PPzCReHjVxix7ziL0VU^>Xs+pAxuDG3uCOZ%YS|^EiyyC-az5mt|Fr6% z%k2xuvLzt<+dw^8Ir@wSo@q(ow{fu;SLD)Ad7Oe$1J@wS98D4DbvARBZOLv$L{oG6 zoQqWHKHwM^iR%6pYpY(7{%#ZZYdU>iJ=S~maBX6xw8%ek`bYd$7u8sjJKkU!SbBrN z;SIzccoD74Z3U8HX|=o&V{zg4ZSiU`b6Qe;%?Y|`oYlW!h`S*<7&j*ZCVeG`R8qw) z%-qy?=p>k9o-Z~)o)PoxxXo7J&hWVDU<%ZsYAda&HFDqF#CiAJY8CRG=TxD9q^!aM zVbvp!qyH^qr*<89sWrLr3^3?tGYeyt)xm|U`L5NnP94RsWG`2(jmLSKDY31Dwd6ge zc?+Ns51T}#jq9w8_n_{XNWUFvH`^TTV|SKk&fDVCPsQic3)q=zXovNDuHR?8qF9af+2Qu=tOj!&Dm^p6_NsbOvA`#ilPoxpNX`&XHW@P#=Qz5CahA+ z$JZ0MvA;>P>F@HvfwA+6MhH$LaH_ZYN^j)*C-wV1wdQ`UuutR0IqLMNVO1lHPor29 zVk|V|hE_@ES=fkh!~@hB_H8+5x$Bcm-<(;%uDu(V^t{T%?x4#Zl<(=dNkww~qQ%nx z4cp)&5FhB)1wNBdu(f6|?B)|0ALr8#YP~N_OK^g<@y*O|hfa(h&|kdvV=7=9Edu?3 zqyyc%a};^DwLK4q_&nRJ-4_tHwe@jNDi`|ocyI1$Z9|pBJx_wyb9u3U`aNhN;X=l) zCVl0TtE0b3+dF3D8wyvHo9^>1zfW`}SDw-_qF0!KoAPI|O2?R;2ZL|5HvV2Pmv?X} z{CQ}{4iK$O@0&skXalV$4`%NZ7Yfc3)%LoET8q<9Rsmcb5j5rOJ!UP#lrh*rJs1k8 zzq;)xuFdo#LC-=Wi8!8!544M3p?=+oa1YUU9PErF&1C#)s&X_$VzlG4FGE9eX)Py$ z6dBzl7x|h4$F@;Pd4PBSgMX$hXa|d9E~Lyt?~_;Nz@l=eO3{^DKp-@%rF)JMPL*IX>yEr;Jms-LLqS0Zog3D|3-R zpJR$R+-4=-kSsHeMh|ptSnHEZAIfY-fZLyF{bvb1P(6`Lfd7(EiK&hA6!ZzTW^T8Q zeY_nHIS;9P@H%NGHZ=XUU4TJA0dOXxz_TMewx)?w(^>hkX#ZeFt;Ye}lr61QJi zCho4CaHz^%Ev_ZGBZ9`Cf&q4UP4PlaJ8NY(h*6ZV<2G%DMaP?NJwiV&Rd&MKA^HqD zATQ6-4L#rI4+zsOpSnV|cJ1~jti;x>rSo!6S=zb_6Wdv=8@g~+ylLpgtKyGK7v*EB zaOaNvQ-+?nD!qC8Nk`T!=9c-3tlwJJUN7+J=3`(F94#Y`mietr+L@wf#dGlN6Xl#$ zU~ZYS2xy8i&?zfsI=#H=Q6$eXn39Ic$iCtkenMi%?c zGEkRbPv^vJD|b_E8T*=_UY-K8W$XQ?Li5(KU*d~OkFW0jMCnmJ$4v>E zv>wHUhDL)rFX~rS-2dyzj}%1g&I>|{4oEySLA*>)d(CViVege) zZg;Pk_6cCV+kmO<9B$!p#V>(MZJ4b0;E%l7c;~mDP#rylYA&{^`yAk2_nr&%7N}7d z-EVD5C9m78jlFj0*Gsw5kdcioj~WL$ z6f?bsHx)s~=i(p!!;)81cH;tG%M}<*k6B8UGbBcp?&41%PrYzf7CUE8C^PSV^$CZ% z^e!CkMs3m&qC+I((sA>j3GOG3#XKku5{y;^ zJwUj0y^*V|^;8G%F!{!{{J5xC$pk^5!oi{1D2y>;AkRoG|{e1T20ZP z@;P&Cq&?@X0do^=CYVRZPJ&;`6dk~_i6U3oM34W`kLsgiyB>lYH5~--Tvr#D?xGwh z)kwqW7z%o{(J>Mqb#zRrKW=nPR6qIXc;a8GkN^DW$SWu5-sOhT@%Nd?IXWg~{GX1F zS}CJr>&ocZ!sy5d`3p_ufR{%~T^e)ma-^Ihsz=-hOd}=dBx$ylN6h>AKGpw=kusEA zZ5%1Z{GW}Kr)xR?k4DNQg^R0fc*hwjRd1|hi$8zBl2=nca-@_#M#?K8U-2&GNNJJ( z$&s>@puKp=lQPE9m65XUgD#ysfiaIKW*+hP_+xNSIwt-z#N+!kc|F_8=E_r9&9d{r zvXs(VcFz6*-@PjMG$*?{@3|Z&u}7uQ2u<~uU=^#iT&T8|3ssiQoL|H$wYhlvvYKQe ztvcI}^rS3#VBS1TXr!9}96w+Ilo+Muxwi@(p_)cD3P0cy;q(ZOJiTPpebyYs(S<#lqp#thbe zL7i`io~T9X-0ZtoI$?@LvUsys>Ll6j4174mkT$I zz9sLXM)w?~r<_*I|A1_4+>DqV%rK_<)V*N_8v)0dL0mHK!JM1t+Ip({%f8FLN9@Tp z2>;DR#?W%Zcv4^Ywfwi2)7vuqSnx+^?Ay@(54J##r8^!@n%)Ll^ET%D1pJJ@BIExR z+Wh^m&>lmq+UrJBEKc2e5AV^__9~rYRfj^CWGk5#yQI;Xv{ydxlH^RbW@pmg=uEEv z2#OrvI3eI7N%TgqxxBeHb|DVsaefNzReX^8_O6`^YvVMuuHLi*sxR#;ZvQ^E@U_&d zejzd3{F5+DwvgMak>R^#_~FFx;ol7jj|hI8gvp;Ahv9Q%*p(RmX=3>MKM6z6WRF|r zzrP=bOR1CgC5Bsm5{Ai}97n>PGW^5D@TA0WdCyN!<>X9`!|=s2VXw8-rfDPbF}|tOFT=c`_Oi%&J6i1xlQ}6jR@$Xh<0jIdG!d-}^67?FGRjO=rKV z<7x8aw(q|(P^`F(EbagLMz{?-B)j=*ewzMzU;g_z{k9B07JMT8dKuaqfXC7u4=2sV z4YcNM%y$sKVf?ijzX8}d|LA&M+Q47X5Lki4CJP%DX)lf^9s{5D(P|UB(zA;wmRVQO z*TR5GIv!Vvc-qT*;1wI<)~F?Dx5q*`xW>5yk8A~HZbudj!4b}u7)_RhDZb4DUq6-ST#t2*wJ`($wER zV6ov}e-u0O(;~@kVty52#7kp8PW%eKHkeQ0H^4W9n-!K%rsO^JTL=5(^Am28~H5F5KAKXS2`Nb#y4AoaxAqmy>q zbV|Q_{rQ{kXJhTZlD_>vDey1T7ZBL2Z9Zs>$XOM&wO_D+!=%*CVUIOUN3Q-)^8Yvb zrT5V8qjIdzQc1G~_s}No?E4V)m^g3oV>U0wpv4vA4KJWJ%U?~ zvaGs3Y;WuM&-I{#5eblP)C@>B2~;}u6F8WNJ8%*I#fKlAehh3Ko7*~efAI(Rr^4~J z>0yuE-RG}8H>rdjnzvrQkqw5o@=C&=lKYB^wm`L*zAWBGQ2QGdvvYY}+DeQV>Aj1; zpVO^Cex1|`)OOy&qao?NmGo)t-5*Wr9X10M7y*_Q2prVnx@NZc|ABaPm{Ed?E)TrU#UpP;3>#B;h=8ClBinJCd<%+bF_Re=wJ5DGo z^5n~(92I$T=bXF3N#)zxnyxsd-aJiiL3lDuQ?wgmnZn%C5Yt0PYC^rykcRs7YtcG< zVU#wVwaUq-=yQ$XnC5_s2OmzGqJ>Cu%?f#1Hv9Jn_$2Ar`nI8W%BD$0Jj!U|m{S{n zqJ7BV7B-t32bJHYRqWOsvY_mCAto9u$IoiByk>C4Webe+ENPCD^lFm+FU5F57Na$b z(IRXd+a}BLIXxmz<1@Yae&y6%ZT$os6#9TvBv!#F)16f6Y;cw}#dJEIMrOK(_~-2&E! z$Jbc)`MR?SUJwgzIKy1xUf>Sp#!do9iQ?j=!0%U@b92Ggs%Vrpo5k2(#d|JJ`=O(m z?T8Sf1bOs1@N}V^p6bm5&k;XZX;0!QW}qN7{{a(p{4Xojd})vrFsGfjkvA@ zzpPenbo!w7m#I*Eke#=aBN*Rg7u%?xf_U-%@97!oMp4wR^o2LrN*qRN(decZ7_}GD zu*2eUX(9Cl7aZht;}#O>j7O;o+&nHlRj2{2LJwsG4k+%xYpKEhCY$wUiVofj3Ox3p z#T_QNb!@pf=|~dS_{i|u=MTM4;jKv?Ng_`?H-1^{P~FhhkxTB(CI4^Q-Uq(UqRRhI zp_QPN8?@D+xLh!5DhL5_4f5{>13qPg1}KtUQG;NOtBX-n2nd*(Ah`{3vu@Su;{GDy zZdTo;ez#&85z>}z1G|d>1eLJ;3r(VIQKIo6(f3l9Na?=jqt@-+0&fibW&*#ogrDKyC!Fzn*J2B7 z4*cE|_$j@!CR^$${ZBIxvg1fj=F>U;Rc2Iuc;&Y~FMT<875MKi;cqzj3pdee4y4-- z#XvY}>|-Dli}b#SU2|p8W8T(tc`3iL#(%T1=4~ago+@E&I9LnUGH$#lUL)S6zdf+Y z*jtZzcVH_NY*+hRq`V-G`}Q1H1CXQJ9M>a981NH{r#JnCIv8YJQV|L^3$DLI!>YeU z7Tt?&R1QWKty!ksg|=?RM!o9eNMpe0NQOf@;jCfbXAR38i|E=TrrLw)r+(q)R2oOh z46K$)1qauj*77pUGBCfRa4b{&Rc1E;%lj~%u@a{yCq5$;2bChY_5m}W{%)vU^pU@@ z^(fAu230ndsA4!M3MW;zzF(?LWKl&{?1fmkP~UBjyl$}A!ejdNpSx?c^c_fWN(qrHli-IkA=s=V?bQJ4cc~C6b^`ajT1vThV}JAVXp1n5I8Lkhw@7vfx+`$IYvtE$b&Hi5QNv?9fYDHjV2O$iCs zCkRK~y^PaG!@*IwiTA;wZ2Blw%;o4Z1%GMgx1Fq42D0{vXe{FpCo?>QMaXx(iCs!# zxlY61rD>$Zl(>dM3M=AmEB)l+?J6xl0!A|lXJP?cCa#cm!ZgxX0`0nqFA|0s6G9kKo5@r;aYY~%mU|_Z=F>@mv(oB#UBV-!DZq?UX-THE3}*Sv zC|#Qy{Il9<(@eg!(TuW5G=RcQT!}J^W|Vq24KvCa9yO!<){I9zrHeC4DH&#zR>x+P zFW2f78f3)<&W(Yy!iC}BEL_XDSXY@*?uKfZQJxyu3I*Ge8KwC7jPh$*Wg?o?1%CA< z{0s*_;X?oaxVd)uj8bptMb}m;J>h4ru&Y=)qf~aujIzc^^ZG0ZD@&tljWwjrC@rfn zqpWJQpMTnoHivXF+B`5ipW&b^oDI8IONH+ccMzK6?7k+e8D-`tF7y;xf5eQkszm1n ziDrUCX^BLJLn7f!qCS%-Ta;+h9v@7v{;^A>bYVtWmEZpiy9MlXNLWChL5ddePb4v; zi~QCbzY+_K2Y$-~Kc&NrGI~mwQEn!uIHQcB46nS{_;2(Ntiyk*g#RSZYFptZ2E=>3 zd`3BD?Bk45EYkiTx#r3$&L|^41`5gL>)+}1uKH%Nf%P~rs%|(~3)eDkyensvqmT+c z=Agh!>Fc`zg1U*y=G2N<}{W3 zpAt;FoJx*BTv2rpnECWqL+#jD!z<6!DRgWhKbIPVC2ANBHH5RNhpv}R_iT}G@jQ|Z|B6XuD<=>B{2r+rZkFms62CtR#l6fRIa`xn z_a8oebfs; z2)x&Ds3RPQzTO>*j(hShj(J=B2{k8y8onX2rTDm+#~Wo}&|^GXa}IAT+^|Z(rMKU! zK4%*oZd5wOe>q+ z1uMo>7}!eNXyLl0|Cz3J{7CS!!+TI|XnCCgq->KRyGJ>1^qkj}=TKPZ1&1hloDKZl zfqE}c{4I@eO55=u{Ma5p!dAu-eb%r>CxoKU_1LvR&KhoybMEw@I~6Lzaf)Q3gBs~? zF4(VT54V)O8V$8ZG*L#h(=YxTHA=^Y;`Tdd1a#lNk4|IDlMrLJ@&j3tU^``y5!aya zILYg~E&PTJ70P=$mh+c$gbRkxJ3Dd>nbdDH3>b=j*%z zo3N?lOo~SYOa`L z@A^II>c4m{(ZaHbt!0=X58Qwj0y#_+1fRXR%U`G2+04S{IAvGo_;*(*w2yqfRjACfI3Ra<_)maRuh zKfGq#pl?#1k)K+f-8qykF z;JT{e0_~zFa=u)M$ZaGE*k=3n+iO*yZ!Gm1pH?02(^X!o^I4#4gv9^2dY-mPtEU?i%DEHs^kne0@c3UdEg4* z{^77_i#}q6%=)!jewqb2#jmD^|1ka)`YMu z-x0I)n%iw`=!3#LcZ~dq^CJI6MEL*n|EmL!LH5}rpZF~P@%}k&gw1fL6>=aXdazii#PqSP7B26mR5 z4Qw$dTJ!v81Cw-Mm)dYmI2$OJTz=07?I`hffF`>55dD$kWo)~t6C8JE%Xkhb1HiP0 z??<#YoRIF}BSy1&Loyn}PUD&?G!y}<(r8NcQKZ?6B8}BfK6&Mq_%oXgsKV*<%}(xmWOis?gA>)v7ca(jVgDv!9JLu67!iR-v(1 zn`YC`Lu1bx6XIki@cKW7z+ve-M8FPtchXR6bhb1}m)vTdZxGpbjC_TD_p^QY|6Dq^ z%KcY>rFE*|l>a%(j?uSD%f{!3e{bOZC&1za(e8&RQt&w@b($`n>h82bLY=AIqt0*$ z>vR+_@dzRViAK+9)h6yJ{3wuFn%U)~Q4O<7@SdgzriVVE<>YWmC%-GbbBB8UHr@rY z$xz=W)$31JN}T4NSMAX?RqKEGT@zfntw|qmQCL%j$3`r?3) z4WHSl%M9z4PZf!gCU~8qL{oC&3HPky7ifLjq@ie3<%X9pxl)~z>lO*08|(GKjuU&T z)H`tyukYdaGF$mf3#@C?++7;llnft|tWB1%4f6tzNPM|y=uC|H*4mwKU95mrlK8Wy zqDW;M9`k35+OV?7ixwAIo3ZbgtbbIKNX=e4(1lRXhsWfwIXP^zn!;y^8aiorPgwRw z-vPi^ZHn6etTj)Q>NWP%7i#viQUC|b%&uE210*r{CndpuBeS}~^pP2aCY-$O&>~?< ziRFc}H9f6TtluW09K8T3uc{YZe}~k;hp%dAOmCmuTTiI(dAU3RU1NOdNWc7TA|EFq z%m+AX=N+I{j*bGue%Q14(JwxvWrrzi)9>?A9P?$Y*fZ1uncpoe=*ufp zMlYN_Ml7cvBa%hu$p6fHJ!WVZEm-b7#lkjX1ud16I#ae(`eN2ULlg&WB z?n_$)9Bv|9bdw~%w1M%20#q7RK?GD#47TVK3QJ{W3vBJ_VCz5mZqe3?QWD<_cre@g z0YhSN7ys@rI5GU%zx2f7+z&r0fi+W6n4lq`q7+Tk+cvb6D_t_>mfOHns!O4w)5pFN z-(2=Bo1+HrE)F>Q-k5^6KL3YaCSz0rYQ5@=-Rjd$S03M;Cbvo}*vn>ps?8_Rm?QS@ z#0X^rMu&}B#Zdz)Vbr*l_aB+9voLB5$0ZB9t=4YexJvU@?A9=hu&4~Tbo|mKHDj!5 z@2@Tts}*9sxyP>UF=8hQu{oKBF-h-Dg{gclMD8ZOt12bP#qQ>xI5tyPMefYCdCPO> zRP>%ydU*L;Y$+-PbNopD6kk|IRfMJ%ZsIIO@|8TPiHUBE59ww6p0fBg#Yo;*jO5s; zB9a%a6lpZi9)pIn$M4+)VYtgm|N1!GSp(D|OnTB8-T+;3xGVA~4tIs`NfnG%AHOP< z8TKz81<%JNv0TAu*O>(>jCSzHS>^ID$8OPo$|r_@&{`FTsr=QnRup5W62z4Yh_ zte`b!KC-(#8@ro2-(yUH{K%{gYJqt@u;);XRSa;#^`|e(3=Co8*#{2BG4(c}@H`fT z$x_Ca(2H_Ae>`196#T5HZ_CAj#PZO^^9YnyhAAIVZ{3?M9c)J@k}cCw=E<|?Accez z<2X)^SZO~sJZR7OmXDKtN}^}4p@Y7h0NVD@{z?A+WZSc+X`oXnu@xJwD%1hPnS@$# zKJ!>LICqkaDSPFD2j0WIk^^|k4BUuS+-6pye-8dMoRyl&4Cu@AW!ZIQ+5fOOJ6o2$ zXK{9}Ec-Qd=@Q~^?4x*D0S*t>%s$3HC2O7YiUXKsPI>Q^oM^9o_RKA{`KjaX)TRY% zA6AObpsJL)XDGFHsCL6f)1B`%ug%}R7E{+pvl7`tfS-Tce!U`v7n@4=a4Ku`A~%e0Bph zvdHBPM-LQ^m6R(((GE|3_OHBVF4XJsivvWpsN4RDPG;!BCZvqy6wx7&INKt z=A@7Y-$&)1gO8ge27Q9Z*@tBY>N$JNV)dABiCOIdb;MU}%t5GDy4zy2I4%r@7Ykf-k{&qQH-f2o$3FE zdcZKPXch`rS{V}ZMCE|RhX*Y;94KQ)KL6$f>kAvKZYH`ogw8r~3cqd;uCDs+P_?s( zv3@&6P=JG7D!YECC9#@oPQweWVcQ`73Y^`a8Hl8kEJyQf zrPn`%yrKDt=q$@}6C_lfR}TE<4Ekz$&&On#fnXSw96BUl2Q@>H)fcRy%0s8-n@@t# zB9piPfzLAIk66Yne18z7ooRfbj4;)}`fKdk!r09`1$;6Z$$Sb@`L|>4eFK zCG6asFG?NA6;Hj}bIGZ9O$EbkH$9eYj9Q5P$IWEp3XSUU>OVkzi1)dPHj1d9&^9Xf zyw_LV>I0QJ!6J=Dd8Z4h?}am#o3s@Dy3iH7)mmX>EO!nL4Zz; z|5NJNqg2k{-!k4P$Or-;RHMlzo)nr!fN5{DLM;i5M>}SfhaAdF@((D`^Ax^U7F39*EzGp?A#vu0x1oN`ATJdUB$=;1#l!c1F_ud*XFSXQkL$IydG-3V zk1|?o$gS>wkkyfU+cKx$pJYydKp}8U_B(<*)Xe;OY&+uK|aBat~fZtgc-@WTnRTBRUtVE zkUh{(XpP_~Nk*J7=PIlb)XJ5MYXprlP*w(_c~~Vat`U^1?sB2Td*Z zq^Ypr>kA4xPBwH|t(v8F_0S4Be_IWyMK-yKQBgMO6JKo7D`?jDS9vwbo^`_Dji_uR zlaD-u*3Y$G>$i7HTFE~mm0!U(g}6I^5Nl71*j`P;h;4UZ+f{|Fm^R6Uo7rNZ=g2Ml z??pOoaB%jVw!o$1QkMDs>@v1fT)I+et~Q(ddYweEuyxiyAp+m>!Jd4}EADSLiB2Q0 z{&qmij&Nngsj#4rJXy)ol$>-H9o6i@M(EXl=Hl8Gx^~<{6rRwO*`lS^bM8kfm5ZOw zhL}G7tZpSzfz#)betlo;n9Sh=WH5C(Jcp!@`dnbZ<^rv_ibp$K#cF%tvZk~&n*&;p z!$L#`@$6=hz$az2e*bWNcRae)GX75LgzMm)@|Z4F>quW?@`lAq7K%P$FDn*VSS9PO zop_gcLDMUxPyQpx^>;{8+urHcj%;SY@8p+Mv(v|3aW!ag5feZZ&S1OCQG)57mhhq!AA|^HEw4=8K7Y1c-~|q=~fD+`sJnK|o3xi&NGy33Ijr0u6PiW)9I z`$7+9lM)jRr+`sI!=a&YB^n+UG#pnIG~6tR0g!mF4K!+HiRV_f*g%k?uFno^P_Q(L zS8JgDPew)sQ&x7#SuO@+%EGXUt5rJx(>FmWIRD7`x}e{3e#;sit6w52SjZn9?jXF-TMGE_lGRj9Z0mIlZ3Qm8ZwsUjrbHnaW7Ke6h8 zHCi&CojhZ3TT9X@veHWiJu^;%Nos?MAx<3Aj z!Oq-~rlZ+n=*0B%U#Yezts9bBmwvhCKlN0T1JxNEXs88du6x0iVEJyj08$EBIF&j( zdxfx!i^BTmT8jIyNL(w5bN)=^VzTAWjN5!q3X9GDGj$7V+nX$xrh-sd+jhxolZjWl zD;%#yy;b*HeMP$ zhtA1L^AVHc9Au>H`7^T9rR9udvj^Yb@4%`Pj4QwbuW+A{7mhToJ4M1t$2e_*LQxi|`09!grqHQXD&$eQUd zxbQ^{v8JOu3MT!QCJ<=V5hQ4@Cc&E_Cv&>&?!4*8g9HOsqg(v6$cfey1`Rw?)u_MsxSpM(|9A5>dYS@i024an7k-X?(|H}M?c25d4`wm zdWS1Nqbew$0;BSVLwVsQR!ezQLwS9uJSac^4}3!W&ioVxI2EBTy-j%%VNzCL`9Y37 z`^F{wquC4$-w_y22Zp;#7#a?S!X^2cWLHg=N)vAr>w|e}8CQ%6tbh46A|>PZDeyIp zf#4Jnb7L@0W(fyD;o!YJwDjgsbQ~CMYdCBxT)K_@nXTeAVU#ef>q9pB?CFBmr_Xo8 zjRsm{z-Tzb!B)75bE+Ed_OF`P$Y_6M2E9#J4rMXt#Garmh(9@G%R}kml`l2E#K6FJ zQwd+g!B@DJ@$+EZV%z1#uMcd7NLWf5v&TE}qqB7`b)aDsgnmJ26EOYNm|NHTYUvog46W^qwNd_BjH-Uvj!c$ z!yrI$LOs=5^Z%89F!;U%741IJK2-u^E-@0a(*)dNnG(3m(zh1yo_3;=$)fv%FY`w2 zg~;s99v;4`v)T}B7XgIr07hXAhp@s;T!5?<;X!lSZm4P7r7MaCOmAbLFAW==Au|`) zBqeMN2OHrgI>crrCXsoKG}4Q7dJ>UHJtDSQQy|q0RKQY?FdU?WGhr21rl?)oSRJDF zpD&T#yl^s`HrZI74+I;5(FBI0jBtFB2H{!?4c1P*aE~~#$Jlbw5;-v%Acm;r#8rl_ z6Bj5dQ!Q7o^zHdU|5HiPO`du<+4jh?kjCL^` zw1k^@m&`H_l@PpCDNB;qVEHnsdSiw1!1Ts1yG10&&Vi+eD@e#9sv?WbWu4zVF!D1T zWrUk}w|qoLvDB&}sridoq%R}xlp1?Rq^PDsBAqH-W^6M;xv>r9#*X!^UNrV+R$vzr zRt{s=8u7gt+cVh|2@=dR!e&0jFC?3>E!T|w%62#Qv?RpXyMa-8!=Z(66Yn)+Gh-?- z_8dfu#!gAe31)!l8#y~6i-=P&c9$%oDzeCA;5Svm&v29xZsKAYTVJY?u|-nG7K`+2 zn#_ajFx7Zt7b&W#kVubPnoaJ2_cY_Y%12|KVf~Ot>KVaxCvc-^AKlqAADD4oPtpL*x$RZ zN?=CCpw}x?93{5F;pG_$gOzZ)Vz_Gw4>c1X64O;Ywa7k1Qf3zr4TFFl z#b+FtK6s-Gp+qvg#iX!#fYPftXux;?4XrE;3c}1L?)^Ji{t2rM;lh>h@xqnWp*^e) zG&V!d?p)ENdW=nV<>y43H$US+bQY{S4=cRT9H>yx6=ea2_x5(7Xo^mt{`5XA$w6;JkQ4LYyn_J7@Y|7+409dn4P_gVF6Gm0Lc`c;yjPPV0|CEK2P zIqQhY2e#XsTpX28P+@s%?I~Bj=C|F-rZD#Gex9n9ziRt912*z_JE}9fKD06Q!bP`xiX`y-(je2=|L}2)Y|)cPs`TVL*Fjk+kHi^&uBz_EjG6S)0gq4yOn{WAcxw< zjd)jah{a?S=6w$novdmj966RH{Wa3BZDJFV6k04|?R3lElv7vJsL4b!Mh)mTlT4ed z(DnDL#Z=$Dh^lN>h3W~S`p|)u(vItuQ-&><7D1X+WnrXTXmgB8p^sMC{wm}tDmshF zr~kN!t~F*Q-A2(pstVl+k8|Zhr{_S`w=>s1jZb%K=8lQ<6AWQt&8eEVuO5{6ecjnoJ9o{Owjg8cB2u zVg7Fe{caV)%3XpLjl@xec`^njS+GaWv@p&ptRcOLMT~+r@kcXViPjBoTgu^`dTYTLgta-feYKzPY0FFFkl&Ko+tM2^~3A!=KTEDASJ^A zw=o{6dz0#(uDS?XlU0rF$@=X)fZ+@<*|e=nwTyQJDw{~fV{)p#f2gj)$ui@GZ;UAA z2PkY+dyuprpiq6;-pcy{3ROyPeyNM0lHmY_9{m7?6-FYdz}P;a8rc0hlIdksWU8oV zT?si{x|sGbk#X#@G3uG!blX^`rR{?Ny_U-xJkS@j^(5gehvQ(iS=Fa=gp!@WO#e#$ zrNz|hwAhEkI=G6kVs_bk7PUIBSg&sJPCBASp_6U`#!hNDSPHkePo$6G8|n;$)|&Kg zV3G3&w0(^P`|YX1^P4&6*{!PZ>;*=ihLf7$DtKNQcy_5Gx_1heJFa83#6nZX3~l{$owR%c7MU*|p-ZX*DkA z1TM9KOO43E?V~cpO)d5~&KI#EcbUNKtDKFZ+H@ zba^FHHgtCbZI3Ek7H}IF)%hK5`JaRh17eN}(&{w^ ziR1@B?@NcEE%GZfUSs7ITPcsS2g??76kT_m%Bhl_OWNpF@-Oslva{F})IEx`>a6Qg zYUdJM*sFT1Rn>tzGoRhYR~RlmO-9B?f+hM2mIyc$6VASZ#fIa=o6v{9wr`C%rQ%Y?B6{Qr#ez#w-L4r3DY9{Mo!~$u<{ZSFYk1{=2y&gL2BH8w zneiBH1`J?@zn*@b>(Hq}G)4z-_V-qk`LWH9Fg^kXZ<{nfe&dU*ld~+UYVd0ZMn5(j z&L&*T_`l1J6K@bjOf`iXVG(@N9_>e77Xf6wltU93g6PHWp?HFzFWY@ABhTPJBwGG;Nzz=;tub>_>Q~CkhY`YE0f; zHhW8_meadH+HkhaM>F;nl7H<+Hf?RaC{>$_T2O_H3QAOTXnF+H1N3xvcq;)9mrfEMj8lIIMZO@ zG8MQ?3ZhN9{O{zKiLDisi~Qq23`t35AXbC=GS+{90a1L0Eup$#G0hvm~_H+aWaLLJ{4c|pv zcg0CAMPHC&5C}ih(r~nra1~m<<&)Bmmrhkgpl;yo&#mTjg};MN6hGD_R1K}WfKhA1 zp@wiR;}0Q5%f#{4rC3cvoe=)I?9sxX6i!#=-3lsFw1S5}l`Y1(b}_{^25E4&k;l0X z<-y$ZIH^FodYoHzVYyRQiF37~ZF3@umI*NWzTvQ{a1~blWuGJ@%Bmt(Z4!)KS4|;( zz>gVZas-@Bxkj%;Y{j0kEc_B@;nk-zlP7c`kjk< zMp$856hH4Hs;Zz>wV)x|A`k-hd z^A5V#*ZlS%L`6WBWV_Li*GA3C2Ww|%f}`3RQ}{YVquJVToo4Ns@!M~m)?0IMUB}RV z5YKM0ofB`d)r1^DwQ8-U;|R&vp>?F2`JU9Cu6PXf6~Sa-s(^v!48^9`fy&}Y(7AS6 zXx`9l?igf-XwYfv=%d!E>};yD(ec#t`TgSAu{F*iF%C`7aYQUV|IgJVp}fvXaU)ch zKxYC=C&Bmf&c!Cqnf53>WtP5JB;L61EFWTpVRl&w%MG=I9DUh$hF=zeJI>o@9Y3P- z8~43@i^^XT%F8Au;P}1^SR(?jDj^U~v27L!+YQGHnW(c0t`<7+h3oh=>yqG!0~A)^ z+7+7?uezC2z3y1QrZXn0^xje6?D0AVP)h4SxY#=9Gu<{nqDN&0bizjy5)+7Xq=FuH zEc;Hf`3Ms);3G!+d-Me(&FQWyi1N2&EB(#_} zLDdL=yuar>Q2OA#J|#0ArSsxSO=h`bW}@x0RsZEUw`#lO!Kxj=XjQ|ZoN%R9-E;+I zu|}dgNSPD-Us!bx?L;R9W`@5Stg2M7suw6)wSSUsOKV#E^<$eY}0>y0KpvNm%09!D6P-m;kyJ) z7z>d^sme&Q8ElLsdR`n!0xm?7j~60|;}uEnEJPAhVP7K2#4+ykwGtYiuLDM(Hyrj5 zuGHsml1nK9s180q|8n5}!so}NBy>iBMW0tH_`DbR<9+@sAAn+1jAVI57EfD_( z7^Z!9yU!cT=l1zRVA*FQpZ|I{aws zkq66+tW+?v7x?3ieCkIbvCl>xkda^UpKfGh`P@dX3@ozt;=uCA*9k1IJWGO<1(rz} zE1cz@^5;7B=xLq>D<9Uf^RM#HL9u=u529?g{5X~3 zR?ikAt6*%S+B*&kb0(Fe;YLGwhpem^p7;BZ@AOy&wsNfL8LT=ArZ2yVNq!<_J!CTP zCOlaMZbyZRQb3pBqQ|%5UD8sEqmr;KzoH?XVT)t-e;DJ7Tiji$Z{Ou@wg5};R-;|Y zZ-t4J5>i(2dqO4B#BzLw@MMcF?d{g$ls3g+Wg}DncE<5bBVvqKL_D*}WAC|NNsBI1M+mEOgCnBvjFU*3N z(5E@|(v_k{e=%Md;}Y^oM4J`P*#uz?Jx*EgRHh1Vf&4@pF0{g|HH~onFghdX4e$n&PGMYEPAup`=D(3U}!L z@vrPPi8Gnvtd3^llWq*@98f#mJ(ro~jg()A^935#!Ar?L^jA(!tsC~~J}f8KG^|~F_5-QBfrNW5rR38EjVaKr z4RmV+q3ZQb7ZxTz*{DcQG(VJFym%f+LsOC+D&eq+aEql++doVuz1P zqt~QrqSF*GE;tzuorJ5<>8eYm3lU8f(P^_FW(8X!f6f9~Z(q zgoaVOWn+&rDGR3|yvf4*#SI@+o$@XQbidft4t>@)E$Yp6x8cmYIa|2s_F zJf`VNbO;#z{&@-y9&r}_PUwX7#CeAK*jc329O-l^B<b%Q5l|=8w19cGaPCNCkb8B5Hh!ahzhja zCRIf25unGVKEss6rT>6qde(3EDK2$UImD$&s(D-z0hwVOSQ?i$TM3IxV?3t6_>GT4 zs;Q2v^6C~Ur}mH`qN&sM|Lk$8SK_L%Ol;N=Lb^Mo2Z6=7RARltF*vtN@Tjvs;N-lZ zd5uJfR7GvEEwSEBNS1zB&WK4njWeSN(BqP{3vo$0=!2K2=PatmB^N0))%!!>Xb*G~ zLE5uK7vj<*uX0alRxX~91ID;yIBX=`V(HWIzoY_UH>o1JGzvoA=O1Np$%HS9OLbO> z7YM6V9+&D3$8^FV@!DYZxb%`UoT+gr1deGLs~9-E8+rGc-BJh~C3Yxua5rFR)63pZ z2Y>K1=b*_=SV^lff&4ybtvwfBRB0Z6OZ}L2667eKO5SLJgj0c5Eled(J=CX?*OD2R zX_KJTpaFTbmJKKsE_U2nIx zuZr(Bc_Hbm;?qhJ6sHVbh_*!D!pyQ_*|KH)WQmN?MldK5SUX~R6rn+2Ti%Wentea< zzOo?P7mD=?Vi|`745bOeCLYbu9m;h9Gs7#w5|d#IL0GI}a}F=>d4+eqacM%=n*_!n zY&e7zPF+vJ7B(zT!7-)GW>tjsm>`8px}I4HZ#4d8U2nuHp}tj$cJwL1Cd0ArW{@av zu)3>kYH_BEB&U*LydOrqU%{ug?VX zt~Y4Ud+BBqcC4)Edfi5r*Nl?3id}Exvq*&DyHp0lcgC_o6vxvsLcY_Y z6)d0rYp}XKJ3d#f>$wzr>3Yk)6uVxbn0Gxl4NKbad)}`1tF6}c=H84>EXy~W?3~>Q zFLaHxPkQ+;m&6PH{ZBu~ndO(flgZQG*CP6vAeFrXR`k@i;bm9V`|o}=N)Wn56HwO` zC6tW{;vUa+Lo*q4hL>nNKUI97XM z(HMScg7w9ODn_uGLhDX(Ul#GurwhY~3lN5pV=tmWg-!hMt+*vlpO>~#e$SHkY&#|{ zxto+rglYt)HGK3`@`^Y7(&md;M5I!dN)Riasm*_{WxUS>WgmpX;T&y!AXX=0|GLMC zDUmGeRcY*HMf$gHB57yhYsvNVw4$RDR^HFks#5x%Ku0CRd0IVgs10YkR(|GCe?_R1 zYBXj&&|mCuFX0$dgyU?N+Eskc&L_32C(eXCf5)F~XS^QVI?mkOe+p&w)us}pznnss_E=;Z7#q}Z*jl*4 zVZBq(guk-GdSFYYQs1>> z>cive{BeBku6A{v-|@hx?UFNZ-}l>0F4i+|$0TD)ay%W7ekFAynjaLq61u1qjjU2F zTl*w2LTw_|=3h4+QT0ngbrp`?iMfVSesI#d(;(?^JY6|*Gr^MXR2S%|WIUeEqql;X z##T5<=h%5Qn#2lfg(+Zc1;Zh^aD`Tg-Kq4*(584Z{j{$zOFRjPQ#IkD~@7hhiZVxMVk4(1vM#+jDkXba&q#CYru zliTm}<}dxnR1wyrf)p}wSf@sPhsx>9BO*Y9 zZ33#nY;I>nw-~NvV!H*B*O2!e6Ol?eRO6Lcf;96O?uj?qBlpC2r#D>UAw{{IsH>BO zmCeWMLxAgshwe0X2G|~8F2E+BS!(It$D+vN$5R ziZLRjMKaUKF$04)G_)JMDTr`WLygj_ZfKZWA;^A)LDs4aG93n*j|-xZO-zO^W9^FQ z6L40BMzA#3Gga5lPsN#}bk1Ulbe3o%rOF&*<fC zyteino43*Rlb(IzfpH8XOOA2EiX-2k^5ErpEC`dXe$Z_4jVg(u#H=u{w>}qNsquxN zRtIpl&0eYZaW-^B2Q>zooJXA5+h?S@aogT{ye-={lr**twKug5b%0xQH5}G@nOVeN5jNz`2lLW0%sarWEW=y?Wnm=}~`-V0_~8RlXzOUp2qfZ4wc^FA>9m0{L`SyG01KbV>l3^H~}#`zHH z+-$k-(6>8jOSOM{fVlvh0?YnT~0)J2|>l}Skl@waAxe~0I)rO3U&Q))?4@9>mb zn$-E8k|&T_L#lP~8x7|fys6<_gSR%E1I&SM2e#2i5@3?Qp+UB412!9EoH59h+aP@l zs32EwkU6VC7W)lye*(yrOp#yWUr7rq!MxdowTa?4@P_MrGCcPZh|&P_KweQ$oEfHY zR1vOpxA&Y2Bmk>D%EvG>f)#HQHl3A7%Q~Ug$Cea{8eOk|v`MsnyI$n%N+C;tIMU$t z4Zo5v1RTNv^*uw{Cd*(s&(mQhaGaMM+(Y{5CLNgB0WVF7`sJ z&x{saL4vQGXKpRU?Hc4^oQL-}F(a#;=WQ;7U4xu9qZhA1j!`eY{Kq~6Z6wpLLH1d( zvTKl|;;I)@LOzd-02@{JB-O>u)xAny*-%rZu%=2CuR#uy3RL=3{r5le>MC5k2C1yl zYmmL9!*`^WgHu`gl53D-fsRUsd8Qu2Jku)ieMiCKHOR|JrXQx_hU**jT(|~l+QUS~ z3D+P8%^)qSiJi&ZhIwnPU0Bu?9*sTn@H$2H)(r==^v&-lt92PQCV&Qc(>KU` zUd8C>ZwGQh&WI5%l* z6OY*(>`f*!U)OSTel8d>RCQsdPTQ&(f{ZI<^^*%k*JH^`+TK}2%MoZ8Zyt~1C^r{Iad zmh@wK#Pp*EdDjMJhM!?UE=+eugJ@mWV)hQ!X-%MCbUuCSdI2hQn!v zYZ+h4am1Dh_9o&`H3B31QDs!cFJ^_Ey#) zjHSC4FH9IV?L0q(v@lp0WvVGto>Uu1*Oibq9A$*7PP$j5mx(k(V9J7}W*Hon0xhK_ z!E@fv?N&j0L6u-(sX7U9qSUgLq^&n@qTyLEK{ z^G^kpr-7`7m;)OQ2Ntfvfp7dX*I`l>ao}-awfni{QMy1>!KO(KJqaqrrg^c%eRW{tuo#Ihi$TsEob4Mf# zG29>}WU_caca!oU>Ujid($$v}KJsb|aD92Ny?TkXrT>Wv+71GvwuXbUa1)1C>$O?r zNWXSY^_~{- zTf_BoWyW83;ssJEUmSjsY%$M#aNQAVFjWe@)~cx2G7}*`^in-~FICalOB+c@^CW2A zUeG+?=%vCHdTEpT=%QXKgIDXNbFd7(RFCRvELF!|s>ihcZ@rhA%-&0TB?>bShl_jT zj1jQjxLX7cczSQW@htNf&JG6Ea=_Rd4TpV%tLTj@IL0bjn^X}aHv(t>fYP$FzbM%J zVNq}V(X*(6DeF}Y|I7lTe;N)a5{~ctT5mi>6k#)s8u7i?9*e#4nYX#Ws>tHrIAyq{ z{QfG7_Oz(fka6ga^U0F=xJ4yl(4j_<60%wBjts{OsVju4b4F% zsWxelplQ%&jkEvu+jwfAM99K@`m(v`zr97|nEUG8Y^y^rGp#N*H$3i?SIOXrPn8V&?%kI-ps(moxxIwl@46>CVh>#9ZQt2Qp z+g(cOLM#(ttH2Z%m>K@L$>*tfo!(d!uG3FS%5a^2%AT2L6o~8NFnSA#ABPzs$7iE@ z+S_dOo_Y6#&7y}Vj03S7d{`eh9w-Q`@Pse6QivuUQz1NI6jRK@p zSL1R*;Ib)j84<*`C7!|&w*&s*O7tmL!wnEim=cDg{e-Jf;=Z>?c;c5TqC~eK@7&X`u8qHdyt|77=xtY5LmbhEq`^o1Yz2xiU^bgR=ZQbC`gX$G&n)BN!8H0 z85p%T9BK&HGX5qDk|)UGGA8PTAlYq?79^!`df#fdf{GNa;CJd(ws@yLE2hj%3}Q^T zk>9CrRGuQVLFRcQ~7!^)kqN+{eC+O|%_(6SyFJAmQT_rXnOXjsR!JO)(-P3571R+VJuxbUYjH>r+|i4+3K+HXIrVcig=# z`RR$X6~DA%BC?(6lD_Ip@3Bf~m6OfM;04{HNNt~G@yn;THW-SUy&=ns5D_e0{Z!oX zu&ZKVtX498n-PH}_XN(Jq-;A(SafSQ@~k2n^n;EaD$@uN!Br>|%5(|ZFBzaEt2XiH zSvt@!GcW~`>C8AUm-^#o93fSj>nB=H=Rujol*-KCfKn!BrYkdV3YmP8M}IA4WWNta zHBYv@MVY?{nO&8cJ@vi)vfkyNB-FprA^35GPhYnTSm4d zBlGRjDlaI>Niw$=tNgNr%TQ^JACzPy7Z)qsT8bYk;$@$LP$hUi|Hn*h+1t&B8MoAS z_;3Owj!}h^6V|T000|B+J1G=x^5k!=cM;T;q-Haabw>R@_0h%0Mjkuye3i)ZZ2g0e zUs^3ZziGhf&ir|r~GKd3Rtcpx}@$~Sdqfj%*Juq8ielHA&`TS@rL z1A`=w@~AEkHs$fXL6RAsj{(h|+qRbenI$?3sM@XhT^frdlv*`Gp7fU|2jMI~V60?&RI!}!cc-;VMG(65*B*q% zR1;D6s>6}Xe`b*nQSF&IkzWXCQWA8dq02s#BMHTJFW;;A);g}b&M((%9(Pl> zs|(eMNZ6Xre=i-H#F(^A9YpkP9Gb&Q44uQGKOw+ao?}aoS$k&x&WiGNk<*g?1q5Ro z5Ia7vha9Yvw2-V38JevY7(K*rNFiLQhrE%6R@IRT@{l>;?A^gb?CUP9!%)vB7`l)~ z)0=qy4P~<$!o`4*-jO=NG!UE-B${|7|5^txRL}lOvJwK6jjX$YQC7pjQ#jFWH2NV* z4zO-1fu~dvfhPq+8%a1>s{D4zk(bg$=d*n$G2FB?JiEJl*Q%h+lMg$$&4Jq(aQ47J z%Ujf)Yt+Q>+a{arx!_zQR+r9c=rZSu6P=LL4K&u4cE2lZ3m$bPYJA#EAAP*QqDvL9 zW@jMeS~5}J*kD=u31^;dnEA>K^NAdpLq=qBk~V9MIp<(weWe4-di2Ng3)ZxanJokeG=NT*Ke;iFXRo-N?gXVt~e%f zC|xd*-=5z86ZK4wuPyygcT3`W@^tCQWs5ZNA40Nombzrh-lq_JWa=F(D~WL0 zMqqrCGaQl#SK7gT@CM4NpQ{ei)d6Sk!`1!FNWmXnC;Jk}X~~kO2))fxiEAnNp+5YnC9^HAn=THvIRnoN9(I zcoR=#Cxoa0rdz(FutsDumf(ebrfo7*Ki_bPE8C&Vn$8+ zUZcnqMaaTeCas8HD6rqSm?76sp^Hvfm;S8BjVg`x>I12e;iD1!=0l`QC4 zwRo_h=I1gX%MZbTqrlh;42N*SNjMiWgzh_=#EL`hW?g15f+}RtMd0rFlyKH3mrTU~ z8ESNg8q)?nK=s-)TQUX-at5mhq}PViUFA0PA~r15?kJA zRy9022gEt80fdwL31?m}ybhJoM)qj8oyM$mXr?3aB^7P5DnvO!6f&1B{1Uy7=X}z_ ze{CSi>v0CqpILZ41FeTtA1p>jb(yidO3WGV}Ol)|M*FL0wa7}a*cjeyse=#8EVx(Z6u*% zO{L!&S6+K&_@zdtm0x%-oVFM>*0DSM`lsF<>Lmcy&jMq2FdWtwPTir*&J*~H>|AG( z6J7-=WL`j}4ok0rbLQrIBp<)gb5HCaK5o<{OYRC?WKOOPHG|Z49}2^Sx&4-qM+CNX z^)9lsR#Hgc&_CKRMeH1{!DO>j+{2Wt<)*kRM1~pB#}p|rn!<3%C0vCmZa&(D->r%a zlGB0+(Ondxw;%+8Lk)mO^#NyprJoJw48DIGMmK8K=$FOY8gi^&KqDv9C8aLXtlXx| zFb5H>MAP1y_RBNgw38ACeWrj>AH$)Ka25LeiW56h$;Sf)_3h{DBxpYlg30%vPOU9r&>QfMTEY{f=0nt7gEuBlkAxul%8{p^y$ zO<{{arQ32EJr#_eT(YF6aucclnz)}gD$d~-QMkmzGxh|^p1mlNZh9@qily7NBd2|8 zVWEewM}3?BALjqYZ!9cy@c$tHw~~JL+J%MBvu$`M>C3*ku<)B-FD!iTTMG*ZetTiz zC6fyapXPI``$MDadkYISvkMDXlK=ZV78d@8I_tMBEWG4);Gf$@ergCHbow8XwObg4Ou9wW0p;Or8D9a~IE!C#=v(PVP_7>^Xi-Rf*j$rrYo3qJL9G6Z{mNV`=uwOfOq=S&=i zzSf4?^sW}g5E}N$+>#~hT8LvNRNdOlF;gGqi>+$%etn2g{Ue-!pEydY=J^649XqXG zrNkPdw*_o5G=Z3O^)%ED$q-_ic1BK>^gd8ZZ>rJhwToV|hj%6@LJBf#Aali^AaMU3 zy*uomwZ}x$XAWzZMsIcnH7FG~rD{D740wWVPvQ0vDUW5xLYIC0+fKHA~i=7R7Ed zv73~^+{y-OcN`cwwe&}?adAh3xE>^;xKu3@_wXQYftnWKC3c|p*MXX%iUR7OWe2fN zj$$>MSg(IBvCa&H`izifGX)c3rZSm^PIVI&Wcr{nEy(n{S4);PjGpaGR$;ZkU5~? zH3(Xo_192-($apgmpA3r>-7b1f-0{o%3;N;C9`q+YA(|QcbrlCU-~sIS#{J1@ZzE3 zq-AZcZCtFO%iXQ8yp;QI9~$kH2t(s$C^NjcT*lvzhJN>P`9n50Dmt` zRz0p-eLSzLSHF+*E1KATxl%d8It(u^)^D(~<@r~lc=6U4Wm?^FpKCP|v>GhcYG~QD z%*QpqkdyRg20qGYi@Rzqp<4xqmu>l?EE$gOVaYDgYA;PVI(e=S&mATBcAo13J}JTH zc+LiV6VLinZ(!i^Lx$p;C4+mxtX6PtkOJu^g9OTu_Cl&cqouc41^Jt$hgp#@yua+G z=f4JHqhAZZ3wOrgwwAu1@>}-2=uk$#YcI9C@gWPQ-C9k+(M@w084R}R>gn(n*<>;k zAoQ6G?+mo18aIqHiVDljLjfX~xrCD8OM_9H0lR14Sv72lV=7;l)BAqH8N_Y?to)d4CA(W9s zj~WCDt5=d!=IKliIYLjoS{PrZ^`!*EFZ`J>7RaL+(kuUjY8SKE5Zc2%)PHT$zlLX@ z!Xx%;gzVt!?}`CpOL9%RCv->V;MUx`t8rz+2;D>i16D^?r+E9-iXeb^3&>x%3 zdIQo9^AEi6xME>>&gVJr2bq$M=~(As-b0mB+?9?w7loYF71YjURZw*_PV!eG!DNs? zqg8p%BZ1n7Dsr@2BWizDkuwx>F0IJKOQFsc6*+$hIagNXTo8Kw$18Fk4}7ljoYRZ89>Dyvj>b&>&MfA< z8@tWEm#%LE9>w~ab%i-|%RT)M5rlla&fm|7cLxU~-DdQ0mu&j_b{H)A8sdBy~_17eWLy}_#U zoAjqFL(FQQD~dnFbSM;EWY~YmQuGfraV(noc5}LI)w2svWd33@R=Q0+eQ}d~<2Y*W zD5?2Grmm)}R<=s5%T#N)q!w?V@OI&D%T=k-sv7SssUZmu-xmpAsG3KV)Z8Ztf6zp& zJ#>d?k>{20M%CC_QbRv+vu#^#=G#xFmo@H#DK8QMEm%dC5_E0mnr)do*Jdu=_PjPzIcN#>f#Br^rPwAhl>Ed0>1RDYTf6xnl<%a5jKzReYJ94)>1wXTK`H-fPB zsvPTUj)tGF9r4oSxqkK;Jg)>cK}5q`O2AyHw5FIutNT;okac4lbGgCWErp%$2?r$(C6GD2DZYOXYGycd&Tx?0#nrAHZA=(>$<6|?$;H`h6i3k zM7Hlaw0V)p-dIM~=E%gtiO?L_qv?p;UStO8Rk|y>4_Xl5qK4V3$ymyq|AK`V5K&~ zE=@)t{8}x~)=WZ5DH7K=oZyK&No=$eNaWm0;)aHkJ?Dpr#BLl3ldaw#Hrf#aFgMuo zl2Rd6bfT|{kcUc0`>kBPO;IWtW=Eca`k7|Mz+QHG_2ndOOrBofmOq`9&MSGPWHHkt z5Zkj8HB?-z{_T69d_N<5LH*2ag_t@)g_^C{#?BzQ*}}N>{==yE_tZP?-dHokVN82> z*6UXFTF0qYR~fh47jaWW)`_PwZcnphG}~0pjdPquZdGgTP_1W}?L`Tbix)A=R%3R( zs_md!Q8nU5kyq797pT&wOL-NCCO2cQ8n3LXT~Nl$+S40tYt=fBzMML*`lDHWOVu7_ zhFetYd0DMj9lf&s5p~X1odN0;tX>@RQ*5B1Gb6~D?~p53mJS2?q7M28me6NUD5F;J@FKGsi{$sp_jQQ?0j^a@!|gonbX+R$mV)GJAes{kkeW#4CEyN(GBPhp+ai+SjR8 z&1ZS;(9Yd3|tZJ1ds@`12vM>cH)VCj4s|Xo8Uq;nG@X{2O9IDOS znOt0`cZOojJB&v@VJEvYS}<7TT1OJQTy2QQL8TAVS(Ubr38->!6ToKU={Hg98KB!Qffa^ z&x@z}eZkD%QE(U9F8`1M)f8r7G%XX-SH7{~3VunOwq-2FkShvS9DwkiYltb*^a7l5cchUZe8oy0ze@Ne|HPB|Q1U6~Yrcqmn zSuOq1m~op+`=EsF&Bk<%O0!vE3ES=E${&fadf&$*TSt6Uy@$2MRqU##FaHut;n422 zMej@_IAydayI2sVIMbP{NMS-PYNQ`$Y*V3jEz0*Pn@NmAF7#MB?D62Rl1VXK5@>C8 zRQdWIFK02@@^$IEzX|X4cSz$MYkj}8|50*GzqSTkVh#KL=uCGxxgi-^icxIWuuT{y z|Jt;&QW(3(i#86Oa>2i7@w-Rci|lDhZrhOKs3@D;=@&Qxz*cRtBXf9;f#*@`Ulq9Q zvE!FYQL#3C_%ouTqX+$W)Kk0_>DNEnEa&F%^_VHMB`C$&ex*^?@KMD;@t z#>|;h6~cWqqm={>x!-1Z&Z>rd5z{f!J|whbq*k7HGt%mJ5-t6^Ky+S6h|XDNfTT6A z6_c1>8`7rN7i=b)uuE+p@FGh;=*^O-6Hoe|rI~Fbi1P?nzsS$Z@W?6;&C<<&P(0@} zV{Bui(B0YGl=pO+FQ@MdQtnnUq?)$k5yp8%nCp-)as@A+w8ByEo`$aUrGebIawzV7 zFF?{>BWypCo-zvbC&`ug(mlS|m7F*wOfED0l$CJCa@brlw3M+aY@EMgDZl+W&qDuJ zin;PRGZd9^a{I?OKm$dNF0IWPyZN@;s%Q8e&YG(aj@}8=?4ERKXZ|O0G0>r0m zvi}S9jco=a#XjUaC}s5x7I!qlYe3ZS&Z`>cox^2%oB6<8H(xHe+ay`Sr_-7fzBj%teQ|P}z$=n%kDNptel&ki zOMbHD`)U6(Sxs0TJtK4alur0O+OlezJ7kA*|L6NNEeCFE%}?zp4tEvylPJ-4DX$ia z)Ac14IDe3zmrAMn_Ka+}TRKe3hwN!i_9LUMVO}vj}2qA5~+EMTbbV!{Y5?k&~{?$#6UcBu$yM4T=iVlFbQtON41u(Ay2Q?gXYLlN=q` zZ;xr)ZZn1#OYwHQxgWnRI&Owve}{x%dZEK|LrF)pRkr71;m`{+)3MPei)L>}Gbv>f zvp~grH)`TFXt4tP3VdqeYf8KDtp$4zF z64uOopg$S9EJ=oMbsT2ymMivJ%o=)g+tBGKDnCW3UTbYWL}}_u&06amcIX?oZKYtB z^#K%Gx=(5^jcUjFYp;SslRNXnIzCKBF~&C(zz9L=n!eoiNb`StooJ1~sSNsVLL_~L-` zeZ!J*I?HEcl^!1O3$Mf1hl{UanoIcvGMcE3hI;Lm=BG>qEuO|RIl;>baD9}`4BVp{ z%tVyJJ3FIya?t3OkmWtWoRlzSqA@9u#A>+SmW65cmz-FkNwcwbsMoQG*F?6puv{D_ zw$N*`dQ2c&G5&|t0-Z8t2c$owHa|krZI&pcdR`(!(nR4Es}K)6Wm^ux-ywtUpoYXe zrH_9y!~e;@0i%lE%i|X^I9cf zyk2;NY;pMyLJI9^BM0M~8kGp65fpA&N$JvsNyjwx!fT;?S#NNo z0geEZ;V>0Jt3IV^4f$zS&lT_VE06jzw~2<99SvBW|EayfpUvf-v-2&wyVkO+rH*mp+EX*8GL^OmOY7kIIP50qD_>cI{()hCqnVotl7akywEoWL9#7 zILrr{|Cl)3RW@D7VHM_~G~{n&p49vHym+KO@q*EBN~*{oHnF0tPXX@6)QaQNK-%y> z0E5>z{5wDs%SnT*+6xZTwA7O0S(@6O=Ka#jVP@sy0)0UJ>8oC%6~F4Wndf!OX1__6 zMMqT&XQ*E*+%Q|75{!;7!P38da$$iEfPDN`Qccg57VyObOg9iwlz}9@!ct9G^;Sz$ zYE&#xY?C1Q($fO+OAE9hV%QLqLmg;X9i}6Yw5o*3QW}nbryC_=uQ)!9a~@< z=5||nBc%^NBr1fOap@x=xB-vDV-37X+VT0)Mf)kgJc_hm;2oN&(7y6sm13QF!*dZEEKN7=L0-^BfI7}6p_!fK>4h6@cH5jpQoWBQ3QOB z#EVbD%4bU>tHt}AS%S~TgAC&dK0od629*2!`C;d?y~_)qr%)e!cJKG1E`zJ^`Ec*E zUil@T^FaBmbnsa(rz$V!5vceq0zQw57oUZd&z443gZH_92|gPSGK?qqd?4l(n4r*} z|LI%K=OL-Z=V4&**>G4WT!qia@Sv5-d8-()a}X$>l@30if~s<#vrv&J0zUVN7oUZd z&z443QYIq1#!OvY-8LR%7*Fu|@CAMTH?EGWJ$FbgK6e3w&xXT7;VOK79k;t=SGyRo zvkfSpl@2~@PFC)73sfYEfYMg+;w+0w|0d7rD6;Ir`{!+3(v$EZJ7MKVF5ob%ss zKBuG>pEJPVv*EB%xC)=&^px|tL5$d050uYJ2cLh>08s985-Ji!z~?&gVv?}(+0w|G z)xbeKBO5>#SI)+R4C4tthsy@#KHvLw=W{}8@wo;Vd^Q{w3RmItSx-8jV`9Y4DxiE; zI{5r(h0n9dMxqG#JV#1C3oD;3jVw2rc5f>XeNx5rGX1vkAY)Q-3O>JSIqLkNK9`IS ze3;(2vfTH6&Bb6^W)Oo2$bV*%;jmb^iWrtZk^M(myhDh5i27~EYEgFI9uia-n| z#EXr>Dh8HDR$c~B?xTW>jDhhW!+3lQ*5S~t$S%zBhop#^hmbOQP>@Vpf&6EtDc+at z(d^!+I%ZL>{^e`GV6*#o18jDWujDOG@T8!pvRQs^Jo>?VrIJ2O!cd(xp#jp@ z8J^D6)6GW>V6mUJm|n-0r^@Z!;Po9hFW`ueJ4)`RND3>TFM0cG zWC6w{fZCN(nwJqV+i$MDwA}tGNZ5ZV_Q%A9l|spWOJjel7Kkio7iWK~)~YQ<`|ZWt zTF$Wnw0!0(mClSUxQM$aay5ykl*b?Q`6Gr{CGvoqobuTVD>`ExNS2lPw!~9`PZ|-54_88OI+u0L( ziYeYtS;E}3f9e0fh^%n__Ffk3LtL4VX(K>Itc{_R`hBrRR`#_o0`_gL{R@B=?lw7M zuQX$67JP#A>w_l6%~Wg!Yw0aMKYfMLgsBgxKP})TIxOHdX`$@D0KgV0?}^^fd7`b3 zUFz)4qe@ce#y4J0CfEInIV|@tM!5PMDN?1Efzj6=3w_S%Bs)JTf0aQEpbJR-7Xk0H z!a@~RMQCYqxrxyhKT&cM%;Mz0WFbVc3rA9(2N_9WyLT$k7ultXQhV1gWbZS-4E7#Z zVQ;&$R|M?s@b(HTdo8VIEu9pjO_cD*EGtZA7Pi;TygW~^cVE@$3Ymz^DrCBV>zBM2 zc8;zfzFGIQ8L3~#en4~oN^J{h%R)4+Hf^^8-TUHc2YQ}J#?ODT=ka(tH`hF{>NsuN zVP&hVr*^af-6=AkTQ!fi8!mnGcd%hcl7Gnk3{o3&Kh^G1q<#oE4UBI5^$VQpxrFxq zMci~8&55;|40anr@tgKm)Q{drL%bh?r@Ve-ume{_Al@xz6|;1M)Neryn1rl&PY5nD z-o`_j8Ba0ZVprfYr!sz+aD{uO*DfOz>um#?30VrDKl9QXC7g`Pd!t5|V3hG-l<^de z;)UAk0=TgNO%3wQyE+pXYHf4w;`qk@whB-d>9GadV$Cl?thZxUd93R&oLGxMtn1Ak z+L3q5(zrG3-5OegTgHRw#uMD~_N%743KGshDk{h&j|8K)RTy34j1~c-lip}y)gUd6 z(SzRTz9krKJjgJfV6+OlPr?xz15yVPfKUg7l3wAICF}KeEkUpGAj5cqUZ&+LY&EPD zFdAyBX1tE~zOAz0Pus0&lZ-@&m~^0FOb_y67&VhBZ{6H-D{v*5dl0@(%q*`Hk;@_i z^jT7hfUt7Y(zw~~-E3Qeo5q6-;|Xq-hIa}jgm)Sc!Yh>Y3a9Y4dc7@6&}%%%FrJ{d zIJTAS180yLzaj7Tfq%oJxvHu{mhA(VbZ)$)^nKI zkYPL_Ofwr;;z>fe(^qbBPH&Z7oE`$A%4{$kCJI;K^b^z0=|M4KXdh5cD;=CZ1xe*j zcR@v>2soV;FD3~qr!9@Fq@2a+8o@<6Z9K>@o`Tai@Vs`V)7R?DL+EdpUYza#qRMPA z93~1^;q-5R?woEDqbe~_PAeUpJ_h!>}XmD83+R!q*Sg$pjyY2!hL z@f4i?TmOt|c}e%_)+_oOq!*`CKvbCxhQmbRDx9wJPS=YOL+gNYTIt~Q@9E3Rovwk3 zL=jM$6faH*E2k}uEL&aRv`zRI>2z3;7*E0Jf3U-z`PKXHKIfc{NiR+(fWc|QVWMyq zP9Od=-`|Q6L+6-M$muH5!RbdUoQ}waL=kX$R?AqN5>`%I8d=(dQAtkVLSz=cXOtN05?@mZaBvOKIg!JL{V7Vnp^^2^fr)#d%_Sb|^1qqvGE_%+|&F7?9mSKfbIu=h%M%gdp` z*((C}ro6qv%3e!jZ<}<|&9n+GvK)*D8OBqzcX{u1wmjVkpaQ5s`tHg49j`p6i4C4?jmwK zT==%znWEi!WX5Ecx~pT+Z9j8Ct1+`(zQ#>Q&0o(GwEHTm-M{}=2$~M}%7dl`N6>mer*9ip?K@)hg##Gj z()*UrRLL@znztrhurq*h4nfhKdxNvjkSupLa?Xl?v$N(TL%BhQazVt{ksUQ;nrw@$ zA;yEV#uJ#8;O^GZ1$!StU%9$EF2kC3w+N$y=0U3#OM7*{tH*t^l6pJ{4E5M> zunL#H`6mRz)#D3l8?6#I>Uu9HAkmXks=hi4;nH}+;wtX{+~bP5vG$bm5O$#rt4|?> zSs6v3gi;7CjmD%xShLs=CKbY(k`T&NUSP-IK*cA5GuzpIbq|RZt6DociAM)Oe^Mrt z%n(kD37Nq)-^G<=LT2cutt-jF6FK=k<~IipOmk-QELR_X%(+iBa35zvcX1Z9)c;p- zb)fYA?uF_1=?G}nkAb#?B&MyjL!JG+U+s~!?Ksi=QgRyY$#BxvK<~l z0&Mu@F|k6mx@ONAF%eL+hI1Aezj1~3i$Z>K8sEUG@7$nu7E1w%BhIbB(2xyBLl%xl z0LC6eNqPrzOl*W$o_yC{p)_bvng&L%{;?aBMCTQqZs6Y*PV@jldx!pC10ob ztv{&{UI7$NqDMXB2ymuTThl=gnVjBLU;T`WU0yuMn*cVLJl>IM^0pg}*rj(|1|jXf z5J9+y5lc0dX+!ptFTXk~rF<)>XzyM>xQo82hB@sI`8uISc@PTah*vvWqSkQa5pHZ9 zDt8V2qo&DXc@=`gf;-CHnB4}oo zxM`y2;p*I7&;3-{WoM@UTs1ZYdToD<1HAr?ZfF?t<_&xEnrR1ylMCS1oc7?F+*JDJ zE0BIO``Gw&i>*YPa}N-qP6RSs5Fl);%Kap|<37b>yJd;rbc8xo2nX&uVGlo*yZaFp z?4f&L8T7ih0->01hNEW@PT_MU>^??4^S2nl6_iI(XNDiapB8>YHh+YdKf+b`^IvqBK1gRD zwEjYVs*=|pPsGL_eudXkdtUseNvj*6KUrq+Y9zsnMl%6^te|SY{pvE70#i4sZNMkW_F$pDd z2_SXIB4;@2t#B3X>aDQ9WaR#`+eL0p)e)&xNC=TL9FY?)Z7-M&k&|8@xdx>B$bI7; z7dfFewI1vucLoU`IsGJZXQC!TLWtZfzoD3o!YgvZ&5zu^&Je3ZELN{9kJXCuScTw8 zX)$gtW35vCabDxvNh*x++s{N9%L9#naRs{ zx7&j4E`W+@+5&N;db2tEc`o~xKhpLlsuMDW%2xx_{7$2>;m9o~4U6tGo0`SsoY--{q7{3JH&pjhjxl zZNZY7h+?)R-5Q}#s@r&hjjM>az*SxmXQ{;mRs>3Q&gyjKCGio+3em9OA}gZt;F0l^ zm+I5Jv6A~z&j4PsRG<5#E7fV4q%I8@O4V=#LAX$=zrnOZsSc6wrMi`$g;E_P;Y-zJ z;l>;&U#eMt>M6wy(OY-BXp32IX`JYpj_YMh?lT9fH_U zEN?e7_c!vJP)lL-lL;x%X0EoSC-meu??WCDwb*q zjQwtZWx`}Qludk;W>wx+*k5`1R;k>6e`S^q&z5vEPn)%6U0){mur+^Eab#GkV*13I z({``P-PPE?%{ottU`=jUr_G# zkeJ-l*25-;Z9{|9J3+kWsq725_`0ZCtK4{ccN5DDtooq#L1_zvl266l z3Jl9h!{LN*dJ$Ugu(4kfv-If6ikzMj_79nBaM3ffyx-OL9>S;sSQmHjD^w{OtOYCQ zY94iE(rr@NFc8EaORFC-Jg-=1PH#Wo5u4em$0a}{Ew7DIOs=$zz%;+2hq(5Z5Z}|w zF^~8j$7fFm8f!1*LE)HRQYfh%k z9@nQVU=saDqS;=-)=HURl(rZV&zn4Uw%?(w=Nw?Qf6cl2IUc=YMP96um3{cU?Cvb@ z4!F$B>Hib@g;a+3VPxc}1f@jajV}d39Fks>9IavukbpBMs5>jJd6iT0bNXstEOgD` z?jVJqT%+P&m6com?kDQmiE8BNL?K4M zEcG%>GY~V30pMqNMNuLGW2x+8=cTguWcBu^%T=X$Gv6VN z7@w39EgeirQcCJfiQdO_p?2q{us|2HHILDN98>!st;vGDCU_3!zAd%(k}d|=NV4dd zrv(RCt*c6D%3yddhFRK;@@l@5mS*sk+@4>vV@bzN-p<#%2Ji4uva_))o$9=7W)s=$ zebzD|x{3xI{{gSGVqtmyU%KhOjnXKYAj8b#rP-f~|HTCF^Pb4*)0P9PPBR9qA& z2EA~jAm6>bdtl{BmXi%4%ZY!$naxTJEI(_#)cOMq+D{(ejunZ{VbuF699jR`XB~FQ z6MS+|NjOJ0sDtddw;EjD%@J=;7to50Dq%Q=8sWwokhx zICMgNy(=N=muKn|M5Kf4eUa8TxjCv6<=}TFG6TG%0$ojd6`6ad4R;g9wt~{2!MRs+ zZAbL4DV3ZftHbM(2&=rgGo*nTnrtW5<@0>m;0C!D%zv9CfzTA zs72}cHhXc5UK(>bPkDSv9O{`Ir#C<+Y+k2^dt0_4t~I)vZO!n8P&neN8G6M@Aa|@`t9-FPotrTct^Zf)wGDXtn-v&VqNF^i-|I`Q=OeNW3rVJ zu99J{UHD2{TEXhql;pzB)Ql`B@EzRijxiSCe3q(N$S2Ny?q*2nMsamE4Nr!5h@##=aTP*Eg$7Qq1M0DHPP8kN+Oy2%+ z3-?UFJ>|fpJhU?2`5z1Ql%ushjk#AgZo0Vka(?ek^9h)@@oS;t@F5?Y`aZw(XdNgM)7fZ^`ll{_$9vCR?wgKC^aX3IwOE3N z^#$e~MZ{(C-gsH|b)82Ssh7ul*O7hZ>ql72{TA|Ud_8>R)V|)@Ye?=peB|WtQ;l0V zABcJkRw&iJV(1P5jz`@f$ZA)n78zn-lw6n1V7{a$f_QfA{mu5I^--NT>U* z@n$7~ZXkC!RcGONM7$|?C~wkYw>UlaNsLI}e7sDdC|gZ6n_TV=9y=1$V>Pl2gvQ)Y zBtt(ne^B1&U;JFo`9KfAJX!iFb|-7Q+Y2Y{@C=Wl&kxOq->A?~&&+^c->3uhF*(bQ zF&oHo-8H_5W*LhpqTc`l?gAw#4kyzADPF>@tv zXWVzOS3C(bithykXo`i9V$r2oGo7H=a3~h8LUEf{tY)ssV*JKK4=U8e5jfEHT|j_u zl$%0Go9NOu3Jlr|hc@9Vv^{l7wT`hH^i|MmAJw!`F*+PprE1mdWecu+# za@{Aa3p6r|0;>JMs((bNL~ZrX4gteV)o|z)ZcNLr^ytwlZmO;V;x|*IF1q3SZptdW z>Zy>rH>uuI*3k!;k?xDBSp*XKPXW{i2&xY-h;We=_&y-KCeUz%Ot^}`f8u0UzbsIN zNv}d#_}qCI+FT*bTxBc5q0mx55`DqY8MV6nfz~HCh@Kd;=dA_gvoXiU)+dZDJ*!aG#=h{To2(^Oa zC8teWvhES}VFiMtb64Wu*1j(#-r%*TfT6?PmdNtG4j6nl9KH)z;rka>JKwF%XsvqVe)zny zDmYMffW{r5HDw`Gj-pFjtVEmP&?a1kwv$X7T^$1LD^$L*cHeHsp1CIzZ{A~zVOpc2 zIi-yFH3^Ilj2c_X_%g8SEtk2lM=}XhW`QB>h9m64`Hjo3AYn(6f83izG&V>@bmL7f z_O49pGY4#6+_WFKS0lxg$zUf&5Sf<7O-s)oAyRb;s@r-|oMgSy21!r&w1aNCWbadV z=OUj9BSs!&#Q!!xfYxyfA-ST<=?P#cZNp)ha24_Y)=AE=ybN$H+MDA>j8O1HFr)Y@ z0M$RuW~gjRsyL2n z;CEMZ-ENie8gBmWWIix0|3^UdZLa;U@bC=*uRAex?;`RI5 zM`d&Ou6`hu-4#qvp;e}zD|4z8dHvF8dY;+iC<=~p%JvM9|IBv7p;x#H+n?aXd1e*1 zXGRZy;AG7Gv(mfBq$UEg52UcVo>+Vfu?+yN^b9bdz-{S4}UtvK0b(ryl$`|a1ClIi!mNyd6snr#!` zgOjO!gT2n4ylfn~g?KwnOshWLG%ReJywhaN9o{)RZ3moS*5)#?Mi$j;atZI3Qd(9wvabFXIXEJGu;&-m zT2R~iLt)aw`d%GeQ5IFcEaoJ?tSoH&#fgmnu14MU?Cf|i@R+@TM*Sn-`;W}5o@BRT zV?Os(Cf+ouqI3o~=>4Jd3{LN=(tSd$&Q%gr>z}4E(HrbG0u+~|J5To2LdST?sK%Q; zD|4xsQJLAkzE6TwJ=c4bt>){;>x-ktytC%98`rLE7Df7__$1F>0%JXAe}*HuaZ%;Tkl>kAJGU!*Js(2yBKrHx zrIY(4DRaf{W`V$gTPEz}qcd0Bcd5zPvq87WO_$%dw@SoH=w81S%vL@*qkpn#tT%gn zy4vp~YWD-O-;Z;hI~6PXs}rQxjf91Mlnr9mb`a=IvZjZLkQ)c0f8jvbufxJD{ zad(9GKE}pmDic577%X&W-hR!hQVrHEpE zwXd=qQ{!dTKLwOHF6}T1Q`xoKsLKH(Xb5=D)n|-7j6IUQ<1sPWYSDv<8^7JL6 zBT@}dfjyklk;6KhpuK0f`roQa9lHL_?DXN}vTC#((J(P0HHUu8K6X)}Bq1f+ypls< zIFxLM0S|-iaA#Z$UdKb(_-}e zs6rr3o%Klau}G zO#Ig8GpqO8hb7|8d@qbIX~>F0W)4PKfn#0n{&jpf1+HDG?BmtV@!RffUOmnUZB=u; zd0aIat_^T$0$Je7O_HIY>5{pH6@9ssMaMk_j@5i=MyEf`ERHYmcI~^0p5Vs!skv&t zKtsvGzncFwQZfzNZU{2{#Aj;f_kjOxS3f%bh}_&=xRkbNAJuuCxIwg@p&tXfAwmOa zh<5$M3kRr0+{)p5CMqf`2r!&9ld#^7qRFUIrc_!P%2>sE$Dpo1*!~Yadmpn}T|&$n z+-AFEOh^Wmq|a$rscLm&kWCw)J;P*azpKl*owD?He`dooOr)E+z*q-l^Mu8wb*62I zRW~iNiM4b%>S3W|Y4-k&&StQsxl(Rv&H_klCL(hv;DglT*6@1+U&V1)CJ9M)zb#hF zKYyX?lv5HzX=H$QQ;LDua1@Ae6v7stwcaK7U*I@vJg2sec(a5qE1bel{?pGopvmKR zlHaa~*f;05+?4mxYqxQK!|e)+FTUFCj0jHC7Ya^#nD=nR!yyj`fvjT^uxk(C{fK2r z#8V{N&R3D>I|W3KUj?;is8v%keefzw>UR|+L9Kv<-_eag73VSHq?ls{{TU*etGqO+gw-8p4yQuE^yr&m zOY6J#?8S9U1Y9-@y2l}=LGhdvHwbjW?}e|p4I)<=I8h)h`YNEBm$NEt_skZKJDz(^ zzDuNH(I({>q=7sbWH=-Ux5MnY`514B23Kwxx^;vS(Y4-$Ddm7kNPGCw-4E*9cD9O4 zDrJz2E7aQOW_4mx8t9q7Wvf@wT>>*lIY`3YQ-JQ&gmP@CuNU;7yS7 zH~jPVGXyXHk1rp*Q8+TW`N5M&1ux|d%9I#nI1CbQhuL$p+edfPt3vQbkP)5ZO)xbu z3F(8E=cf-IosfEs>@TXbzeBJ4%459uZfPf0Rug;jFRG^X%p4)ZhG350P^}CD%Qr7q zK0li+{k(%zsD=)#T=i#)FrAS&s0|IkP#X+~ZNiP61&e<3(K6X;P32R zHc0jlr@v#`SK*3_AjNrlv2M75`2=g9&NzLv8bIwqXIHK7+Q)Sdt%$7RUhM6f_I5=j zb{P)4gd1y;UDm6X+LeiJ{<5$->tkzOG$y^)sS>S* zL#uFO?^;l6L$t`s$+}f5~}S z@AV~3pR}d?cswG}11nc}O+#MOaET_vp-DI$T+SwZ1rJk7G8zUA`ZWFBsA;5o^z<5oc5~mBt(J5T zHAR~qkqrNYlV$=8iMs#A44o;ba#DT!fT8*t4yD4eOVyN1xNl^Q{XaQ2rb(z=N^lsa z{ilRN7c2BPZ4yrf?l2p;hNDE6B?8iK+;#8lAn!$Y3~uDpO;<4`ng9R6d=wnk{a2`k1SDS>S8s(legWyqA;_`C_0x?3lZjTRDxj zXQZFa+eRq1Gl6CSb1L1ARSsLgyvr?9QY84`W;g1Kh-AF?Kgtj+WS%ZToSG#O?`03D zYUXkuqGaEAeul|9ONG9}SlG;Ru{1M&;5>G5xSrbd+)vhUUG>=KGaC;y#WPRx|MM32 zrramkMLcch#vmp)9{<6f@h9SPD%N-OI)=aaZTq>F*fc(eFoyZ(o1WuQh##&!_Kvk1 z^AfZ+p1DKc?nX&BA%%)J;jDJr3Vf2=td zpBeFz>PjS?cAqP^=YE!ZK$|3W&ByM-k|5+B1np9eM04)#2sy&mUaxFYAH}Go`kqDV zLTj)8@R_vsI@14kYp-MAC|!G9MLJWl_R2)>8hnAbR>*g~+(LD;Uj$4OBjoulkV$ zM$i0{2I!a1T%*jFe~ruoE8Et%S;({kObJB5FsK=h3MO27RL#=8I3PV{`vLfrK$2e; z#q1~V-q>cwG-A{;P&{()pVpg$Klns6|gW0OeC$Z_F9$D)Idc4ZXZRxZ`-oCuOo`1*k!Ej zlY>&A0+vM?gYLHL%u_G8b*5x!CTWZGc%uT!sg1XN!rQKbF&z4ZOOM+9D8J4O0i8y# z59pNr4C~BRy2#4Fy?j|u$`R)56ToQikc1SUu^I6;j+WSHIBXQoUE#8&C#!YM#bA~s zMK&*qX-jwr(o8?k|&?I?~_ zWwwxIuauSwH--O_p7FrVA#qTRhk>CQ8xGrq8`E0FufG&?zxEvFXY^aTIfYmWrnoXZ ztUZT7Y3->yHZzAwhw3m1r~TDl`=HmpwM4t&&@SBAAS{*Ig^jN9+LiFy!`gEQR6%>V zh+5SC56nO0d)903E75K^v)#V-1I~!i{|qL4N&PsHCiMqxWuBDe=o2Td%np$A$Wb7CCBmIB4r%4Qy`x+iL4y zO=e2hzpc)$i@jYbZ&#+oF2iA$aAW@#IBa;=6+{ai?_?xznQT9HLWG(HAmTeNAf^0)&t6vBLVd#;<=lPSL|APy2Rn zlV~dNq)G7)pG;XIApHf3?wxa(!qe^g4)F^-JNpsV!1MqABx_^g_Ir2@^TN_Rza?F~ zKEd~)dw$ibm2k=T=6PZjGdK)AMoZyXCUnUk{?BC<2OW(e zfVf>yo4B6uc4?EqHm^RaXJ|0KP7AAgZ7;e?!BVb%>~xYllKkUNu>D3_EIO>uRb}Mk zUH0ty`t=-hnfctvm_Z{lV>4HA)!w0d8miW_`d8K4mF*KI>i>3ZcOa+$u~)6Ku`J1u0a!70d2d9|Uob><`= zzOG_{vXJgpf$C3g)G4OC!O_@BQy}`s$Dk&@`Pa$_j*QeoJ+pj0FEFzGE>ZAoD=>Jb z0aDXf;nF+asei|KsrWs8N{v`Mv%$JP|@_Gphz;dt2tdM~2t^#ZZr{ceZA`FM+8Y4M6Hl~Ei9$fAn4n=KPzMfW7xAcIcMAgCcgPMFp9;j zpmwZ3PN_&(o%RE|cZ!3aG5sOCxMexYV?vw6c+g{JtLS@)1suPp}F*UJ{;xMD(ExEe7g1pVE2`nWp3;EG*8L@B9 za<~x9{EHF;%RhgHYs4M$fy&qg43*JvL|wSC%gDb&CuHHKjw^!b#2!^?A89fx81b7{ z)VpP-LbTSI+*G~4se7g#2`Z*MP;3@Ef7PRS{GnQ+h}HmS{==^UXN`q7@&GNEj0x@; zcg0X;y4Kx}Yg)a3ZO+}33rlr0j*2}zEzk4tCDGQS^lSDsx%=d*e##r3i?J_ zLD%?Y{Z^&PZ+MEt@(~0Xlj*+GDi|hM@~j&|eH%0>?rNV(ENf|+aeUwtVjNih!dqOa zv?)ocv;#w_7!Do6jr}#O^Gd}@=eApPLw9-6h*B(?diWdr#^r7n0NL@N5lNA`&X8aNp#*K&+dppcN)*cZ~0fNs`Uzxm4dQQblwDV)nvTx zHU9u^UHrp)*YR8Qb@7Y$#_N8%F23r%r{b-9pNjwa9^fPwo=@S<1v^KQ-F)2i?HA>0F`RV41?%w0Ao6e)bZQ`1yHjZB5nr=3M@?``pVIo1S~B`HD#u{o2)& zI;Cm%J!ez*^A=Imx>l%`ox1KrRO3_357(i~k7S7-HQo>5#uU+c)i@R1y1`ZBOsK}4 z+{UFbrKrRE7^c+kYrYj7Wne76+Ro75Rq4%YHX5QzkZ=0$w1wxg! zDXOdV48e9p=URWAD9QL|9z>fANb1InK5D}gA zfc3F{P658n|H?55RL$n0i1Bm}H?0TU#HBH}EA*7n8`jH5x6+Wcb(z%@dYFqwFeEWN zhU=)d@(zh0yhQ`u3E z{mPNMq9(hl)1I*44NY@ZpE`<9cI=b^gwZe?F5X84Rf0-X+G0=C`I4ta+TepQ^(@^E%A;2Rw#hNm~VHkH>yi9W1e-RS?3`m)n=it z+^7;UpmXgse*G27Rp-|HpX9M|HSvrLZ3%`liRi3t8M_aOJ6>zX%1m4HFRP7?@m5h> zr`I;}pmjR?1phx$o#uvcI{t;*^}BG9+y#mAT+^h!22H7;sX>}jV?UOrR~9tc`Y!tJ zHO~8*Y{Og9@y~m)lO`~Xr#-(a>0UCqqiVy*O?`DwJ^4ZWEL$vZSPpj$Wu_hp%@B{O zjhfXN}e> z1~PyWNNq?&x9DT>Jv-|P`)S?3vSvjK33@N^(^g%hu$a18zC1vfySnDo4xIDXt5r(c z${ILl{I%|Pn?`{wQPATcG=)wZFBrT}A+5I2u3MU!0Xn7hXuW>oCD$l!j~@T6$7cq# zyCs9AsK&LH6K)Yzy%v_>6SNLMSE9K;MI2IuES+r5@ib!Y6V!yiiDhy}G8o7`4F+!i zL&i?q2-sK~@p-0@9)z9Fwx)j2Cq&;@(PB2;Dm{&t zmymNw)R}Xbz#;dF+Gxk+>bez4`9km;N^WdOHp)yRqFd0@j0uRI6Bc9mRhqx&R~b=p zl2)rH5|}HQY)$0*|13t|{KQG}sgsUq;4P=T#{H)5(JA?oINgSABKcj}3Zc$QB)3bq zlj1zRIIB1lPlgta$`pL`@!e!~n)F5&H|Q`K?b(?rG0%@Tm6ge{60BBVkF0=IcPVB5 zxt?ziEI%8=ZPmx`k00lL+bbJebdZ9b`X;Sl>Q--fgR4rmNU=iVMKDCYP-p(zTa5-; zO+C|CX=b<61XA>L+E1o!_VLh@f=01fA=8mq*~(mSXxKy!cCb%-Hut1{b_Ok*EJ+|4cr+@`-?ox}JmbXmN zvVw4E5_aoJmbe#_J9)WIBbIb(m}LdvRxh-(=(SW+KT{)j6^l4i#&jvoZOlcT2@nbspkf=R#)$xtGg#lTD&T(%I{}(VS-**50KKE%eZ%FiIn~bZt zc|~Grt}Y~KM(9l8!ChW&7+vXew_5Jym&Ntwzm@9%dURD*r1`ubRa9?Z;Iwe*lQz59)ddlW=3d;vdz)y5`)^*`YbzYNs=>P6pOQT_5$+2Gzkj%}+|>s@N3ldyQ?mY3R}W zDXGc(-d~#6zv0-Gz>(YsT$3B$p(yE-n<`-*VUGU!I#)r4%&@Rm#;h;H8{5>o$}0LE z-wP2kdmY)BMZ2Ur#-h(^N17nU%$f;0=ULb?-pooL9-G8aGi*KAZkyJ@$7@=X#H@j=Sf1 z^wUGxLv0sH8m7^ouWC3^m0VMAy1shr@fe8eRQmOLkId)j71KN3WhJ3g3g+0vIQp}{ zRyD!A{sv{Oi4trpNVq+y<$5Ibe^mPm)WvDCm@A&$!DP!wRc>P7mKKTVEK?IkK3Pc( z)S#>&G$J0O`K7*=@Rtn^*57vjYEIn+XQN4j9JX5b(d!`lGLfY>dpf(^mZsM;=nre{ zakwqJw71TKw)w``uGF);s(B*v6mZBMkTi>FAf25Zm0YXr*9(rbfNA%iyb2R#nP2x9zeHhW_RiyiS7qw#pha z9lSXo$W@sGG7*((4LSO>{OCf&)t=b75b=ASxPBqxxF=q{5b-Wgyk;Td9#5q7^p`FxmDke? z$Q8};Du|E6BBEA&6~sPIJbNLc?of%deIepuo_NJVM8<66>{y6+xG%E5S%|3X8q)c( zg@{La;>Q;v)_7vqLc||A zwGWWpx)R{bgJn5xTOh}d(j1p8kU>|13rhMI$Z*ZeWq9AqWq3D!D4(o#={=DN#2d1QKhT` z99fdLKNjE3RpbTgfM(n!erMtnm2F~IS)NpE!A$>DlF6IKb0^~!wQk>rpiV|*E?FSQ zUxXYK#6r6EF?028xPM`5_8oItUMB>M(k>?M_@3TMj9AJkp$N48(vf)PoI{un*!$K; z6g}SG9V1ut+eclH+<+X*jBNnR-}(09J9m!0{@7p?HPF2!j(N>?#8hu`P~(6)p5A=? z3wb7thcKnmlFsT4)1hH#ZraHHy3{iT5H6E@Jd=A*EVHAaH5X^wKCf;29p9yyr+3Io zcJBGUi4K(Vq@w-bfb$a0^N_&nE8KKN>ZYO2TwoWF-K=9%j4*8V3JY_N9u}qi{XSF8 z6SU7UF*CfVEKprEoLFhZZXTtr#bv{ecum6X09_V#SbarOHb#63uM_* zlI10&{9Q?wg{ADfI%s)1p5TD;`tkVgb@8jlB`|N5vec}7nUI?!PaSh!pQqyKxHB*D zd217848;oO(C#vVt6*}J3MRt*3ic3l1F0(1q!Y=+-yxd0ujUvJ*^JD%Afyg%KQwZ6It9ffyZqfpvYpW{A zLFLUaA@7!wyz6@Yu;6_k2^PFuMrH=S7kIgx#lmtfxOXJE!jdx-mI(6;>rH+L^@U~Y zgxhW)BY(@9IL_5vJe+L0ouR%9YCqM<%VRS3aEbD%)vL@XyiE{gbCx6-uh(L%qw^B~ zb`$kiIwDi!$@KrJT3c4_D4yu8?d3=O{k!9D9B1kFQLO~q)*o~2Dph90L8N?|MbLVm zgx;sZyeRm-VP3xSh4@p&vRH+&C8jGodpbL$t zYC+Y93aW(Z0CWBPScdVnG?w}v?{9L74Z8)bZ#jV>Ea!Fpu}Vf8J*RGhh_v&xPEDZ% zyIIr5dv5|i(}n#DI@Vg^SR21BghCcV_$J9ouD|HoKX(Ew$HfceIP=;wN^(fpd>Mse zxD=wr2H}2voy7JxIkQ=NFIdi25)H6wb5*61a=%&W-(ojSGW}PxZgp3Etb~-gSVG6k zlf?QDTziqT)3QiLMV7Z-+fb4vvrv{oIk!MHUl1R5jqv68f-fqcdNAkCD`!>jX%$*= zV68(Ix#|I;Dyfmp(td$Icz}1;ZJs-DU_JMrzs&a2V{C}+X7u?Vj$pqF?mqtiE&tb$ zZs7lQ`oFNHJ}lA@;ERlyBhiXElJ z>yMT8{p=U0hCU-$gyLuJ(&^oac2rGNSy>^Ay+0fk!7(;wi3$ z17)3;R$K@N%H^I?Tm=V8yQdUaxq&j~Da9pjpp1G-aeW&oH+f2N6&fg8ywztrPw9XI z;NpJ_8RgtTsw< z31wPbO*)FI3+2A7Hs1Rr%rgfO5uGZf+z#EZCrLt`c><#Hru_C}O?2=cPrA2)R2N9{ zp`7cSK>CuA3W_ca`0fgpj|9@X3esl->0K41uLqKAjir|F2&7dNTt5q>@H}_X-=_oV z=M;RoQ?dJeD0WtmP7S1gt{|NsNH3_qC$D z!~ZYjy|*ZD)gP9}xtK@%eZ~m*}ig+kpDhWYT1@x1T{z2Xf*YU2o)4;X7diEB~oV zD_tHx_cB_68fi5TFdTY?YsL=A*CJMSM?0IVZfQ0i_MXLKRjDElsXA$dcVE2;BliE9#{AdszrE?7P ziJ&Xko)WE60IXH&49Go@) zD@yH%cezrVP$pc?1668Dhf+HodF7=x0u_rypwvdii(X-+(9+1NlO2>=((GAWsTmJ4 zjK_y>=0qk6QXn7wxy!KEWntBKb8c(0Vk|v)sUds3x7JUQO3yh&vH2i(Rcwv|(4TE! z2ja$`InH?z9a!1(g8ZV|%Lb~@5b$8Q<-6esjc^sg{%Vs8_MjLEP#;jiRyqXxC`>C4 zb{AA6ih$Crcri&>DYP`QVseRKR|!J5#_%#t#CVWlJR#V(Eq4M+Ytg{U&;MTH>1w1F zpF4odyw8TiLg6ZW{!YgE+$KisYz4|^rGwAEUoqe33{)hFfYKK6;*+rQ+0w|Gg)E;V z!A1IPJjgJf;PVf0MFPrw{`&7Eo`xs2_?!Z=>1ZYx4hw~=@Oj5OoX_=Q#LhaPd{#R6 z{Ah*GHBgZ#0!owO#Ux?nv!#(W<$a!9g3rc-4C4ttKX5Rwk7uV3`PH3=k6h8mhm4TP zr?A$CpL&0ZaO!;VLwN;`p#lja;8?;OqQV;7 z;?g*lmm&&t)D$kR0vivG8IN~NL36!AEHnP_!HS);-QGIy9&>K?=JQM=S7g?@t=O%! zoao)}bVXMs>#%C>L|1f5hoakF;bBBBJQM*BXGzHlVWr;E$Qt$@4lTh$<3Wb;cn>L+ zf5x2NJmvHi+44H~A^?7#Qr-FLV&b59?~Bw|Tl>uX($)&|>-c5dpHv;6lC9M7Y2ZP= zjvEfQgsZ6IKc>J{T$5tNxe1`^xY8j|TV-6?a6bwai6WphFJ1yAtO8|eWDP==>^?#0 zgX+^>rY|!dWEfAV<4>9=^L_60Q=DO`#pe;=LEdM>VWDspK0o|6=kt&lv2!a>J}Vu3 z?yc~-4=NHxz~@2ns)`zEvZu5S(F2Qf( zkqq&KvVMU}1yZ0%f*q4&yr#0&zfR@sTR)fkbgRwU{Ws4G{nrHuEw8i<&JhuCB;_3u zR*qO2M=~;oN}Ccy>|!dd@koYvyd&cM-}hfPu5m?GFYBoR@F3ro4ToF8Rn+NKDHo_JG2-0Z2`*4dhd?D|Tv`7Wkqe0;5U5#F3WTrE#)Ayw33Ynm{%gCRmrO~m`fOnE*>G4WT!qgkP|0Q2q!_Vt0%(0UF!;Qp z!sk(_NE88|^Ww!PVdb->kyYh=o;%#p7gPO>2N}lWeWv$%^Oa6SdGGbQr@&&skQC$f zFfh!<42O-vRd{{!xz6jYV#LxxpuAQ(c>N4kmzQ)FDiTFNX`guUT3C5)X=Fw6mWWO- z!E56|hVlHLH2N>4orhhr4y!tV@=)pE;X@T3wn4>15%92Gym%)eC23^5)u%)KaP~K;5^J35LT$;VMe?!n2*vDKTPa15iFI9emzd z;d32SB#MC2dhueCuu^DgWQ}^CN0#8T@gT!^{!dEv4&PdnvJR_ifbvl3;NiC`Jd8ob zLlN*WAznNbRvua!Swr5#txNFGc#vT{p;T|+6hR6Kqiz+NSXKyB$9tc#qMTpo&-#hT zY!YS)eGV9!vf*$*xQaq=d#fw-NQ}5K4OB>!4k6i65t2!$NECsPOozP?eg`2u?e|L<5RDXx? zd`NsFC9aJYGL(nq@?Xg-I@lzTunYpjoYZhQAzVdRE^KgN$%+wIx_}Cc(jhFDR)nP; zDiTFNX@__*Nmzx&(#UG{VQE=HSd0f5#uKW-=c}E95}(IDTm^3a^7*8Eur@YM#OR(8^kYPOD=3*KCZO)bBR+?QZBqXZF)vVGrN;w>S7)6;3{W? z;jmG-in_R)($g%UMvPdR0Lp8ngV)DZcwGe*i6WphCSJT2R$g0Lvb@)^C3tN-k|CZ@ z7yp}zCk5p`&qiQTA8~>#pJ#!gTQVFL3RmItk56|#Pm2*dr-1TV>EQD+^q0@7CZHlw z1e8vS7n6jQ&z45k95VpLQ?CjTeQ*)$f8#-h@dTe|{t^KkROC$oRZD{OZ8hetLiO-Y z4WKy?p)9^};Q?#UtBBHf-|V6^EJi#V0xC*MhbTRY;_@gB zLPeqoDBUVvMZqBBub?8X=-`RoH?i0#8IK|@o)D#cwG&WYGah|R;y2f3r4FC_fMi4! zovfKcuMMp5`Q|@yK6fb-c6I>ev(mxmyU}0na~o8A76GO0;>BlSrO?vI(yMLc^Qhn= zYliV4!+5;U;#Gm$Gp}Wvn-yL2#g967T4f3*v;Z5iROvL&$2Vf`c0`rClY&Yn5uj(p zi%MbTj-`<`EE8~N$V^#WMK>N~7>{>{@%P0KdKFg1IlE-v+O*B{Zq*ULbUN!qrCjTQ zp_elpW(!wQuD_^vfk=uG<7uz@&tD352i;gr$)+=mXKWgg_V% zGK{BCu8d}0M_F~Aw_Sb1BhHs9Jpl}p zE5qT8a1}*8_eK|bSUa8E5b7b6^SBX>9BYyYGGB>mPS^a4^Qh7!eczh zFrHA<^y}s}ow%SG+JexR>cn6Bi1ILT?-Gx;N0m_*9BY8hxm_GJ zizhu==Vc}ge|xmS3$gsm#cd5-+&%X0qE{+*G1BYpnE=W2pAvQ|4znl9bMK^btFFJ3 zyE=Ld@SQyQ$n=QZcUIfMzJ6|s_3q}%GdJ`9!zM7ywd5_OngpJ1%C|clffA0J`SQkj z@s3#2jue^r`x8D{5x;5wj_)zHrN>r*X|fl)^W%@!b4;V9a(4VBE?}F#!xiso`)?xQd$BakB5G%mKQo z*SMNjMLN{HWrU-==0)T}q6jFRB_#)hm1&lyB<2oPP)G|xUrfz29?1|-NjtQvhRRmi zx$AargEAjRrKzCP@~Wo1Duc^i1U&W32{BBPAwF<0tXTx`stKUlyV4=*J5gL7 z^--uu6al4q@nVv&in^tdH7esVd_-`OQ8ylB7>|$o0&8hE#7UW=QaIVz_Mr1-M3!K| zFi`UsrNdD7Z5YbE*$S0RBH+!Cc(GPkDX=uMhU5j_Y!zIjH^zeu;|X;LUMp5)P9baN zetXJ(eu;kgA*o~9DKjY1L11V{hQngvDoV7j&cz@rMs#!mRia9V65WE{@))#3MWP5O z?GP_^3ac1c8d-hvofu>V7a0TNk$&+MOEipV%VVn0jB8W0CucAjWRZMfP5Ki;m-13AC`mc z1IQFA(JU}DEyEEb;VLT8k7`}ir^QI5rhuwMN{32RkLL2IPe4`CKtSoFc!|2Oin^s$ zf{+#Uq~Ibek@2YH#8Zg6dr(l<{`H`sf*0NWZ6{RW(L5v!TfCatt4(;d1`ETLQQdGA zBSU=PVj7#QQ;H9v+fzgqd#)mCGR4%_{NnLPd>Zk-T5j$%ywvFR@duDbY_=*t1u_H- zqnF_bpKuiga`x+7feeZfg?&I3h|-}zmSJjnfpkGdq6jF>iWirJRe@L?VogSOn~yh(TqVn7WKN{8X$+c1KcdYzf;_*ewjCDe8Ef%%u}yx*x0W?)_%4)Xgtt`0WCALI69J`@;>BlS6%$J%tIx+IyM&k+ z4>F9WP{K1OHaiui8zFg9SJ(&{RT67P3_Wk6u%3;{A6?g&>Apx?a4 z1!$`nacU5#04W^;w4owES*S=90h9W~OMrw`fGmxy4j-WQB?QQLkYPN9O2hKP>nLdm zc0;_vp{sls)+GiR0hB{Z2Zt`LaHtI`4vBz6?c&8DVdapek=5!QYFUCq#)AywDL7Q# zEf1_ba*wQ~^OQ!)uN4@|&u|zgT!p)DI?k0}MvR!40?J*bgS*WY?$$#^q6jE$5HIcu zD|am|S>D}-CAe!mk|CagyL4$@M@jirY(($)REDE4sXTzgP?0DCN=L*?fP_^5ElmJpa)kg^nM;ccpz$EX zczggCSl6#S@_xx?Dkz;eJOm82-*A{GT!q7@9qSw(6eC9V0p+mL!QtN%x^joRpdwKO zlxD??!@|m8OCxI*vK)>C7g=MB2N}jwQv0X9jz3iUe|(qor9*kq-wssmS31=GM=N}3 zg-Rw7@TE<>*ea}iu{5%#yf2eW@WptLVLSz2=677JcgtE1fTWS4YXOF$GaSYVS5b6V zALHCji4hYUfGRqrL($z`;cgvNB#MC2dhz0}uyWVZ$jW zqI(sOhg;{Oyy&k1s_2ryP;}cXe2GCNlL+{d5HG$6D_<;)tYPoV&=Pzx9%LAg_hshR zw>br2S?&*5s-zG7bH|E2e_k=YTU08vs1)xkkg1wkXgD~8t0>+tu5uxn79(y<0ad(8 zhvMB<5t0e0NE88+CdErggjGl^jjTZ*lD;K`#CVWlJSD~J+@4pf=k2?kwafXEmmTOI z1*&+J4#nGB;ma^oGKqjMBjUvuVdaaZk=5mW=~#j<#)Ayw3B~*Kv{Nvzc!#79{aa1% z{Ng=)LR6w6D#bep3@azY;ec=z#XHK2s>PTUqucFCh_D zA+a>F+I&b_mk<);L5A^^6t8pp4;Syn|LJ^blO5=91*&+J4#j&xg)bSXWD)^iTEvSl z!pav*BP-*5NiD$_<3Wb;gyOAAIR$=&kW`tbOqqL=WP|(7ZVcU`{VuE=>XZbXG;~E3 zxKmX68&RnOHNddBYB-z}uA&Nj|40|Mm>6-j3aBcebf^MnSA=c0#=<57Ce4vj*o0Ns zERC#sAGW$Bgw1%6VLT;Oz`6a0tH7V%;e3f?2l}Uhssc)fDo|VD%Oq4XiGVLt;>8zX z<%^|}RpWh0EWsD!L5A@Zd@1u`>;vkC=U=nSuMF4hR#cdqcjk(Kxf9-8VP&qRF}KQ_ zJID1OxwDvwvhg6pcnaoH6sj7?_(Nmo&&FNoM`Z{4M}P{w(joNEU`zQFZU`!wM8KC} z@uEjq`C@5gMe>2VJ-q~9j0YLU6I$P=&t^j|ZUMigw$8M;Nj(oF$8TcZ2}+-)yDQV9 zZzWP0&=|kL7C{5cUww|ua>&B-%`>m|6X~+xtn9vBCe!4kgyxt8F82ej;gBO-MRR<^ z5iX7iG2(j+sOG42XpaAdRpoJm7CyWOf##2%! zwt5|UO1)?LFrubiPrK7&A4@$gpLQR@wx^bcd?zz2i&UaOd8Ksl>Xr(xrl1lh5%6kS zyjU%)ys|X1M!Z+UOYq8gkYPLpugYrp!VUAJ!$QOSdWE?Y&Rh{NchZ|Htjx7E=5F=o z4lco5<3Wb;6wD><3!$v;&71YCxz$yuyzD^#D9~m-z|b%^SNJjvmC%cTFC*e5^uo#) zOCu}med$_)FUErm<0<&Ubb*Q_`?jKk1~UZEpVSH^wZbV&hgaLa1hvM44C5(LTNb*N zlebC(TVc|qi4+herrmJFM7WA(`%&tJO{BbuT|k>i0Ye496iMaHwjC-GML=nXcyU)) zxoc_MZIzoe+ZI9SgNxYnFdk$WPr=>A)tEoJ#re`EJER|I6DeS*G0hdeWT4`U2>8+> zUThUszE~PrDep_e5_~ZpWEfAumtu`+KnG=&0_aa_g_2s~{VG_biPO;}M6qjZr$(m|Dy&uQ4&GNE8933Gw2t zuyWVZxLf1hO)SA(~0jd^&7^QB65pnvXYS7Ve8HD(2J%YBK+g)buD%PcAR zBCLF|G_utGRQu-`K1E+l?Kd7|7*D~MVvU(X2W2%4(4WK#CAGrIg;}XXZL|cn#)Ayw zDN$QqW4gyAnVFk3VZ|hn$(m_595E5DqQ)Hl3K!+PH*plG8l!ZmF^^(yd6b8tB2fgC zj))g`g_XOO#@#9J?&K2OH6CObk9U_n(Jlt1m)sNGyaT=1u~qtUehA0}%4{(lrV3Z# z{1MBY^Mhi<;69+7S2{R)c<@_JeelSN*U3K-P0oAq#Ln1q@Z+a2P9Gh5Lzv zo%{7-#N;}l+*dldzpcXk8mLGV0i{XtVv?|O-_pn$^zQd9!F}UFhVhiNboWphSDsal zHW{`Tkt}?~)$iMLLIz<-3@E3R4o>w}I5oG*oDu=2s>~UBT(EM=(#Y!aPIWB7DdRzg z@sv1KQifwmRo3~d)&I}l`@qLpRD0vk?k4TFw8;VmqM$4oAPBZwC=#T|rlhdd01Fg| zmtr<;k|vNQOR}LU6xh%z`+9$SZKgQXjEWx-e-W^?RlSc|&A>t{BA`_i z5T#}=D-;;KhS-4Moz;e%h*m-a9zrvIzs8pe&;KSlc;+Q z)D4pmB8HGsUBXt~*C6i5Myv!D9Em`sLDE89=2BgO!7Hum?m7T_)5w;e420TYv%nK~UCju7pkrwqZmlhKkyi$|}4zfjL znwZ-Q4R{DmfyJz{98`9H5hr{`DYo^d@dnqTzuUoe^B5h5W{3_%KnF*4U@mnK7&>fH z9g+v2gV2D7(5Mc(KU-mpq`U1E^zW=x7V`5xWA5eLYTDe(&igL8&+WVq5=8L<$sRGY zkYNbeyx_HXWy*g{U@Cx&dM91{=qia09U5NCZSm zk``{jT$)f|@Jgr&dk(;aLIWN`qb5W^`)9D;XFTu!9%aXd3G0XQ38XfnlRSvZyfMmu z6kZ~OBncsKH&PiSky_=~j8VQBSa2i)l}1Sm<(W(61tu?5K6(Jk3k`XYMwOR%J`3hh zfBb;Oz6X4QLa8u>zNm5qRiuu`dx2*inI*OMwN3z-211 z?*IfA8Y)d1YhOgJ15yWeF_`9KRk}+LXPwAsE~-z zI`b_nxz}%5@ki$Nbx!?McO_?SkEVTQ_+lNH-Y(795E{rGunJLo$~N2uxm71iS~CPS8z+hCE2KFE_C<2P>mha;J+w{1p>> zq$mj_*n(6Z2Ozaubfx#<9iJ;9ErW4dgXuv~gtPg=! zniV{Uz-zp3S&bii^ki*6*bKUnI&3gH5CI*MssnSWgTSb76J>`ENv0FjL1@T>G^)ey zBmIU!;gkM^RA!#^_n3Q$H{x=ii#NInLdK|MkB&FGzd|gweu#x5HzP%WCR#`y8j5*i z9QlWD7)P!pAyf?`r6Uuzj=T{nj5J#iSa2i)B85l`voM!t6BxV_R2@R~FrA>;ga$l> zCfD?sg0+rlT-bnyd=LPS893erMW=291d!K+(! zi5`G1LIWN`lhb9y$c;6}3r~On%7H0i0B|?(-F2! z*E&Ys>|vrV5vX(s5Y=Ta)fE`LBC2lf0jMi9;2|`suGz{+le^u@IJ6r8CIo3w^JPJ3 z7^f2XX(252!?je7pvoa>ZdwqmnHDNhptSG3FdWq(WVbSeRc6 z84vs$xWQN{mPZQ>Ahj(dd61uZV_K-~Po{ga$l>Mq6m?nOzhxR>G+UR60hh4SzIRZJ$Rc@Y9OjK_?yv4K&0R@Cs24!W<|b^L z`!%RK(o}w6!I21vR6$xaH*;w!fx#=SrrLD?rV<+P5E|Ru7*CAa+ce#*zej;x8Su`; zHVzMe%T>8Ob`r&4mi)$mDU~_$^9EbG2H)ayc0Vr@r!BVMukH?kH`}|6%0Vd~QcgRB z?X>d@Y8+`G2Urv$0tWJu7LqZS1`-&&Qj`?Dw}`|O>*YcN9ztV%=|pbV+yO2?M6|Mk zx%6S~4v%U25}jd&4mFx(kwRvI2(BUaW-uJ7R@xLH0{9FGp%!zgmcUSJ6V-uQNv6P0 zq>Bg*cnFPcchDASf!TD`7swgGHEV>M??Q@7q;|=J{LCAp>yC_Z^8pgl@<{3Cgsq!z z1gDYe_5%x!M4-|wq=iV#rMd!xSAuFn-5#bBR99%gLugc8fXx$ayGwQM*+f|&L()h} z(6rr}G0G%N5h9?>1`<+ONin=L1*2|NCVBwM2o0nc8tamG34`(75pVw(+eGa;67{Gg zainY_!nTQ8!E|I3MS(>V5dp2bNlUMh6oWQXXceI_XrfvXYGNKKG^k%__UVzY-$%~a z@?lNz$Y!LdL>xr&ARP0?cx2%B#v^N0#4u8-OW3Nr5S&J;8w3^{i9n?x(n4M4(jx_i zx*@6wb%RVN=#fGL9zv5-cYK!|xBb4kTW1mq10e!PWhOyt6`DInAwRHChzKZDL0SmR zTq-0md8tAb2cVG9kOyg0A%sJAF3G*fq85El1oorgzFuT;$h|CsFrI>;nahx(xCkkE z(1Celnt8!1#wuPCLK6omtwPvZmtC8vq0*gXKK%HHrg}BV6Is${& z5N0W=lVv(Vb%X{ygeKp}pe~p=#y{72aoUE0uc5+`0;i0?L_pvH6_~jcSYRrz0`EEi zfrW-jlST#J{VN<$rp6iy$_Bv}sVo=%^%I0Fn!0t$RKXQAe7m8(4580wTpp3+b6l^9T%Hd=~>adkPJB z2u;pCG1qDx1+6;%35%2e(}Rs1{f#L&yVp^75sN{SSadHRQqF;tQ1YMv^Tu?qkN?_uqeDWd zF@%mzZzOEJF*e2|8I%G?A|O&$2M6Y|LV>}nSxpi-0Fwv}cnD2F^NRW~`@1#o>vx*w zO;ZlkzY8gwm#}T#MPqas02YOafG&fiMLo==E&_vBSak^AG)Y>h%Ur4} zFnCp}x`6{wS7^XPXmaXeT}s#5Pt(o0!!%uja-jYmq-;9Ew&_kCqf0liC`1HwiIW!f zFqgUr3|@ZKrR)H75gPCi8rw5>VZVYEjOv+D)`$9=rQXp!^QJqAMbu0znm2;f_Dsox z0?ZrJyx;nzY2Gjip+*QPo0qU{-Wg*|QVA?L5&@Bdq=m%HrAY(^FRz-!IRKLg4R{Dm zLGz0G`)S_GZ#T^wpd6^b0x6r9ux;MG@cEIGcp0!LL}n>Xa1;wwHP3Hi%P4~(e zbu%ahjzpl+EFh}OT&gQDc~v>E<`|=LDHfg=291d!7D`_&~#gv0-u;W zp8DBpDXGjn*VV8M|Hh}2D5HjktT6PSY6CYlREC7DjpY(j(jg{Hs- zw%9sodh@fV?BLo_$P#9P!L6iTQyAMI{BA%2A7*G^RY2*t0>i$A)BI?;e^ zp)4H`Ei{A_vy#*(d9Ww*#TOsL&L*|c^I!L#8Mu0>l#e+LtXAYH{-=%+v#A4<4Jvl zb@LAHv#2~&HT)c{SxXrsyKj3316W`2xuX7>@&WSfo1R*W1cvP=2wew}sx@}v77wjy zm=ux|@nMNANR4-IHdK%k4ThRoPX*iApLvRon`;XB>QZRk0(c@;c;vJ0Qa^R6sKH2@ zL`0! zdVl7r%fViqxvBKnHOP0I%P&I@$e@Z)?+|6!0DDug1X9|jM^Z>G>1MO@1BZ$VtXn2% zd(yF1DK7^J*T|O0Er-nJ4;R+~z2}2;5-IQ@fcfIbZRZQ#OV{s+zwGK+FJ2lNBrMR7FYqKm`n~An|fGq*xObXoz_nmPoz9+%f_8ahU1?3P6+Oh)KN0=t&kr}AM z)-J>CBDOH@dF;iub{O|;?GRGa+71MurH4@3w6<_A7-xyewf34y0;5}-HVEZgTR_y3 zB_&LiK{~Rv1!G!U3Y*quIWm{D_eokjAmW+vIP-^}F#u36K+B|s|0M`-Hk;-+`Okde zqR_bB=5ar^-GW}BHrgvj`KV1Xm zHi?Uvl=!IdJ)9&gvY_`eZ`Bj$`GiNaio8pt8^q9)0oSXpeth>u!eykR9gfDMPCca3 z0fYmxy416{ov2H(EL@6-x>Q2c!tR`^w}ENj8MANS-*fN~qe8B99LrC4NKm)aoG6}XhXgw*zlRone6fqcd26G8w zwJQ+8nQ#?t-6Qp0fb63}n69H>qh86|P#;{LDJ*1C@L~~6dtv6o<043T(N)uG)m>^; z>Eo;422R6Jgdp8r$CzMM7~mKwXTi+V7h;IdkPS2tat+m@;}-usi{smU&g|6er>c6N zqLNZM=E0N*@dDQq&Am_LgSZHSIK)AVY9K^7^9gWZAQxdE*Nh-(5p70+IU=#2kBsJE zfdn&6G`CShkwsXXAfSs5KNnp4kRI{JUYSUM2X$gPtV9*A1sv>oNKA$yfRn?d1zNo#00!0A!M^QL)XJEwnoA3~2EN(ecg}ODjFEYea`c@uN5Kk$X!8)#V?c*n z9^^oD&)Z7eUV>Ye2;kntqTA#-f7O-%F|b}fmj3z2$=u-SX~G??5n#+(Dd)hUXXdC1 z7Q=FYN+XmE@-4o-Pi#fDllc^Rpz))qk6zl%w6FN^I1s@3Wa<(B=D|>84U--6dF9 zV#pD8msIjTW$vL8P8skXU72|^O7E1OiPjTR?F<#MPEMWV&;*oF;A_329maMtfb5%) zo=!br56MHTGf&pA3wqQ1hU^Bw7xsFas(N=+ZGkqhR*Z4}6ZoAe;uFAgsp7{{#cXH9 zg(DmU&(_I|j%wWRiFuq-M|)oBu|ck1E2ZqVax*B}p$Nl@u+z;-sMj@hb_$a)i$6|g zQeMNnyQi~03G*b|gWu&^wWCZpY}S%Dm$7vc$g4RE!)L*GL#M+c7n=lKr=bpbP&1W? zll)}-ij#8ay$Ic>1|^?_2tXCcB1LHw=ASjN{1^%-00_E~(>b2-qnF&MQ>0&gLnXAS z=Eh$Q*4AszfXkW@(GgqeZ-Q(Ip|U4a`1vaAnqVo*9vaRs&TDmX9xCnoGs%FB=;Ayy zW^q15!7)B(nZkigx>>@>%$e9Cp}(qjIxO5FOl>=G+aio5`x)=mz&1@zePKchW;3wEr-MG^qwZjtq=HdGfv*XTFc)ot5vgD|4Y>i#j>QMJ*h{ioL^R;1@nMNLQsZxk5OB|tmi}n{DhR(4 z&xgMi=2v2i=*GOW2`QW{1=9UE+i*3wPte)0H=~}0#v18nXpN9`{M~nOe~6xvS%g;P zN(Dk-doYOm*M@M<-4To~Uf7;7Du)rfW5eB&xD???Wky28J2W8L6I)QMG+fh*O)0iN zMn>#tM!lKiy=03a7jlI--lF3~LuYrC$?(8lRatr)*D%Iw)N4b>4TQ|@2}bnN+rC+d z7b#o=GPj4$8Z2FXXCBKAsJjZxbPY;S7V16UH+wjA+fT72SGr&aJ8P8sNHZZ#3j+gl z<{`2bmB2fa005lSdZxx;U&5zW`gcRZmoL;^IEss-3js<9jf?gwQv(kh1q#1Q{^6 z12fH`#ub_J^Nqt*;~ldwc6iL@&Iwo~1+u>9E4+wlC2B0`z&&}~m)cq?6i8H`PX(LEzHc(%&>7iS2J8w{G6NjasbXX(k##{sTFn^@uii()RVTPrn z{T9v}G|sE9(%~!)nWLfAA3-y6lOC-X=&EANgfmP3z!~)?2q7iv5^>C+4TA(>InEP^ zhALPBY%17n;Y=80(0FO-_Xc{OKDC&A$zS^E4)irl0XH&%Dg3#Y#+n&@lW@oDW}j6j z;j@EZ2aR>HBcj1BBJbPF<0xC;A~&cFT0)0S@J>>~ZaWEMG3hc18csJpT9L;oV;W!iY@|Vec;x+m|^hX!xUHMQk%S zl53D+ce4w|Nk}gb^%j-akhKhNnal8Ik?OTrRtr8KJXvLoYvSpNQKoFq``A%M35+DM zLoD=!bL<{B<5AOT=}TAPIn!MjA*UcvnvKuL@OciOKj8y+D?`g*utNt%i-K%UXvqNH z=<(SYH8dM)oF+JCo+ZLzJtC=jlz}ODD>kj2s)v2dWi(OU`xN`IKQnXt-eFF#E9olR zbogaJ0oP?vLW9Vd+&g{AZUaho@AO3k`w)eL=Y_pb*Yv)yHG*5NOv_{z$ZY+nF?Lxd z^gXGi4@)Bc7%p`2R&8PFQ16U#KDfG5isAv=H@?eV67*v>kXJZnnv{<(<9|r8ne)AT zrwz(wUi&t9Gr*vg%=5Zh+P0ZZ7oj-8YV@DExTy^GtSmp1UJqrlRA9d{vXVeR86$wj zK(TgV`I&F-aA6KD#)H1v$MwM)W)C#64v!V6qp}*rbE`SgU@^LYuM_6@^ZeORk918l zZD=Fo2ilW8ih?1yL$$%47{(xgK1wF;{O$@Jm(Aq&@OcAuv7WX4X~qLe2Z5{E&V zNd&uDAQIy9N7C^o%$w2*!;$D9yOIoC-BhMl3>oU<+z1Xr-0UWC-}I6W>VPqgjQHwm z=%>*wrf+$Yhk=5i`x`%HwspP2U$dA#&43#?FXfdvf_#i6rudjU3DWVX;M z%@$fe>J0X@mS2FW_5!#ojfqY9(qrSeVZ7VJgiiz6VPM-zT2!0^zGBBEs{^KJn!cM2 z2=un{IH+sjTp@%yTLZ$1<4p~Q{!s64X?-v~6y#5Y`c{^QB>baq_@ys#aH`C_P)xJb zl!vM@%0<;TF);sFcBB}nm1bVAL>ZJ0uuN%n4|ajj<~*}O`E&k)^ARGy4qRaBE8N`r zs&L@}h}AnQL4^2e^=lE;TDpWpDHua6RgOj{sW$ zd5hT15c@AU>%|47H7|zF`bDVp;$MVT{{!a0853F=5-lqC-h8G}K>LhmZ?1P}pDDup zgGoNLZf?28P2SAwc=|vx9`=ZEp8l_n7yoF7w6G#8MrF#8zbrb>n`!xBOPdYz<9p8 zN_Md1F{=!JJS+rezMJqUmrl4n?F#9e8bknza)Ycil)2$>(`0_#OY((InaW+6n{Od4 z_LGjF#Z!!!KR@gn< z{#%?PnSn>uPqTWAeArZ^+St^V-NjYg&2){TRG;eyc45{LqS4S>F>#3Zqqb5zhHi+F2EV&tU`uT1F-z zwQx{&>s(mINdQBg@H7h|L|9mTfpbtL74j{>ulm-wo|OBVld-?W`2+>gkL|+@azdM6 zLd^UCTf15rOt@-y&YG)s(vIkp1p!u2>^fw^>mkk^vFRip!nTnYr4c{qcm+LT=+%A2 zUu$4v(5VoJ_-CRF#VC_eh!184wsOwWAIQZ)sm$9FqlzWy?Px16dBH{kvKh=+7Y7~Y zFEc*o>O1>D>sxz3^_lq_M$#RXG;X=0kfAJ?Tho$m)*Xm#vXj7Qe?aohYMt{s=U#cr zh|~y1?6%7Ej_>7iQ)`&@5P$svwJXI9bW`tfyG}Cf(j?3Tx}r&D}07nYn~x4l!-KRgmiYyu=L{ydfh_X7*(tu?S~;XANZIZ8I65# zYJnwe_|vT6kLsBez3^yI;Y|wHB9$kIlD{U0Xa3st^2isPMKpU*!h{~I!(x}x9!b=; zwx;~d9t@EB)rEDZh1T7GVR9Z0rG2cd1}DFIyfwWz|J4hqcOE+34d|SwkwQ0%5RaiE z#AEEPs9}wH6a+OfkKJw_E%t4bgFD*R0hDLs`jOK4f=GFV`pnY^;v6lLWj@OIY#9g| z#XWmPH&Tvu6|x3KjDts2nVWDll|l$13Q2bWJVZveTR<*WAdh^6$$D9o6K0pAm$5>Q zTQVN`&4a}c%|afY#!&#AkLY*dH;>(W-e>klL>n`O+V>z$Vfj8)6m<_$hJpu`zrx@+ z){ce4FZRb|{OJ)&dKJ7+#`X|}tIhoQZzkx1yYcA5b^hGi06nbR#`-~x=Fi=|QOv*| zsQn<2L#+ae0~5C|OwVP!iw)8tG4hDVC@{4=Mk&jjAUfpiM9XlRf$MND0C&N>vttU% zMfr%fHOddr&0EW(4DruJh<~m|#1i5Mjs9h9jofynePU=AICjCKD{)v_hABCd168}G z<@PhgP3Ox478B3}H@!jUeR zpX+(3+%4F9-xF$dlv;*hI7$T(YuSO~D3`hY0qpk-ljb_H zQ66T>*qJ@E8~ctlIvfhyv|?iQxL#kObD8}t-Tw%2jtsKvVVf<6Z8i`h?8j4ahW%#0 z;=sawjFYnXMej6WzyDps{?)RclMu|y@UhH>{T)V>iG}?>4f`>lNZ5~nFBkV8`ejB9 zHtt6iUM`K#tnQhCke{(>VWi*uxOrZHaDM~r&m~i{hQu;1GQNe^ghGAV)Tj?Ow5JLL zZTmSlT~_ljC}u1Xaq}tnD4}-j8jCV`mg68R;&gZ^O$~cv zA#l?is#rl&KkP*{G-YK7>x&Brdy-q$1fW@57Ovzesrbg)?`ZTnOUKj4jOInc2O*PMlC7nl=o#!Acd&&;YP zpmksIgIAjxWCq6&S^+9QYehN9!(hd{%o~r;O51cmkO=~-vCM-zZG7v06a_dLu%_C~ zzhY>mJ93QI*oU{Yn3*E3lOQ+Ex=?QxDKAdpVU~k+LQ>wu`CRjpd)S7qX(_Cc?#2@f zPRj|Ix^ZaS;>%e4VK69&bfwb1^?C+FBHdtNq{}fF_0KUw@G0Ox2Qx!3d&co=p1_K7A@NB)c>f+iIvw1Z?#pn*9PS@PCS%kT zk#Gmorkf>%%=|NB;!lIjPaXqO*e(ZknuMs54^4L|p3E74C7E*TLs95g)tqdqdk}<= zkt`oGCf+?>yn`E+XcmrOW&acL;@>_%0sb$>i~qOwgXdE4iS7qqS%kuUn1J48KlnGt zo2J;$ez3GB2eSV+;@>NcqU_)}*mJRh(mOCj4k7!$JN~_IocLGvAa!2Z{`;aD4C3sl z*n{yQVLXiGP&N7y0%F7*)xAIFd>YIgbsXDNmI0UwCm0yN>?hI01LMjOfiVJNOz(&= zI4b)ycMCK7;7N-*e3Du|KNUq6)lHR6Ehx;L;Zz)9QMR;oPXZ&Yt77WV{^v{r%ImA z{O$cLpWFGj&j;;(Cc-Y_FlhJ+_Xr+Vs@(G)84m_zJQ$KM#NhV-zx$EzY?Bb|%7w<6 z64VR*d;`*P_aoajn-EL}1bE*D@j?^VXO8=U-H*ISi=_pv^Ekq(IN;3NTW!1+Wij*} z-H&|Z^JDfS(;z_Tjwcd&{))TqCTx>v39?2YD=&s^Dawy}wlLNBYy6$YKOTel>vtqW zUn(pfvEiBt0X4dNl*KorctN-(l_6Y9N~IF6)fR?p*lc0AR>OfIm{|!9oOr`r8PpD4v7P301LSsHYIo8)Q`Lh_bBWWSP#pTnO(_ya2Dx6b|pJm zzHi^Vk{1w9r=)DT-QC>xZ#m)Z;(BtB1J)qBPnMp9ynUVz;c=1PK|HO-ekR7dT4`}z zBFnRBJ|F6n=U-e*f>FpUe6frYe+}Rvra!cL7@bR=6X9`UR|%GG&wj>qV6S;Vh2eAh z%8OA4I8^fSQ}9qRuwA6+aE&g!Kpq8Fa6SwS50)O1pJa4@LC+I}jWCcSNX09uI6O#p zML3JD9`c%1ed)ymW@V4ZmaASxGr@-3jgV~yPP$-G7CV_XgKphJ6a~-zw{up;IRVm! zGx6j2Is|CQvu>Pf?0zzNg)`gziYC%G`zdVLVQN|RgyHd4Xw~bimpiY1J`Ti_z~e9~ zyv=8apsx(Me$HyjLTCM)l^{TwTYmEgxfqfS3tb5}w9q{;A=4+nbo+N*BCS(^vfM5N9H8%fRwcKKP?3&9rfpGgN{(=!rd|vW&Xs^aY2d zZo45#4iTEUmf6^+geVJoG3Cl$bT>}u2F(fGoLu>~lk?B3UxNo>yMyheeu2po4=(Yg zPdbknAE?YcnsYT?IZ?;}E-&ZFr2R2IsyJLRi8F#}i0t7GvT;Qx$n6WEx&MyVgv4FP z8M~sGj^KNbGaLP*}dJ%E%!rA@GNK@#Qbh z7;J!W=&W~2@Ax-LX$oSqsPBlUYXIxyN=?|lcJhu(+0EMKFJnc!^_R%1+Hx`x5EQ#o z+o@ZaZsNJWKO=5-{Jd4dTzy; zEKue2%C~R=?K>cKgP(2=>LDODaJN*#CTtG%**A0fb0lRPdi}Pq%4Oh?{{b0||nA^F+b{6xtmb>v7z65tPa8QOq z@~+5Cxyv*HgvaK3d~V?C(%bf+oN?)hY)kShfyPnud-Q%;ieOyJl=6&$;^oEjiOCBRmGCE^`F20vpiC&K%vtISp@^*zOOli?fG^R%ak3x<{A#gs*9xw+R{k zwF}FSTl3Q%oF|JNxyQl&Q0b|z*x`ETj`{W+A*UNF;9eN%Djvtv1}5^I2Hu$W$*?&n zQj|X1Oy7&JI`|v?*nD{d4FV^WKNuC+J|UI~T0_CM82yH(5>rV`U?n;*Czc#N+=;k* zEmRGM{p@f#y+}k1**6% zpojQmSgFmle#(pm-u&qs9*<%tBr88#m2%GC*bJ$I2dA(bb+DaM+FsL&8o z9UE9$Vo~&A$zS!P7ijifW-s8$Ez8$#*_$5Rv!?tWmehHkCtl)!sdqPRj6e2qt$BPK zT)SB)I6TqWSx1T~zp^QN?BZ|mNj?Uvqbb6reIXh1FiJBDdX$GtLT|kpT)VQoF8Jn? zt}6IBN6>1XZ|#zKpU&x&-n~8kTNh?VIZC<-T^>iOQ09D!S6RAdHTgiuNN9L~avGDE z&DffCQ}N}-o6n&xo6YGT46a#F*uga;)aDFB)fWCvan;sCkXLPkE^>nn(nzfhBo9u+ys9n7 ziw)R1Y6BbsG&aD|$S>b+OyCWzn^XQoQD7!J4Ln=A_Zoes%y}4k41xvciUCP=Rk&&= z9lfBlnDvE?-*Cc6$1^zuCsVR+7#P#)H>~>fJGiTM(8bvUl9F;flobbOUWgX%g74Dq z#y9Az2!59FYYA|2F)fUdK(;l83hN&&~|~A+}%; z_6V@j%H6*eVb~EMwUh+{0h$?IDwrFvVJBP#gIVdP{#9xGg|ae&Fi!mNM<_F*C$?T3 zWsSfH!l^wos$%3E(z z&j91MirrOml3qq%xVlkgoM4UdJUYbQJq}pzJ!cq_-BP>7j|80e;&9s+cdY*V&B4+y zK7ki8$>8b#GrwYT^cGqmR|ZJ@Ct~s*4!wI06Lw!m866P@WJ<&k9>ip8&ljQ)bU}!_ z4iAI+j(A+$o{x30ya@n+ujq4(z}9O4R`ET7Ff5`L4QjoaJG7s}ucbZFbun_&_~@k4 zlR4L|mZRKjK+W&N$$4&aHuInaPAm$`h1uNF%C!up(E1$^?*<=MU*(X9#tl-u5XH-d zb)f~lFE8jlt?CDD$o&DR?EQtr*=#d!X1R)u3QU`781B_D zT$-_x`UB0SC4>>#FyH>vZ0lBpJXJn?8O;anc+fky--)X2dD69BtXVJ|zt!cLoq8PO z&|9VaCLLK0akbi;eLO)?ZFz=0SYa{rc~eN5V8b^{zdwp5A8awcDWG5H1vQBOD#W1u zYwz}v)nWcDD9`CxR&nLdA{rYP* zR0^Nq-kb|3AO^nu=XW_bgK3$4632PWS3)^N za!DnJ)NAwG8YrAOekCR?><(?UZh#k56X%|O( z8GrFg&w|a85GDr<)OzA@o%wxv&iBa2h;2_FnP2mZOTJg$r-QM*oApIU$HN@_uPhEg4Sh#ECs7L5qL|Q{d8U!`O@#Jo-ugH|yYVm$ z-_DT5UYVJ^K6WdElOpU@%G5bG8(McknQgQ^j%nGPZ{W9LhX0Ar6$nX=z=x^*oLX>i z^9s{>z+=6&1;X$lOD*T$Fm8Cp1&)L`j=cl3Bjb65u`~d?BC_)@@k}C<7lSbdmArV* zX62PzqailyC!7o9&C&`+VNB2B{N`*;H7Z)qa(#B`^+M(zp6}`_?x-X=?GKZ7PZs96 zowUR6rP;XUh7xcbgcq4-za(^(JnxBI(-cQ2ooR~9i?U@Wy-@->G-~D^(3vCu)5#U2 zJ~Bi+6yG~sI6Vis-=!xgs@Aj*4cbhDl7P?qTdUD>I{}3HwrOi1+RB`n z6gy?lq@DC=5vpW+zmJ8nwoOWE&bej&{T^fMC{+s5G?kf7!{ce?!S=K+frrY%L-ODT zbd$^y<$+-&*Iu*812SV+;?RQqvT8K@e<;hivg|=x%6o_vm((l`Gd^W0gP@;cm1SPa zHRU{FQI|I5b2slDP7I&G_qPt8@N4;-mcK8{-&f@C@8xes{=O=IUz5LolD}E}t?7GT zFOsUuhEHIcXof)e$_9E?a|!QW;@#1_Ltr`Fd=l^Qn(5(YzRqg*qr409ZZq#L;@yM1 zyP9`+we@f_L-XCAX>@V7he{&uH05QX8RPO20!B*;kygv);lieZpR(H+xc+fUdJ7{&zTYbyffYR1;>^6g5ynp!Fg}|2ac0| z(wQ1~$~hyk*O`-i$C(m#xtyrWRg!SId_IqBa=6G<6fSnTlapND!AY(X-(;8LJH&Np zs>C(Tcc^Q6`f!&!fgfp!9_cD_j&^wlk9M6NY;+xxYI2F*-QGw$?yqxC zj&!&ur90fNV5hq%*yTPX-R1sZVugEZ`UZD#^hURnywUxh@H+R&;RoCm;qSYh>=yS) zsqO9)qd#?@;M?W)WPjluId?!aH&uIyjkheqFWA3yj{_hAvY#})B- ziv7hNZ?f3q_D%Mb#wUA^nBti<&+Hc8BNv;hi3j|35sA?@7-g;Q`P4`k(SRgHL%}{ZD(!0?&F54-9&a^grh* z4nFTG%KprAOyn1y!y~`+cmgkajtu_V;{<=>DNFqhUi*s2oqWYp6!|^$_`PRxJmc{> zdpu5JkH?dK&ErJ==$RhLdL{?{>~WHR_PG3i@f_{^74$=%$%Aiurug=Hra46==p!@H zhYmxEK2~%L(m47|&^>k99JkwhEAsfBz%|HUkI&8SL#F*3@_vrIQ}Ov1w=*=|;}o6d zo_f32Gj&=J_(k|2zo^{pZk`0(47b03il@lS^625x%kT{2hD#k+x6kF9HrdN#E$n^# zq_4rbdR&~M<*F`0?=!f$NF&!8e3KyYr@AD_ThcDVC$0E3%;Z&F5@AC8N_@hthMt3+ zTm}3$BEz?A-}r674=R3{p&r5iCFJ?r3_SxfxvEP7Opn25FFsMlpTkUE1^8oNhlJvB zuE|_gB|hGeer^GtL$q8Mlw^@@^v6y5I#d5Uigqq2Nm~3$+@v}T{&I^iu-`@&>@@h# zNfc*!Lyi{apsX!eB?>_W~bR{6AS2uM0|2yd{5*^8L#V{c7TP zRhNXBi2lI)yA7T%+mq{plC-5?1bkwJ!Jn4L=lHKAf2?kJjpsibfp=~+cnrnnDyV-O z@NvaIlE+7QOZi>`K81ZsUgtBDSAl)^0-sg<*?IYrtXA|#x9-2g(0@#bN7By)KCO68 z+j6P>%K6BpX5J`)(lTLvNaL8*I4(KYj)HO@B9d{&KEd1^u`Po5vO( z&&xl^ThSkQ?>`Lvhx7P;i?0U0Vz0rE*UuYB|4)PenpR)fPuBpyLGcBC9$`_|e?RbL z?-+X8MXrMO*~$79Kc0TC6yV=u=~aL7E1JZJ4QDlQeHFeUm)JS(F0}KhDA!+X%FWN) zIXB+b0H2<0@K5LQIX`R#J~376(P|3qa69nMbc27u%26<0K16z-!T-k67vP@(K76Rb zKb6NP*iO{*HS#~q;C~;|0`sxYH$bBF1VGqBVQU1iE$Z`-@NL|lV><^aEGk-@X? z%4Pg=guND_oG)U^U1IqZ$h#8waJ|9*I*-r!)ke}UG57+%$&J6;fKMv^D=LN^-*}?s zCEx=MhJG`3=LI>@@2X1t7nBSZuP(YnyBy0;^I|-_#+3ilIOWp?<>{AmS^hdxeg}E; zDi~K55#M3(|7Pt}s6X(&ZQ3K^B$%4}9f=27hE8pQGPN{MQZsQLdDE z!OqAQ`d4tXYn#D;R*?8pAb$}a^VL3L@ZZeymwr1JMazNDqzwL=o0Ng^BaGkkN-E}+ z1gc6ZF{fRydh+d)`U*#K(I50ZAH}8>uIsFyYkv~`$^Tq~-7cj@V}2lybA353hQ5L@QfwoVg!O4@-Lc(@$4Fdzc9}~=U?T(@4D9DZ#C59ALT9S ztAX!sHTcU$`5*gP1MuFJ2LC17ellM6Pq+Q-RFu0N<ydvLi zC?Ec+DKAgMwY@7oox5XEXCkuh!p!kRK_*{R90bem>=&#M=gS=(CtOveZ@kiMHI;veL z=QflJ?lpYAKw@46c6af)Pbhw~Z3xgWKta;;UC-%+p?{xk2TZQKC4MFG_yu-eZ(0AtxXxSJVI%OV^#;EU zW0+jF-^S4obp5mwFf5OsRdqGrdufL*P_curJDQK4&SVWY4+u(zikIpBo zXAba{`29s*ms-5oBQe4ri%>4Xjc!~8{VWI;ru~6W?*lLG4}9RehW@%DQsK(!PMvelH^Q_zkw5A^5P<1-FN|9r%hd#}~6VEmaw{G$f{ zpvCL>z>@<8_ zqw7<>M1Pcv@?iw7_h%B@_*LQpH3Ng6^!5Ofv-^f&+_#Bye0i+;4_1U{(9Sv7&k2bdEj^P1D=`I*7Lk*CkCQ)l3jVe>A7-;t-!)jtRLo?jaL==~Jhc_Hu_#lHYpF4!3^WWxaC z|0tLKjo}l{%aN;RBk&2e^CNjVvi8=pE==QimO}hmP1kGsMNKzp`fW|OY5IhwgPQ(Q z(^oXLbp)<9{MTy+>$0NTGRNYE`>p?i5ADOf$?xLxJU)NH=THy@@VN+|Wn_RW9W;C~ zG>y0dvrjvH&KVy*v+}I^#Y-9*o2y7{N<$l-ea8JSY0gq=+QBhHKL7g^iwc+m@#yxXknq5{iCg!zj6n>7$cI`lX#tOM`QLeMd`uTP$Cy?tDSzs06k;rOq?*SUdhuVT7C` zE_Hk7y!K_$`i}a=t&PrQEz6>X$V(IBodrEUxctbfVWTbz0k(2*1lj zNf0$O*44BxsgJd^L-rQ%iPp!Ooz|ANMrTQTYuBGnl$r|M;!KcG-|o*iKWHxwVHK zOKd$(O-n2WtlvfK9hEAZM5TsttXGaq^myG*wIFN6XWf!cbIW3R{Ji$|*2ek*@2RV5TTy^FB^wHOkE9Q`x4_~ZPGf81vV5UD z{|mcXV=Z;Ilr53RhjYzI2U^zYbToE?q|-QTL(3Ahd)xJm=oW<$)rpI8cq8H-~b z!3#|L+3mKF!ZuvEP+{A@KcTQ4FX|Mw?cc00wxHzdP}uTYK8pUPQSj~4(HPq2$&iVD7F>`lO zJACh=`fJfgu54-h@Eqr|6`fZUw0l)YNBs(E)jAnYmb7EQv0@jLo8Q*8tg!<=*idIk zTG|@muFG25>L5~AqqD5OTkqh5ooHlq{ZaIFS4hbm_dU3f2t#JIz_1w%nz z%Y2!4)tAJbCh8fj^=Q6Ef4sl7X8ydog{)MYS_t7hjba*!vGTP$6NtA+GK+sq71doB z^Ef3fWVlw>*4bzRnL?)H+=sCcwKg3GJtix7_sH_;QScZ7&4`bxr~h8VC$8z>1_K8b z_F-{Dxe}W0i*Hu(QKjEkx&7t8YkNz4Yl4-|S&O?`TG6wO)$17iwYJ2{>)YDfK6JX{ zcRu2GqV;Wv5=LJ8=WpZZ2AyB(Ip5VuEYnusYW>J^t*aYZ4nay|$MtzPAC0fa;M0Z? zvOU(!5orScHCmo!_0fGw<2Zhu@clC0_%V@SHtd8sRA7Hgr@y@`=5KHEcht8nZS)6b z&YWwNK{|2!jBgQ{4C@du{g#yu7hqI{OS+v+$)aWc~au&5Yi;xp@ z7G3Ww>J9|(r+~-A<%@DSG0nyKh@!AM`NKM4S1uh)5RG}+2Fn@@FGl$5)Fa}JVFE`0 zg=wEupLDMJmM&e({Eq)dXECNY1S?lLGiN$yqev&FFjUo{ zGgXCivL7;Vnz_ok+8FVK>t~&Cy2jc_}j0C?Yr7$`mbzhh&4;Mh;}qC zY3XDyjVyhcd0=WE_FFen=@g~QAj-SIL?yj2Zoa0pFMy?U&ckFazMlq}!{2Wh3V(CzhKj<%% zX#f7StZ~^ad~_n-fBBa7SuO3RG$xY?mG6qR*ol7s<)Ilz$XQ*nrb_vvk{PWq#B-bC zBbbSyZ%YH3-xykz-amikFiTcOSnoun?vG#f_*)MWFgk3)86#lUn7Oe12E=}s% z8kfof<|F>g)zuVZ+T2h~TplIv9HA~3$fN7CqDY#zM{6tOX%%<(N9#K~%@C~d5v z!-Ct~Cd2;g?`Ujl#iWOQTuDv6*s;KJx^QDo6`D9d_A_mq3I|bvtkC_|E;gM2KiyBp z!-;zAztzPWmqpt<>N{4LDWD$f7l{8x>)P=bvVu+ z!x1xl>Fkn@{<9Lnh83+1b@&4I;=0B7js(8A6(4*;zv}Huz|I{$P%bgY&Js>X8KKs8 z9Q_602hiA!18umkz`YzE!+ikvI30`=(f}#};F#)?=n6tX11-bpV1gk7;_N=5Fd#Wy zjr&@2FNdoEMgW@Q*A$AEtIjEQJatalvU+@@^KsA8rPr4`Kl3>5Wz7((aYEkX-#!4 zjX0OL%H4EYv$_4W8ytSYGVvGrH;KQFn83m2Zy-3A4~&&Kgth!`X>(-4Hh$pf&}^}ry)T0v#z)&F*)r{;}@O! zUD@gVB}sS6oAM@0)3XxO!>LLA#i_~3NvUI#E>Qdfr3Z`Cr^Ve+#~Xl%fw&75L9Zef zfGFU6YV2(JL!&3N*$G*l=bu%XN&sXR5utLbfw*ct^iDtLiK64KN^jLZ?-t; z?)PLT#eqyrLV@^{VA7TH1k;{)G3@OQ2jY_kJ<+%;?Fs~OC>|gCKZsUI6sO<`a&1iE zJE=~Q)9^Ci2VLZBsBk%DNXu?_;l1=lPSF=!&RnE{`%OCM0hbd7Jm;$}X9LpKubXt^ zb1r8M;IbE7&h1FIb-0~Yqzk|87XIO9OuF+BkMJ9KuSruEc$_&XxASR_)Iac_9;rWj zT#*w*{txlxz7l-+zIr6iZxv4W8ThXXJ9inFZ_j6Wyfa?PAEB`QKH`ZA+wUWusj&Ti zV@P59J;YBaY`@c z{GGzS`;0zQ@Wp8AmsI#Tg#({A__GvtHX8U6g(C{LDI8b$(+X!5#%tV#e;h9~qZxl_ z;V&BaMTOG}ziRPcGI+kfk@BS!K2hOh(%|vh7{Les)xb+^d4+GW@Rtofsc=@|?<(xv zZ}2}=*r)KH6izBUwb;}b_=+h%N8#wd8+ehzX@yrP9N%Q{_bMFxs)4_za8luv!dZo1 zR5-oGl>ei`frkz3;DrdZPjst+k5JgR&A_K998vgOg$EVBO5tqEly6r!vE9J8DxBV7 z;JX!$?ldspL(BTJ3O}uI@IMUx*OvZe1OM6LUpMfS$%a0WHSkFaXFuQ)f2mg3Inlt2 z6z<2kf@+<1g$EU0Vd)iKt#I^%ru^-e{uBe>ZQ)Z5{AGnBA2RT_6?SGCc!$CPg$ET5 zEBp(EqY7sg?pL@3FVZN1;7PnNiSmC?;V53bMYu{~KVD2txYpt;4cxA95HC0<{sx7! z3MUj!%r*G0D(pYUz>g@LRQN{<4=VgCh2vGG{HqE_@FH;5H>7ajJOdX`QGGDJ6Muxl z{yPkOqQd>3F>s~AzPk+kF@>}14P2{m@@@mSD;)lufp1bch17fuFbZKQb`iwafPMKX2f_DI8UJ629L+d_U$X^7kto z`K5vRO;e%A3!#a>Sm7Wh9>NiYoi_~3?@O?JQsH$9hyP~q_bD9cbPN606z-21m_K_& z`uK7KKcjFuVc=g__%jCnPldyuHSp_}Ug1f2F%0=7K48~A*M{Rp2~{%VB> z|8C$eg`>j;{;Z|Pi~d;t-xYSI8F)b9e*9Jn@xN8rceH`uQaGXT^yx<4@G%B|g2IFE zH}E`#11A{xlM1I!HgK1PKWN~)6po*2;0G0UK4jpX3P)!eIIVD6;eRMRILqKm@Zv1C zhZ8XHaSBHio}+L=;gG_C*{1x}3a1rbu5kD?ga53;(K8JEHHG^Xeq7<;hYkK!h0_YZ zt#J5EgP)2Qfrz{z1J6-7T4Uh(3TG9*LgClAi&8~jZQ2NmYJkNn~ae@Edk0zvYBR^k3V z27beqf6c&09cJkJ6+Tnp=pPOK5{p;(T8saa!GFr)UpMgm3j5wL@RJG$6n;tJq{465 z^7tJf%6s(TMxMl*20quqZyC5j;rQDIzD42WKMeeNg~R_e@b?u?VeLZxFIpIz2ZaBr zZ~{wq!pF}r^(TuBJXhi9Bm*zDc!h6Q*nfz@Kd5j-;T;M)(+vJqg;NO3S>K^YnEIR& z1Aj!}bg6+qsc_^l1K+D~R^dk#PR%g*pIP`Q1Mg8d@g4&odZgC(UIU-5a9rUl6pkEi z@M{%LDEz3xg9`syVdofA{zSYGk^UG^_+J!`D13*)NriVPJgD%S3OnyJ{61J__yraI zq{2~!?@~Ca@PNW;h5xCr@BN0~Y41^f3NKYSuJA^M`xX9)!dZnUy;t=+*6=%9;fTUf zg_8<@(Uw2nlz&R$=m!k^7GcB;(V&43IoiN+g^yHtjl#z%oKX05g$ESAK;a>UuTr=I z3qAVVbqZH1e4D~yg*RAuo+ZnW(Aj&@jbTuW`qBn!V!hBOc!}mO8+f| zeYj!$PbwT&{0j;v9y0hpDBS;D1HYkgRPn0nBG1+@Ip3P%;jvQ_YdD&K5@ zF{$Fht-~L1EJgpZ??0_k*uDq#GAZvkY3yUMJl_Lu{*!~_w2XqU8wGcdf^QxLuNeie z8wF#THln_bqhKt%M&SAWZ1dm9_nlGj)=@B)*<4yXv+&_NglQkXgZgxQ=HPP%K3EDn zXX1k^h-I*IAT)lbuCA_p^yWSDWUGI+pyl?o{O##-YxnnAc=YoCQ1Hh)1ZrOV`x3V3N-S+|r8}fv5Tl$4Sen%g_TGx{-;eR!mgjm!fh^QcH464}Q?Oy$84 zZ}>>aJPhJrc?_fvfW|zrg7mp|;J4lJk_Eit*FK_|iKkt7Q4`*sNPCvcdn?)(U$dl+ z@7e7{F}y}*<`UF__g2)6e0>@;8<|0`81aHN`o@S1HuZ=MdclZ{Ge&28cyz{@qcbW; zXPh-UWA<24A*(*5nhDd7ct(Zy4Cdc|nk$tvU7fsqc$|E`d7*%-y!TR!jhA8O^X;1> zTHBZMZ7WoMEK()NBkJVU7*?_moqi@PY2~*ZbMJ1bW<@yIquC2f^A$4I17$Qv5!%Cy@ zBaf+T#-L_RItJO=J_3(Hpzemoj)I=7uYtj9Xxj2@Y-X$-kFnX)^C-N&%RDpA)mb+- z%e+aAB?^37-kCRspUIUs+~hc#JbiiQxLn5L+=bT(k7Cg>Hj9tl(Sz`QG4m$PQ519n zypV64+wIe#URX2o6{9oFcs(Y&@YQu=i3;AN25ZjDzXOf0n9&Y7Cf{LEb8dil z+A6q{$NkKb;{v>qcbd!Fya?sl3kw19su#ZOD~Fb22ZZD-0&n05jrGe+4>!K<=xbGH zn%Cjgb(vT5;SEN7P3u0fe3{WGO1vYF?~%=AtN$p&(b>7u@?uoHq8I$+7RFd|t&x!M z*j&6XwH+N_5q1BkvuoRJ8waBOn7&E~B{{a){vnhP(Z(Qt-x4}tfDAinqSy8*+MCgfi~+$R}a0 z{cCRk=?uhagkQuoih97)dLS#_(=H@{qXPv)DWGDJ*m^*`-5Uy#B1MCIg@f7;TVn7k znLN`^xD%MFq^55RSal{`$YRuR{V1oPZ|OD$g2;~eQAr>|77Kwek_y1>O%RE?X?8b*-Uy}cRdnH19 z^c;fN)!EVj4gu`y3~P?^Lgi5j!x8EJ69L;2`M|~7kI%&98Zp!;K7-yiF%5*cDOw0TBcj(SP#yabmcH#+DJE&-r@52_u}IRlR}+Dfrq5q`u#Voe z4Kn*&Jb0b@cx35c4Y`EcMFFIUctwU@&;?zRYsH?~v0~9D^+6yBr{;JsNk?cV!sYsy z0>T(rQgEmUeo6;e%SjU*ge)kif)LW2i9pQY)HeilS{W&Y;W$HxX}paDwX|kBDcqFI ziKQTYbN}RUA@WU>zuuM9OB<+{!e zYKxJ=&Y7_wbL*@%73aMa>aj@?XO~U9TX)9JhBcz?_3Ct_g8seRR&L$&MsI#>Yl*S3 z+j6F8rCS-p&Z0(EZqouGH;vvt&`s;iQ#g@4DYCzV zTV>@@s=n%AFpVY^=5awzVhwhSE{Mg@5mNc7NT{`bmd>2)>hP6cs>6W0 zREJ?}sSel4r8VXu)uzz&7@^QhE+NL1gb|)lLgG&vT4W((B Date: Mon, 18 Apr 2022 01:00:19 +0100 Subject: [PATCH 051/245] Added initial Netpbm image format support --- core/image/common.odin | 46 +++ core/image/netpbm/doc.odin | 32 ++ core/image/netpbm/helpers.odin | 26 ++ core/image/netpbm/netpbm.odin | 681 +++++++++++++++++++++++++++++++++ 4 files changed, 785 insertions(+) create mode 100644 core/image/netpbm/doc.odin create mode 100644 core/image/netpbm/helpers.odin create mode 100644 core/image/netpbm/netpbm.odin diff --git a/core/image/common.odin b/core/image/common.odin index 2e7bca17e..bf93e9313 100644 --- a/core/image/common.odin +++ b/core/image/common.odin @@ -57,6 +57,7 @@ Image :: struct { } Image_Metadata :: union { + ^Netpbm_Info, ^PNG_Info, ^QOI_Info, } @@ -152,6 +153,7 @@ Options :: distinct bit_set[Option] Error :: union #shared_nil { General_Image_Error, + Netpbm_Error, PNG_Error, QOI_Error, @@ -171,6 +173,50 @@ General_Image_Error :: enum { Invalid_Output, } +/* + Netpbm-specific definitions +*/ +Netpbm_Format :: enum { + P1, P2, P3, P4, P5, P6, P7, Pf, PF, +} + +Netpbm_Header :: struct { + format: Netpbm_Format, + width: int, + height: int, + channels: int, + depth: int, + maxval: int, + tupltype: string, + scale: f32, + little_endian: bool, +} + +Netpbm_Info :: struct { + header: Netpbm_Header, +} + +Netpbm_Error :: enum { + None = 0, + + // reading + File_Not_Readable, + Invalid_Signature, + Invalid_Header_Token_Character, + Incomplete_Header, + Invalid_Header_Value, + Duplicate_Header_Field, + Buffer_Too_Small, + Invalid_Buffer_ASCII_Token, + Invalid_Buffer_Value, + + // writing + File_Not_Writable, + Invalid_Format, + Invalid_Number_Of_Channels, + Invalid_Image_Depth, +} + /* PNG-specific definitions */ diff --git a/core/image/netpbm/doc.odin b/core/image/netpbm/doc.odin new file mode 100644 index 000000000..baeb99968 --- /dev/null +++ b/core/image/netpbm/doc.odin @@ -0,0 +1,32 @@ +/* +Formats: + PBM (P1, P4): Portable Bit Map, stores black and white images (1 channel) + PGM (P2, P5): Portable Gray Map, stores greyscale images (1 channel, 1 or 2 bytes per value) + PPM (P3, P6): Portable Pixel Map, stores colour images (3 channel, 1 or 2 bytes per value) + PAM (P7 ): Portable Arbitrary Map, stores arbitrary channel images (1 or 2 bytes per value) + PFM (Pf, PF): Portable Float Map, stores floating-point images (Pf: 1 channel, PF: 3 channel) + +Reading + All formats fill out header fields `format`, `width`, `height`, `channels`, `depth` + Specific formats use more fields + PGM, PPM, and PAM set `maxval` + PAM also sets `tupltype`, and is able to set `channels` to an arbitrary value + PFM sets `scale` and `little_endian` + Currently doesn't support reading multiple images from one binary-format file + +Writing + All formats require the header field `format` to be specified + Additional header fields are required for specific formats + PGM, PPM, and PAM require `maxval` + PAM also uses `tupltype`, though it may be left as default (empty or nil string) + PFM requires `scale` and `little_endian`, though the latter may be left untouched (default is false) + +Some syntax differences from the specifications: + `channels` stores what the PAM specification calls `depth` + `depth` instead stores how many bytes will fit `maxval` (should only be 1, 2, or 4) + `scale` and `little_endian` are separated, so the `header` will always store a positive `scale` + `little_endian` will only be true for a negative `scale` PFM, every other format will be false + `little_endian` only describes the netpbm data being read/written, the image buffer will be native +*/ + +package netpbm diff --git a/core/image/netpbm/helpers.odin b/core/image/netpbm/helpers.odin new file mode 100644 index 000000000..5a3000a87 --- /dev/null +++ b/core/image/netpbm/helpers.odin @@ -0,0 +1,26 @@ +package netpbm + +import "core:bytes" +import "core:image" + +destroy :: proc(img: ^image.Image) -> bool { + if img == nil do return false + + //! TEMP CAST + info, ok := img.metadata.(^image.Netpbm_Info) + if !ok do return false + + bytes.buffer_destroy(&img.pixels) + header_destroy(&info.header) + free(info) + img.metadata = nil + + return true +} + +header_destroy :: proc(using header: ^Header) { + if format == .P7 && tupltype != "" { + delete(tupltype) + tupltype = "" + } +} diff --git a/core/image/netpbm/netpbm.odin b/core/image/netpbm/netpbm.odin new file mode 100644 index 000000000..fa8ffc1db --- /dev/null +++ b/core/image/netpbm/netpbm.odin @@ -0,0 +1,681 @@ +package netpbm + +import "core:bytes" +import "core:fmt" +import "core:image" +import "core:mem" +import "core:os" +import "core:strconv" +import "core:strings" +import "core:unicode" + + + +Image :: image.Image +Format :: image.Netpbm_Format +Header :: image.Netpbm_Header +Info :: image.Netpbm_Info +Error :: image.Error +Format_Error :: image.Netpbm_Error + + + +Formats :: bit_set[Format] +PBM :: Formats{.P1, .P4} +PGM :: Formats{.P2, .P5} +PPM :: Formats{.P3, .P6} +PNM :: PBM + PGM + PPM +PAM :: Formats{.P7} +PFM :: Formats{.Pf, .PF} +ASCII :: Formats{.P1, .P2, .P3} +BINARY :: Formats{.P4, .P5, .P6} + PAM + PFM + + + +read :: proc { + read_from_file, + read_from_buffer, +} + +read_from_file :: proc(filename: string, allocator := context.allocator) -> (img: Image, err: Error) { + context.allocator = allocator + + data, ok := os.read_entire_file(filename); defer delete(data) + if !ok { + err = .File_Not_Readable + return + } + + return read_from_buffer(data) +} + +read_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: Image, err: Error) { + context.allocator = allocator + + header: Header; defer header_destroy(&header) + header_size: int + header, header_size = parse_header(data) or_return + + img_data := data[header_size:] + img = decode_image(header, img_data) or_return + + info := new(Info) + info.header = header + if header.format == .P7 && header.tupltype != "" { + info.header.tupltype = strings.clone(header.tupltype) + } + img.metadata = info + + err = Format_Error.None + return +} + + + +write :: proc { + write_to_file, + write_to_buffer, +} + +write_to_file :: proc(filename: string, img: Image, allocator := context.allocator) -> (err: Error) { + context.allocator = allocator + + data: []byte; defer delete(data) + data = write_to_buffer(img) or_return + + if ok := os.write_entire_file(filename, data); !ok { + return .File_Not_Writable + } + + return Format_Error.None +} + +write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: []byte, err: Error) { + context.allocator = allocator + + info, ok := img.metadata.(^image.Netpbm_Info) + if !ok { + err = image.General_Image_Error.Invalid_Input_Image + return + } + // using info so we can just talk about the header + using info + + //? validation + if header.format in (PBM + PGM + Formats{.Pf}) && img.channels != 1 \ + || header.format in (PPM + Formats{.PF}) && img.channels != 3 { + err = Format_Error.Invalid_Number_Of_Channels + return + } + + if header.format in (PNM + PAM) { + if header.maxval <= int(max(u8)) && img.depth != 1 \ + || header.maxval > int(max(u8)) && header.maxval <= int(max(u16)) && img.depth != 2 { + err = Format_Error.Invalid_Image_Depth + return + } + } else if header.format in PFM && img.depth != 4 { + err = Format_Error.Invalid_Image_Depth + return + } + + // we will write to a string builder + data: strings.Builder + strings.init_builder(&data) + + // all PNM headers start with the format + fmt.sbprintf(&data, "%s\n", header.format) + if header.format in PNM { + fmt.sbprintf(&data, "%i %i\n", img.width, img.height) + if header.format not_in PBM { + fmt.sbprintf(&data, "%i\n", header.maxval) + } + } else if header.format in PAM { + fmt.sbprintf(&data, "WIDTH %i\nHEIGHT %i\nMAXVAL %i\nDEPTH %i\nTUPLTYPE %s\nENDHDR\n", + img.width, img.height, header.maxval, img.channels, header.tupltype) + } else if header.format in PFM { + scale := -header.scale if header.little_endian else header.scale + fmt.sbprintf(&data, "%i %i\n%f\n", img.width, img.height, scale) + } + + switch header.format { + // Compressed binary + case .P4: + header_buf := data.buf[:] + pixels := img.pixels.buf[:] + + p4_buffer_size := (img.width / 8 + 1) * img.height + reserve(&data.buf, len(header_buf) + p4_buffer_size) + + // we build up a byte value until it is completely filled + // or we reach the end the row + for y in 0 ..< img.height { + b: byte + + for x in 0 ..< img.width { + i := y * img.width + x + bit := byte(7 - (x % 8)) + v : byte = 0 if pixels[i] == 0 else 1 + b |= (v << bit) + + if bit == 0 { + append(&data.buf, b) + b = 0 + } + } + + if b != 0 { + append(&data.buf, b) + b = 0 + } + } + + // Simple binary + case .P5, .P6, .P7, .Pf, .PF: + header_buf := data.buf[:] + pixels := img.pixels.buf[:] + + resize(&data.buf, len(header_buf) + len(pixels)) + mem.copy(raw_data(data.buf[len(header_buf):]), raw_data(pixels), len(pixels)) + + // convert from native endianness + if img.depth == 2 { + pixels := mem.slice_data_cast([]u16be, data.buf[len(header_buf):]) + for p in &pixels { + p = u16be(transmute(u16) p) + } + } else if header.format in PFM { + if header.little_endian { + pixels := mem.slice_data_cast([]f32le, data.buf[len(header_buf):]) + for p in &pixels { + p = f32le(transmute(f32) p) + } + } else { + pixels := mem.slice_data_cast([]f32be, data.buf[len(header_buf):]) + for p in &pixels { + p = f32be(transmute(f32) p) + } + } + } + + // If-it-looks-like-a-bitmap ASCII + case .P1: + pixels := img.pixels.buf[:] + for y in 0 ..< img.height { + for x in 0 ..< img.width { + i := y * img.width + x + append(&data.buf, '0' if pixels[i] == 0 else '1') + } + append(&data.buf, '\n') + } + + // Token ASCII + case .P2, .P3: + switch img.depth { + case 1: + pixels := img.pixels.buf[:] + for y in 0 ..< img.height { + for x in 0 ..< img.width { + i := y * img.width + x + for c in 0 ..< img.channels { + i := i * img.channels + c + fmt.sbprintf(&data, "%i ", pixels[i]) + } + fmt.sbprint(&data, "\n") + } + fmt.sbprint(&data, "\n") + } + + case 2: + pixels := mem.slice_data_cast([]u16, img.pixels.buf[:]) + for y in 0 ..< img.height { + for x in 0 ..< img.width { + i := y * img.width + x + for c in 0 ..< img.channels { + i := i * img.channels + c + fmt.sbprintf(&data, "%i ", pixels[i]) + } + fmt.sbprint(&data, "\n") + } + fmt.sbprint(&data, "\n") + } + + case: + return data.buf[:], Format_Error.Invalid_Image_Depth + } + + case: + return data.buf[:], Format_Error.Invalid_Format + } + + return data.buf[:], Format_Error.None +} + + + +parse_header :: proc(data: []byte, allocator := context.allocator) -> (header: Header, length: int, err: Error) { + context.allocator = allocator + + // we need the signature and a space + if len(data) < 3 { + err = Format_Error.Incomplete_Header + return + } + + if data[0] == 'P' { + switch data[1] { + case '1' ..= '6': + return _parse_header_pnm(data) + case '7': + return _parse_header_pam(data, allocator) + case 'F', 'f': + return _parse_header_pfm(data) + } + } + + err = Format_Error.Invalid_Signature + return +} + +@(private) +_parse_header_pnm :: proc(data: []byte) -> (header: Header, length: int, err: Error) { + SIG_LENGTH :: 2 + + { + header_formats := []Format{.P1, .P2, .P3, .P4, .P5, .P6} + header.format = header_formats[data[1] - '0' - 1] + } + + // have a list of fielda for easy iteration + header_fields: []^int + if header.format in PBM { + header_fields = {&header.width, &header.height} + header.maxval = 1 // we know maxval for a bitmap + } else { + header_fields = {&header.width, &header.height, &header.maxval} + } + + // we're keeping track of the header byte length + length = SIG_LENGTH + + // loop state + in_comment := false + already_in_space := true + current_field := 0 + current_value := header_fields[0] + + parse_loop: for d, i in data[SIG_LENGTH:] { + length += 1 + + // handle comments + if in_comment { + switch d { + // comments only go up to next carriage return or line feed + case '\r', '\n': + in_comment = false + } + continue + } else if d == '#' { + in_comment = true + continue + } + + // handle whitespace + in_space := unicode.is_white_space(rune(d)) + if in_space { + if already_in_space { + continue + } + already_in_space = true + + // switch to next value + current_field += 1 + if current_field == len(header_fields) { + // header byte length is 1-index so we'll increment again + length += 1 + break parse_loop + } + current_value = header_fields[current_field] + } else { + already_in_space = false + + if !unicode.is_digit(rune(d)) { + err = Format_Error.Invalid_Header_Token_Character + return + } + + val := int(d - '0') + current_value^ = current_value^ * 10 + val + } + } + + // set extra info + header.channels = 3 if header.format in PPM else 1 + header.depth = 2 if header.maxval > int(max(u8)) else 1 + + // limit checking + if current_field < len(header_fields) { + err = Format_Error.Incomplete_Header + return + } + + if header.width < 1 \ + || header.height < 1 \ + || header.maxval < 1 || header.maxval > int(max(u16)) { + err = Format_Error.Invalid_Header_Value + return + } + + err = Format_Error.None + return +} + +@(private) +_parse_header_pam :: proc(data: []byte, allocator := context.allocator) -> (header: Header, length: int, err: Error) { + context.allocator = allocator + + // the spec needs the newline apparently + if string(data[0:3]) != "P7\n" { + err = Format_Error.Invalid_Signature + return + } + header.format = .P7 + + SIGNATURE_LENGTH :: 3 + HEADER_END :: "ENDHDR\n" + + // we can already work out the size of the header + header_end_index := strings.index(string(data), HEADER_END) + if header_end_index == -1 { + err = Format_Error.Incomplete_Header + return + } + length = header_end_index + len(HEADER_END) + + // string buffer for the tupltype + tupltype: strings.Builder + strings.init_builder(&tupltype, context.temp_allocator); defer strings.destroy_builder(&tupltype) + fmt.sbprint(&tupltype, "") + + // PAM uses actual lines, so we can iterate easily + line_iterator := string(data[SIGNATURE_LENGTH : header_end_index]) + parse_loop: for line in strings.split_lines_iterator(&line_iterator) { + line := line + + if len(line) == 0 || line[0] == '#' { + continue + } + + field, ok := strings.fields_iterator(&line) + value := strings.trim_space(line) + + // the field will change, but the logic stays the same + current_field: ^int + + switch field { + case "WIDTH": current_field = &header.width + case "HEIGHT": current_field = &header.height + case "DEPTH": current_field = &header.channels + case "MAXVAL": current_field = &header.maxval + + case "TUPLTYPE": + if len(value) == 0 { + err = Format_Error.Invalid_Header_Value + return + } + + if len(tupltype.buf) == 0 { + fmt.sbprint(&tupltype, value) + } else { + fmt.sbprint(&tupltype, "", value) + } + + continue + + case: + continue + } + + if current_field^ != 0 { + err = Format_Error.Duplicate_Header_Field + return + } + current_field^, ok = strconv.parse_int(value) + if !ok { + err = Format_Error.Invalid_Header_Value + return + } + } + + // extra info + header.depth = 2 if header.maxval > int(max(u8)) else 1 + + // limit checking + if header.width < 1 \ + || header.height < 1 \ + || header.depth < 1 \ + || header.maxval < 1 \ + || header.maxval > int(max(u16)) { + err = Format_Error.Invalid_Header_Value + return + } + + header.tupltype = strings.clone(strings.to_string(tupltype)) + err = Format_Error.None + return +} + +@(private) +_parse_header_pfm :: proc(data: []byte) -> (header: Header, length: int, err: Error) { + // we can just cycle through tokens for PFM + field_iterator := string(data) + field, ok := strings.fields_iterator(&field_iterator) + + switch field { + case "Pf": + header.format = .Pf + header.channels = 1 + case "PF": + header.format = .PF + header.channels = 3 + case: + err = Format_Error.Invalid_Signature + return + } + + // floating point + header.depth = 4 + + // width + field, ok = strings.fields_iterator(&field_iterator) + if !ok { + err = Format_Error.Incomplete_Header + return + } + header.width, ok = strconv.parse_int(field) + if !ok { + err = Format_Error.Invalid_Header_Value + return + } + + // height + field, ok = strings.fields_iterator(&field_iterator) + if !ok { + err = Format_Error.Incomplete_Header + return + } + header.height, ok = strconv.parse_int(field) + if !ok { + err = Format_Error.Invalid_Header_Value + return + } + + // scale (sign is endianness) + field, ok = strings.fields_iterator(&field_iterator) + if !ok { + err = Format_Error.Incomplete_Header + return + } + header.scale, ok = strconv.parse_f32(field) + if !ok { + err = Format_Error.Invalid_Header_Value + return + } + + if header.scale < 0.0 { + header.little_endian = true + header.scale = -header.scale + } + + // pointer math to get header size + length = int((uintptr(raw_data(field_iterator)) + 1) - uintptr(raw_data(data))) + + // limit checking + if header.width < 1 \ + || header.height < 1 \ + || header.scale == 0.0 { + err = Format_Error.Invalid_Header_Value + return + } + + err = Format_Error.None + return +} + + + +decode_image :: proc(header: Header, data: []byte, allocator := context.allocator) -> (img: Image, err: Error) { + context.allocator = allocator + + img = Image { + width = header.width, + height = header.height, + channels = header.channels, + depth = header.depth, + } + + buffer_size := img.width * img.height * img.channels * img.depth + + // we can check data size for binary formats + if header.format in BINARY { + if header.format == .P4 { + p4_size := (img.width / 8 + 1) * img.height + if len(data) < p4_size { + err = Format_Error.Buffer_Too_Small + return + } + } else { + if len(data) < buffer_size { + err = Format_Error.Buffer_Too_Small + return + } + } + } + + // for ASCII and P4, we use length for the termination condition, so start at 0 + // BINARY will be a simple memcopy so the buffer length should also be initialised + if header.format in ASCII || header.format == .P4 { + bytes.buffer_init_allocator(&img.pixels, 0, buffer_size) + } else { + bytes.buffer_init_allocator(&img.pixels, buffer_size, buffer_size) + } + + switch header.format { + // Compressed binary + case .P4: + for d in data { + for b in 1 ..= 8 { + bit := byte(8 - b) + pix := (d >> bit) & 1 + bytes.buffer_write_byte(&img.pixels, pix) + if len(img.pixels.buf) % img.width == 0 { + break + } + } + + if len(img.pixels.buf) == cap(img.pixels.buf) { + break + } + } + + // Simple binary + case .P5, .P6, .P7, .Pf, .PF: + mem.copy(raw_data(img.pixels.buf), raw_data(data), buffer_size) + + // convert to native endianness + if header.format in PFM { + pixels := mem.slice_data_cast([]f32, img.pixels.buf[:]) + if header.little_endian { + for p in &pixels { + p = f32(transmute(f32le) p) + } + } else { + for p in &pixels { + p = f32(transmute(f32be) p) + } + } + } else { + if img.depth == 2 { + pixels := mem.slice_data_cast([]u16, img.pixels.buf[:]) + for p in &pixels { + p = u16(transmute(u16be) p) + } + } + } + + // If-it-looks-like-a-bitmap ASCII + case .P1: + for c in data { + switch c { + case '0', '1': + bytes.buffer_write_byte(&img.pixels, c - '0') + } + + if len(img.pixels.buf) == cap(img.pixels.buf) { + break + } + } + + if len(img.pixels.buf) < cap(img.pixels.buf) { + err = Format_Error.Buffer_Too_Small + return + } + + // Token ASCII + case .P2, .P3: + field_iterator := string(data) + for field in strings.fields_iterator(&field_iterator) { + value, ok := strconv.parse_int(field) + if !ok { + err = Format_Error.Invalid_Buffer_ASCII_Token + return + } + + //? do we want to enforce the maxval, the limit, or neither + if value > int(max(u16)) /*header.maxval*/ { + err = Format_Error.Invalid_Buffer_Value + return + } + + switch img.depth { + case 1: + bytes.buffer_write_byte(&img.pixels, u8(value)) + case 2: + vb := transmute([2]u8) u16(value) + bytes.buffer_write(&img.pixels, vb[:]) + } + + if len(img.pixels.buf) == cap(img.pixels.buf) { + break + } + } + + if len(img.pixels.buf) < cap(img.pixels.buf) { + err = Format_Error.Buffer_Too_Small + return + } + } + + err = Format_Error.None + return +} From b6abd691f487d4583df65e7127d05b3feaf9f181 Mon Sep 17 00:00:00 2001 From: WalterPlinge <22519813+WalterPlinge@users.noreply.github.com> Date: Mon, 18 Apr 2022 20:42:50 +0100 Subject: [PATCH 052/245] Image: Fix implicit enum error --- core/image/common.odin | 3 +-- core/image/netpbm/netpbm.odin | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/image/common.odin b/core/image/common.odin index bf93e9313..0ebeb5b72 100644 --- a/core/image/common.odin +++ b/core/image/common.odin @@ -167,6 +167,7 @@ Error :: union #shared_nil { General_Image_Error :: enum { None = 0, Invalid_Image_Dimensions, + Invalid_Number_Of_Channels, Image_Dimensions_Too_Large, Image_Does_Not_Adhere_to_Spec, Invalid_Input_Image, @@ -213,7 +214,6 @@ Netpbm_Error :: enum { // writing File_Not_Writable, Invalid_Format, - Invalid_Number_Of_Channels, Invalid_Image_Depth, } @@ -339,7 +339,6 @@ PNG_Interlace_Method :: enum u8 { QOI_Error :: enum { None = 0, Invalid_QOI_Signature, - Invalid_Number_Of_Channels, // QOI allows 3 or 4 channel data. Invalid_Bit_Depth, // QOI supports only 8-bit images, error only returned from writer. Invalid_Color_Space, // QOI allows 0 = sRGB or 1 = linear. Corrupt, // More data than pixels to decode into, for example. diff --git a/core/image/netpbm/netpbm.odin b/core/image/netpbm/netpbm.odin index fa8ffc1db..5c082e384 100644 --- a/core/image/netpbm/netpbm.odin +++ b/core/image/netpbm/netpbm.odin @@ -104,7 +104,7 @@ write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: //? validation if header.format in (PBM + PGM + Formats{.Pf}) && img.channels != 1 \ || header.format in (PPM + Formats{.PF}) && img.channels != 3 { - err = Format_Error.Invalid_Number_Of_Channels + err = .Invalid_Number_Of_Channels return } From fdd24f787fd6df5c1f3339d6317c76a1bafe60f5 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Mon, 18 Apr 2022 23:28:34 +0200 Subject: [PATCH 053/245] [image/tga] Writer for RGB(A) 8-bit images. --- core/image/common.odin | 14 ++++++ core/image/tga/tga.odin | 103 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 core/image/tga/tga.odin diff --git a/core/image/common.odin b/core/image/common.odin index 2e7bca17e..8c77ec48a 100644 --- a/core/image/common.odin +++ b/core/image/common.odin @@ -320,6 +320,20 @@ QOI_Info :: struct { header: QOI_Header, } +TGA_Header :: struct #packed { + id_length: u8, + color_map_type: u8, + data_type_code: u8, + color_map_origin: u16le, + color_map_length: u16le, + color_map_depth: u8, + origin: [2]u16le, + dimensions: [2]u16le, + bits_per_pixel: u8, + image_descriptor: u8, +} +#assert(size_of(TGA_Header) == 18) + // Function to help with image buffer calculations compute_buffer_size :: proc(width, height, channels, depth: int, extra_row_bytes := int(0)) -> (size: int) { size = ((((channels * width * depth) + 7) >> 3) + extra_row_bytes) * height diff --git a/core/image/tga/tga.odin b/core/image/tga/tga.odin new file mode 100644 index 000000000..3c860cb62 --- /dev/null +++ b/core/image/tga/tga.odin @@ -0,0 +1,103 @@ +/* + Copyright 2022 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ + + +// package tga implements a TGA image writer for 8-bit RGB and RGBA images. +package tga + +import "core:mem" +import "core:image" +import "core:compress" +import "core:bytes" +import "core:os" + +Error :: image.Error +General :: compress.General_Error +Image :: image.Image +Options :: image.Options + +RGB_Pixel :: image.RGB_Pixel +RGBA_Pixel :: image.RGBA_Pixel + +save_to_memory :: proc(output: ^bytes.Buffer, img: ^Image, options := Options{}, allocator := context.allocator) -> (err: Error) { + context.allocator = allocator + + if img == nil { + return .Invalid_Input_Image + } + + if output == nil { + return .Invalid_Output + } + + pixels := img.width * img.height + if pixels == 0 || pixels > image.MAX_DIMENSIONS || img.width > 65535 || img.height > 65535 { + return .Invalid_Input_Image + } + + // Our TGA writer supports only 8-bit images with 3 or 4 channels. + if img.depth != 8 || img.channels < 3 || img.channels > 4 { + return .Invalid_Input_Image + } + + if img.channels * pixels != len(img.pixels.buf) { + return .Invalid_Input_Image + } + + written := 0 + + // Calculate and allocate necessary space. + necessary := pixels * img.channels + size_of(image.TGA_Header) + + if !resize(&output.buf, necessary) { + return General.Resize_Failed + } + + header := image.TGA_Header{ + data_type_code = 0x02, // Color, uncompressed. + dimensions = {u16le(img.width), u16le(img.height)}, + bits_per_pixel = u8(img.depth * img.channels), + image_descriptor = 1 << 5, // Origin is top left. + } + header_bytes := transmute([size_of(image.TGA_Header)]u8)header + + copy(output.buf[written:], header_bytes[:]) + written += size_of(image.TGA_Header) + + /* + Encode loop starts here. + */ + if img.channels == 3 { + pix := mem.slice_data_cast([]RGB_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGB_Pixel, output.buf[written:]) + for p, i in pix { + out[i] = p.bgr + } + } else if img.channels == 4 { + pix := mem.slice_data_cast([]RGBA_Pixel, img.pixels.buf[:]) + out := mem.slice_data_cast([]RGBA_Pixel, output.buf[written:]) + for p, i in pix { + out[i] = p.bgra + } + } + return nil +} + +save_to_file :: proc(output: string, img: ^Image, options := Options{}, allocator := context.allocator) -> (err: Error) { + context.allocator = allocator + + out := &bytes.Buffer{} + defer bytes.buffer_destroy(out) + + save_to_memory(out, img, options) or_return + write_ok := os.write_entire_file(output, out.buf[:]) + + return nil if write_ok else General.Cannot_Open_File +} + +save :: proc{save_to_memory, save_to_file} \ No newline at end of file From aa4eb35671c519c520bd25ff90837c1d70558c6b Mon Sep 17 00:00:00 2001 From: hikari Date: Tue, 19 Apr 2022 05:58:22 +0300 Subject: [PATCH 054/245] sys/windows: add some procedures --- core/sys/windows/kernel32.odin | 7 +++++++ core/sys/windows/user32.odin | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/core/sys/windows/kernel32.odin b/core/sys/windows/kernel32.odin index 735e065e2..cb90f71da 100644 --- a/core/sys/windows/kernel32.odin +++ b/core/sys/windows/kernel32.odin @@ -62,6 +62,13 @@ foreign kernel32 { GetCurrentProcessId :: proc() -> DWORD --- GetCurrentThread :: proc() -> HANDLE --- GetCurrentThreadId :: proc() -> DWORD --- + GetProcessTimes :: proc( + hProcess: HANDLE, + lpCreationTime: LPFILETIME, + lpExitTime: LPFILETIME, + lpKernelTime: LPFILETIME, + lpUserTime: LPFILETIME, + ) -> BOOL --- GetStdHandle :: proc(which: DWORD) -> HANDLE --- ExitProcess :: proc(uExitCode: c_uint) -> ! --- DeviceIoControl :: proc( diff --git a/core/sys/windows/user32.odin b/core/sys/windows/user32.odin index 2316d3363..dd45df42a 100644 --- a/core/sys/windows/user32.odin +++ b/core/sys/windows/user32.odin @@ -60,6 +60,12 @@ foreign user32 { DestroyWindow :: proc(hWnd: HWND) -> BOOL --- ShowWindow :: proc(hWnd: HWND, nCmdShow: c_int) -> BOOL --- + BringWindowToTop :: proc(hWnd: HWND) -> BOOL --- + GetTopWindow :: proc(hWnd: HWND) -> HWND --- + SetForegroundWindow :: proc(hWnd: HWND) -> BOOL --- + GetForegroundWindow :: proc() -> HWND --- + SetActiveWindow :: proc(hWnd: HWND) -> HWND --- + GetActiveWindow :: proc() -> HWND --- GetMessageA :: proc(lpMsg: ^MSG, hWnd: HWND, wMsgFilterMin: UINT, wMsgFilterMax: UINT) -> BOOL --- GetMessageW :: proc(lpMsg: ^MSG, hWnd: HWND, wMsgFilterMin: UINT, wMsgFilterMax: UINT) -> BOOL --- From ded8342f3fdb176d6c264057f3bdcb890bfcfad7 Mon Sep 17 00:00:00 2001 From: hanabi1224 Date: Tue, 19 Apr 2022 20:46:33 +0800 Subject: [PATCH 055/245] Reduce allocations --- core/container/lru/lru_cache.odin | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/container/lru/lru_cache.odin b/core/container/lru/lru_cache.odin index 81f0142b0..b59f29f0c 100644 --- a/core/container/lru/lru_cache.odin +++ b/core/container/lru/lru_cache.odin @@ -65,20 +65,22 @@ set :: proc(c: ^$C/Cache($Key, $Value), key: Key, value: Value) -> runtime.Alloc return nil } - e := new(Node(Key, Value), c.node_allocator) or_return - e.key = key - e.value = value - + e : ^Node(Key, Value) = nil assert(c.count <= c.capacity) if c.count == c.capacity { - _remove_node(c, c.tail) + e = c.tail + _remove_node(c, e) } else { c.count += 1 + e = new(Node(Key, Value), c.node_allocator) or_return } - _push_front_node(c, e) + e.key = key + e.value = value + _push_front_node(c, e) c.entries[key] = e + return nil } @@ -128,6 +130,7 @@ remove :: proc(c: ^$C/Cache($Key, $Value), key: Key) -> bool { return false } _remove_node(c, e) + free(node, c.node_allocator) c.count -= 1 return true } @@ -153,9 +156,6 @@ _remove_node :: proc(c: ^$C/Cache($Key, $Value), node: ^Node(Key, Value)) { delete_key(&c.entries, node.key) _call_on_remove(c, node) - - free(node, c.node_allocator) - } @(private) From 7654afc2db9e88b1803862310698ca047bf10a01 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 19 Apr 2022 15:01:54 +0200 Subject: [PATCH 056/245] Revert "Update `mem.nil_allocator` to match the same in `runtime`" The change broke JSON unmarshaling. This reverts commit 4484a3433d6c58f1d1c594a4c36317f323cb5102. --- core/mem/allocators.odin | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/core/mem/allocators.odin b/core/mem/allocators.odin index 4954122ed..b8bd9a065 100644 --- a/core/mem/allocators.odin +++ b/core/mem/allocators.odin @@ -6,24 +6,7 @@ import "core:runtime" nil_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, size, alignment: int, old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) { - switch mode { - case .Alloc: - return nil, .Out_Of_Memory - case .Free: - return nil, .None - case .Free_All: - return nil, .Mode_Not_Implemented - case .Resize: - if size == 0 { - return nil, .None - } - return nil, .Out_Of_Memory - case .Query_Features: - return nil, .Mode_Not_Implemented - case .Query_Info: - return nil, .Mode_Not_Implemented - } - return nil, .None + return nil, nil } nil_allocator :: proc() -> Allocator { From 323e7a2d02819ef0b7137abbdfee8a0d48f5cecb Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 19 Apr 2022 15:03:09 +0200 Subject: [PATCH 057/245] Add JSON unmarshal test. --- tests/core/encoding/json/test_core_json.odin | 253 +++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/tests/core/encoding/json/test_core_json.odin b/tests/core/encoding/json/test_core_json.odin index 285cc04a1..c83710352 100644 --- a/tests/core/encoding/json/test_core_json.odin +++ b/tests/core/encoding/json/test_core_json.odin @@ -31,6 +31,7 @@ main :: proc() { parse_json(&t) marshal_json(&t) + unmarshal_json(&t) fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) if TEST_fail > 0 { @@ -90,3 +91,255 @@ marshal_json :: proc(t: ^testing.T) { expect(t, err == nil, "expected json error to be none") } + +PRODUCTS := ` +{ + "cash": "0", + "products": [ + { + "name": "Cog Cola", + "cost": "3", + "owned": "1", + + "profit": "4", + "seconds": 3, + "multiplier": 1, + "auto_click": false + }, + { + "name": "gingerBeer", + "cost": "9", + "owned": "0", + + "profit": "16", + "seconds": 5, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Coffee", + "cost": "27", + "owned": "0", + + "profit": "64", + "seconds": 7, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Haggis", + "cost": "81", + "owned": "0", + + "profit": "256", + "seconds": 11, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Lasagna", + "cost": "243", + "owned": "0", + + "profit": "1024", + "seconds": 13, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Asparagus", + "cost": "729", + "owned": "0", + + "profit": "4096", + "seconds": 17, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Yorkshire Pudding", + "cost": "2187", + "owned": "0", + + "profit": "16384", + "seconds": 19, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Salmon Wrap", + "cost": "6561", + "owned": "0", + + "profit": "65536", + "seconds": 23, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Poke Bowl", + "cost": "19683", + "owned": "0", + + "profit": "262144", + "seconds": 29, + "multiplier": 1, + "auto_click": false + }, + { + "name": "Chili Con Carne", + "cost": "59049", + "owned": "0", + + "profit": "1048576", + "seconds": 59, + "multiplier": 1, + "auto_click": false + }, + ], +} +` + +original_data := Game_Marshal{ + cash = "0", + products = { + { + name = "Cog Cola", + cost = "3", + owned = "1", + profit = "4", + seconds = 3, + multiplier = 1, + auto_click = false, + }, + { + name = "gingerBeer", + cost = "9", + owned = "0", + profit = "16", + seconds = 5, + multiplier = 1, + auto_click = false, + }, + { + name = "Coffee", + cost = "27", + owned = "0", + profit = "64", + seconds = 7, + multiplier = 1, + auto_click = false, + }, + { + name = "Haggis", + cost = "81", + owned = "0", + profit = "256", + seconds = 11, + multiplier = 1, + auto_click = false, + }, + { + name = "Lasagna", + cost = "243", + owned = "0", + profit = "1024", + seconds = 13, + multiplier = 1, + auto_click = false, + }, + { + name = "Asparagus", + cost = "729", + owned = "0", + profit = "4096", + seconds = 17, + multiplier = 1, + auto_click = false, + }, + { + name = "Yorkshire Pudding", + cost = "2187", + owned = "0", + profit = "16384", + seconds = 19, + multiplier = 1, + auto_click = false, + }, + { + name = "Salmon Wrap", + cost = "6561", + owned = "0", + profit = "65536", + seconds = 23, + multiplier = 1, + auto_click = false, + }, + { + name = "Poke Bowl", + cost = "19683", + owned = "0", + profit = "262144", + seconds = 29, + multiplier = 1, + auto_click = false, + }, + { + name = "Chili Con Carne", + cost = "59049", + owned = "0", + profit = "1048576", + seconds = 59, + multiplier = 1, + auto_click = false, + }, + }, +} + +Product_Marshal :: struct { + name: cstring, + owned: string, + + cost: string, + + profit: string, + seconds: int, + multiplier: int, + + auto_click: bool, +} + +Game_Marshal :: struct { + cash: string, + products: []Product_Marshal, +} + +cleanup :: proc(g: Game_Marshal) { + for p in g.products { + delete(p.name) + delete(p.owned) + delete(p.cost) + delete(p.profit) + } + delete(g.products) + delete(g.cash) +} + +@test +unmarshal_json :: proc(t: ^testing.T) { + g: Game_Marshal + err := json.unmarshal(transmute([]u8)PRODUCTS, &g, json.DEFAULT_SPECIFICATION) + defer cleanup(g) + + expect(t, err == nil, "Expected json error to be nil") + + msg := fmt.tprintf("Expected %v products to have been unmarshaled, got %v", len(original_data.products), len(g.products)) + expect(t, len(g.products) == len(original_data.products), msg) + + msg = fmt.tprintf("Expected cash to have been unmarshaled as %v, got %v", original_data.cash, g.cash) + expect(t, original_data.cash == g.cash, "Cash unmarshaled improperly") + + for p, i in g.products { + expect(t, p == original_data.products[i], "Producted unmarshaled improperly") + } +} \ No newline at end of file From 581255bf23af90b77bb2b6e2671b40e2b565754e Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 19 Apr 2022 20:04:38 +0200 Subject: [PATCH 058/245] Fix unmarshal for escaped strings. --- core/encoding/json/parser.odin | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/encoding/json/parser.odin b/core/encoding/json/parser.odin index c682ec9bd..0b9a1cf33 100644 --- a/core/encoding/json/parser.odin +++ b/core/encoding/json/parser.odin @@ -281,6 +281,11 @@ parse_object :: proc(p: ^Parser) -> (value: Value, err: Error) { // IMPORTANT NOTE(bill): unquote_string assumes a mostly valid string unquote_string :: proc(token: Token, spec: Specification, allocator := context.allocator) -> (value: string, err: Error) { + if allocator.data == nil { + // We were called from `unmarshal_count_array`, return early. + return "", nil + } + get_u2_rune :: proc(s: string) -> rune { if len(s) < 4 || s[0] != '\\' || s[1] != 'x' { return -1 From 29b2c0476698d0f4b240e87945cfa278da82b57a Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 19 Apr 2022 20:11:02 +0200 Subject: [PATCH 059/245] Revert "Fix unmarshal for escaped strings." This reverts commit 581255bf23af90b77bb2b6e2671b40e2b565754e. --- core/encoding/json/parser.odin | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/encoding/json/parser.odin b/core/encoding/json/parser.odin index 0b9a1cf33..c682ec9bd 100644 --- a/core/encoding/json/parser.odin +++ b/core/encoding/json/parser.odin @@ -281,11 +281,6 @@ parse_object :: proc(p: ^Parser) -> (value: Value, err: Error) { // IMPORTANT NOTE(bill): unquote_string assumes a mostly valid string unquote_string :: proc(token: Token, spec: Specification, allocator := context.allocator) -> (value: string, err: Error) { - if allocator.data == nil { - // We were called from `unmarshal_count_array`, return early. - return "", nil - } - get_u2_rune :: proc(s: string) -> rune { if len(s) < 4 || s[0] != '\\' || s[1] != 'x' { return -1 From a30b9b17b3a91bc856a037c1e1025e389a8524b3 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 19 Apr 2022 20:32:22 +0200 Subject: [PATCH 060/245] [json/unmarshal] Fix quoted strings. --- core/encoding/json/parser.odin | 6 ++++++ tests/core/encoding/json/test_core_json.odin | 20 +++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/core/encoding/json/parser.odin b/core/encoding/json/parser.odin index c682ec9bd..7bf88c565 100644 --- a/core/encoding/json/parser.odin +++ b/core/encoding/json/parser.odin @@ -354,6 +354,12 @@ unquote_string :: proc(token: Token, spec: Specification, allocator := context.a b := bytes_make(len(s) + 2*utf8.UTF_MAX, 1, allocator) or_return w := copy(b, s[0:i]) + + if len(b) == 0 && allocator.data == nil { + // `unmarshal_count_array` calls us with a nil allocator + return string(b[:w]), nil + } + loop: for i < len(s) { c := s[i] switch { diff --git a/tests/core/encoding/json/test_core_json.odin b/tests/core/encoding/json/test_core_json.odin index c83710352..0e6a6412f 100644 --- a/tests/core/encoding/json/test_core_json.odin +++ b/tests/core/encoding/json/test_core_json.odin @@ -71,7 +71,8 @@ parse_json :: proc(t: ^testing.T) { _, err := json.parse(transmute([]u8)json_data) - expect(t, err == .None, "expected json error to be none") + msg := fmt.tprintf("Expected `json.parse` to return nil, got %v", err) + expect(t, err == nil, msg) } @test @@ -88,8 +89,8 @@ marshal_json :: proc(t: ^testing.T) { } _, err := json.marshal(my_struct) - - expect(t, err == nil, "expected json error to be none") + msg := fmt.tprintf("Expected `json.marshal` to return nil, got %v", err) + expect(t, err == nil, msg) } PRODUCTS := ` @@ -97,7 +98,7 @@ PRODUCTS := ` "cash": "0", "products": [ { - "name": "Cog Cola", + "name": "Cog\nCola", "cost": "3", "owned": "1", @@ -204,7 +205,7 @@ original_data := Game_Marshal{ cash = "0", products = { { - name = "Cog Cola", + name = "Cog\nCola", cost = "3", owned = "1", profit = "4", @@ -331,13 +332,14 @@ unmarshal_json :: proc(t: ^testing.T) { err := json.unmarshal(transmute([]u8)PRODUCTS, &g, json.DEFAULT_SPECIFICATION) defer cleanup(g) - expect(t, err == nil, "Expected json error to be nil") + msg := fmt.tprintf("Expected `json.unmarshal` to return nil, got %v", err) + expect(t, err == nil, msg) - msg := fmt.tprintf("Expected %v products to have been unmarshaled, got %v", len(original_data.products), len(g.products)) + msg = fmt.tprintf("Expected %v products to have been unmarshaled, got %v", len(original_data.products), len(g.products)) expect(t, len(g.products) == len(original_data.products), msg) - msg = fmt.tprintf("Expected cash to have been unmarshaled as %v, got %v", original_data.cash, g.cash) - expect(t, original_data.cash == g.cash, "Cash unmarshaled improperly") + msg = fmt.tprintf("Expected cash to have been unmarshaled as %v, got %v", original_data.cash, g.cash) + expect(t, original_data.cash == g.cash, msg) for p, i in g.products { expect(t, p == original_data.products[i], "Producted unmarshaled improperly") From eee97f7f62bbd65dd03ea3ec8668fef3fcfc685c Mon Sep 17 00:00:00 2001 From: hikari Date: Thu, 21 Apr 2022 20:49:32 +0300 Subject: [PATCH 061/245] strings: add levenshtein_distance procedure --- core/strings/strings.odin | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/core/strings/strings.odin b/core/strings/strings.odin index 8e774b367..87bbb42cf 100644 --- a/core/strings/strings.odin +++ b/core/strings/strings.odin @@ -1809,3 +1809,62 @@ fields_iterator :: proc(s: ^string) -> (field: string, ok: bool) { s^ = s[len(s):] return } + +// `levenshtein_distance` returns the Levenshtein edit distance between 2 strings. +// This is a single-row-version of the Wagner–Fischer algorithm, based on C code by Martin Ettl. +// Note: allocator isn't used if the length of string b in runes is smaller than 70. +levenshtein_distance :: proc(a, b: string, allocator := context.allocator) -> int { + LEVENSHTEIN_DEFAULT_COSTS: []int : { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + } + + m, n := utf8.rune_count_in_string(a), utf8.rune_count_in_string(b) + + if m == 0 do return n + if n == 0 do return m + + costs: []int + + if n + 1 > len(LEVENSHTEIN_DEFAULT_COSTS) { + costs = make([]int, n + 1, allocator) + } else { + costs = LEVENSHTEIN_DEFAULT_COSTS + } + + defer if n + 1 > len(LEVENSHTEIN_DEFAULT_COSTS) { + delete(costs, allocator) + } + + for k in 0..=n { + costs[k] = k + } + + i: int + for c1 in a { + costs[0] = i + 1 + corner := i + j: int + for c2 in b { + upper := costs[j + 1] + if c1 == c2 { + costs[j + 1] = corner + } else { + t := upper if upper < corner else corner + costs[j + 1] = (costs[j] if costs[j] < t else t) + 1 + } + + corner = upper + j += 1 + } + + i += 1 + } + + return costs[n] +} From 591732f347c094e706471994996fcffa44687e89 Mon Sep 17 00:00:00 2001 From: hikari Date: Thu, 21 Apr 2022 20:58:50 +0300 Subject: [PATCH 062/245] strings: levenshtein_distance: remove costs calculation for default array --- core/strings/strings.odin | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/strings/strings.odin b/core/strings/strings.odin index 87bbb42cf..3b33a5dc8 100644 --- a/core/strings/strings.odin +++ b/core/strings/strings.odin @@ -1833,6 +1833,9 @@ levenshtein_distance :: proc(a, b: string, allocator := context.allocator) -> in if n + 1 > len(LEVENSHTEIN_DEFAULT_COSTS) { costs = make([]int, n + 1, allocator) + for k in 0..=n { + costs[k] = k + } } else { costs = LEVENSHTEIN_DEFAULT_COSTS } @@ -1841,10 +1844,6 @@ levenshtein_distance :: proc(a, b: string, allocator := context.allocator) -> in delete(costs, allocator) } - for k in 0..=n { - costs[k] = k - } - i: int for c1 in a { costs[0] = i + 1 From d8f0da164b92f52eda045d77e5f6abb5c5146f2a Mon Sep 17 00:00:00 2001 From: hikari Date: Thu, 21 Apr 2022 21:15:11 +0300 Subject: [PATCH 063/245] strings: levenshtein_distance: improve potential caching --- core/strings/strings.odin | 43 ++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/core/strings/strings.odin b/core/strings/strings.odin index 3b33a5dc8..f876aab3d 100644 --- a/core/strings/strings.odin +++ b/core/strings/strings.odin @@ -15,7 +15,7 @@ clone :: proc(s: string, allocator := context.allocator, loc := #caller_location } // returns a clone of the string `s` allocated using the `allocator` as a cstring -// a nul byte is appended to the clone, to make the cstring safe +// a nul byte is appended to the clone, to make the cstring safe clone_to_cstring :: proc(s: string, allocator := context.allocator, loc := #caller_location) -> cstring { c := make([]byte, len(s)+1, allocator, loc) copy(c, s) @@ -37,7 +37,7 @@ string_from_nul_terminated_ptr :: proc(ptr: ^byte, len: int) -> string { return s } -// returns the raw ^byte start of the string `str` +// returns the raw ^byte start of the string `str` ptr_from_string :: proc(str: string) -> ^byte { d := transmute(mem.Raw_String)str return d.data @@ -969,7 +969,7 @@ count :: proc(s, substr: string) -> int { repeats the string `s` multiple `count` times and returns the allocated string panics when `count` is below 0 - strings.repeat("abc", 2) -> "abcabc" + strings.repeat("abc", 2) -> "abcabc" */ repeat :: proc(s: string, count: int, allocator := context.allocator) -> string { if count < 0 { @@ -1378,7 +1378,7 @@ split_multi :: proc(s: string, substrs: []string, allocator := context.allocator // skip when no results if substrings_found < 1 { - return + return } buf = make([]string, substrings_found + 1, allocator) @@ -1812,16 +1812,35 @@ fields_iterator :: proc(s: ^string) -> (field: string, ok: bool) { // `levenshtein_distance` returns the Levenshtein edit distance between 2 strings. // This is a single-row-version of the Wagner–Fischer algorithm, based on C code by Martin Ettl. -// Note: allocator isn't used if the length of string b in runes is smaller than 70. +// Note: allocator isn't used if the length of string b in runes is smaller than 256. levenshtein_distance :: proc(a, b: string, allocator := context.allocator) -> int { LEVENSHTEIN_DEFAULT_COSTS: []int : { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 254, 255, } m, n := utf8.rune_count_in_string(a), utf8.rune_count_in_string(b) From 71b1cce517e421fd7eeff4d5ac15e5165dd318c0 Mon Sep 17 00:00:00 2001 From: hikari Date: Thu, 21 Apr 2022 21:19:11 +0300 Subject: [PATCH 064/245] strings: levenshtein_distance: 64 is actually faster than 256 --- core/strings/strings.odin | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/core/strings/strings.odin b/core/strings/strings.odin index f876aab3d..6e01f5c8a 100644 --- a/core/strings/strings.odin +++ b/core/strings/strings.odin @@ -1812,7 +1812,7 @@ fields_iterator :: proc(s: ^string) -> (field: string, ok: bool) { // `levenshtein_distance` returns the Levenshtein edit distance between 2 strings. // This is a single-row-version of the Wagner–Fischer algorithm, based on C code by Martin Ettl. -// Note: allocator isn't used if the length of string b in runes is smaller than 256. +// Note: allocator isn't used if the length of string b in runes is smaller than 64. levenshtein_distance :: proc(a, b: string, allocator := context.allocator) -> int { LEVENSHTEIN_DEFAULT_COSTS: []int : { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -1821,26 +1821,7 @@ levenshtein_distance :: proc(a, b: string, allocator := context.allocator) -> in 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, - 250, 251, 252, 253, 254, 255, + 60, 61, 62, 63, } m, n := utf8.rune_count_in_string(a), utf8.rune_count_in_string(b) From f0267536929c5909a8098baf95cb5eb1a4fa6522 Mon Sep 17 00:00:00 2001 From: hikari Date: Thu, 21 Apr 2022 21:19:43 +0300 Subject: [PATCH 065/245] strings: levenshtein_distance: remove `do` --- core/strings/strings.odin | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/strings/strings.odin b/core/strings/strings.odin index 6e01f5c8a..a3d9fa93e 100644 --- a/core/strings/strings.odin +++ b/core/strings/strings.odin @@ -1826,8 +1826,12 @@ levenshtein_distance :: proc(a, b: string, allocator := context.allocator) -> in m, n := utf8.rune_count_in_string(a), utf8.rune_count_in_string(b) - if m == 0 do return n - if n == 0 do return m + if m == 0 { + return n + } + if n == 0 { + return m + } costs: []int From e799476f90537ca173205a64da1fbf87b894b42e Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 22 Apr 2022 16:55:47 +0200 Subject: [PATCH 066/245] [compress/shoco] Add short string compressor. --- core/compress/shoco/model.odin | 148 +++++++++ core/compress/shoco/shoco.odin | 318 ++++++++++++++++++++ examples/all/all_main.odin | 2 + tests/core/assets/Shoco/LICENSE | 26 ++ tests/core/assets/Shoco/LICENSE.shoco | Bin 0 -> 1269 bytes tests/core/assets/Shoco/README.md | 95 ++++++ tests/core/assets/Shoco/README.md.shoco | Bin 0 -> 2227 bytes tests/core/compress/test_core_compress.odin | 57 +++- 8 files changed, 645 insertions(+), 1 deletion(-) create mode 100644 core/compress/shoco/model.odin create mode 100644 core/compress/shoco/shoco.odin create mode 100644 tests/core/assets/Shoco/LICENSE create mode 100644 tests/core/assets/Shoco/LICENSE.shoco create mode 100644 tests/core/assets/Shoco/README.md create mode 100644 tests/core/assets/Shoco/README.md.shoco diff --git a/core/compress/shoco/model.odin b/core/compress/shoco/model.odin new file mode 100644 index 000000000..49e3dd97e --- /dev/null +++ b/core/compress/shoco/model.odin @@ -0,0 +1,148 @@ +/* + This file was generated, so don't edit this by hand. + Transliterated from https://github.com/Ed-von-Schleck/shoco/blob/master/shoco_model.h, + which is an English word model. +*/ + +// package shoco is an implementation of the shoco short string compressor +package shoco + +DEFAULT_MODEL :: Shoco_Model { + min_char = 39, + max_char = 122, + characters_by_id = { + 'e', 'a', 'i', 'o', 't', 'h', 'n', 'r', 's', 'l', 'u', 'c', 'w', 'm', 'd', 'b', 'p', 'f', 'g', 'v', 'y', 'k', '-', 'H', 'M', 'T', '\'', 'B', 'x', 'I', 'W', 'L', + }, + ids_by_character = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 26, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, -1, -1, -1, -1, -1, 23, 29, -1, -1, 31, 24, -1, -1, -1, -1, -1, -1, 25, -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 15, 11, 14, 0, 17, 18, 5, 2, -1, 21, 9, 13, 6, 3, 16, -1, 7, 8, 4, 10, 19, 12, 28, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + }, + successors_by_bigram = { + {7, 4, 12, -1, 6, -1, 1, 0, 3, 5, -1, 9, -1, 8, 2, -1, 15, 14, -1, 10, 11, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1}, + {-1, -1, 6, -1, 1, -1, 0, 3, 2, 4, 15, 11, -1, 9, 5, 10, 13, -1, 12, 8, 7, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {9, 11, -1, 4, 2, -1, 0, 8, 1, 5, -1, 6, -1, 3, 7, 15, -1, 12, 10, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {-1, -1, 14, 7, 5, -1, 1, 2, 8, 9, 0, 15, 6, 4, 11, -1, 12, 3, -1, 10, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {2, 4, 3, 1, 5, 0, -1, 6, 10, 9, 7, 12, 11, -1, -1, -1, -1, 13, -1, -1, 8, -1, 15, -1, -1, -1, 14, -1, -1, -1, -1, -1}, + {0, 1, 2, 3, 4, -1, -1, 5, 9, 10, 6, -1, -1, 8, 15, 11, -1, 14, -1, -1, 7, -1, 13, -1, -1, -1, 12, -1, -1, -1, -1, -1}, + {2, 8, 7, 4, 3, -1, 9, -1, 6, 11, -1, 5, -1, -1, 0, -1, -1, 14, 1, 15, 10, 12, -1, -1, -1, -1, 13, -1, -1, -1, -1, -1}, + {0, 3, 1, 2, 6, -1, 9, 8, 4, 12, 13, 10, -1, 11, 7, -1, -1, 15, 14, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 6, 3, 4, 1, 2, -1, -1, 5, 10, 7, 9, 11, 12, -1, -1, 8, 14, -1, -1, 15, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 6, 2, 5, 9, -1, -1, -1, 10, 1, 8, -1, 12, 14, 4, -1, 15, 7, -1, 13, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {8, 10, 9, 15, 1, -1, 4, 0, 3, 2, -1, 6, -1, 12, 11, 13, 7, 14, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 3, 6, 0, 4, 2, -1, 7, 13, 8, 9, 11, -1, -1, 15, -1, -1, -1, -1, -1, 10, 5, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {3, 0, 1, 4, -1, 2, 5, 6, 7, 8, -1, 14, -1, -1, 9, 15, -1, 12, -1, -1, -1, 10, 11, -1, -1, -1, 13, -1, -1, -1, -1, -1}, + {0, 1, 3, 2, 15, -1, 12, -1, 7, 14, 4, -1, -1, 9, -1, 8, 5, 10, -1, -1, 6, -1, 13, -1, -1, -1, 11, -1, -1, -1, -1, -1}, + {0, 3, 1, 2, -1, -1, 12, 6, 4, 9, 7, -1, -1, 14, 8, -1, -1, 15, 11, 13, 5, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 5, 7, 2, 10, 13, -1, 6, 8, 1, 3, -1, -1, 14, 15, 11, -1, -1, -1, 12, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 2, 6, 3, 7, 10, -1, 1, 9, 4, 8, -1, -1, 15, -1, 12, 5, -1, -1, -1, 11, -1, 13, -1, -1, -1, 14, -1, -1, -1, -1, -1}, + {1, 3, 4, 0, 7, -1, 12, 2, 11, 8, 6, 13, -1, -1, -1, -1, -1, 5, -1, -1, 10, 15, 9, -1, -1, -1, 14, -1, -1, -1, -1, -1}, + {1, 3, 5, 2, 13, 0, 9, 4, 7, 6, 8, -1, -1, 15, -1, 11, -1, -1, 10, -1, 14, -1, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 2, 1, 3, -1, -1, -1, 6, -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {1, 11, 4, 0, 3, -1, 13, 12, 2, 7, -1, -1, 15, 10, 5, 8, 14, -1, -1, -1, -1, -1, 9, -1, -1, -1, 6, -1, -1, -1, -1, -1}, + {0, 9, 2, 14, 15, 4, 1, 13, 3, 5, -1, -1, 10, -1, -1, -1, -1, 6, 12, -1, 7, -1, 8, -1, -1, -1, 11, -1, -1, -1, -1, -1}, + {-1, 2, 14, -1, 1, 5, 8, 7, 4, 12, -1, 6, 9, 11, 13, 3, 10, 15, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {0, 1, 3, 2, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {4, 3, 1, 5, -1, -1, -1, 0, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {2, 8, 4, 1, -1, 0, -1, 6, -1, -1, 5, -1, 7, -1, -1, -1, -1, -1, -1, -1, 10, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1}, + {12, 5, -1, -1, 1, -1, -1, 7, 0, 3, -1, 2, -1, 4, 6, -1, -1, -1, -1, 8, -1, -1, 15, -1, 13, 9, -1, -1, -1, -1, -1, 11}, + {1, 3, 2, 4, -1, -1, -1, 5, -1, 7, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1}, + {5, 3, 4, 12, 1, 6, -1, -1, -1, -1, 8, 2, -1, -1, -1, -1, 0, 9, -1, -1, 11, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1}, + {-1, -1, -1, -1, 0, -1, 1, 12, 3, -1, -1, -1, -1, 5, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, 6, -1, 10}, + {2, 3, 1, 4, -1, 0, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1}, + {5, 1, 3, 0, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, 9, -1, -1, 6, -1, 7}, + }, + successors_reversed = { + {'s', 't', 'c', 'l', 'm', 'a', 'd', 'r', 'v', 'T', 'A', 'L', 'e', 'M', 'Y', '-'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'-', 't', 'a', 'b', 's', 'h', 'c', 'r', 'n', 'w', 'p', 'm', 'l', 'd', 'i', 'f'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'u', 'e', 'i', 'a', 'o', 'r', 'y', 'l', 'I', 'E', 'R', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'e', 'a', 'o', 'i', 'u', 'A', 'y', 'E', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'t', 'n', 'f', 's', '\'', 'm', 'I', 'N', 'A', 'E', 'L', 'Z', 'r', 'V', 'R', 'C'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'o', 'a', 'y', 'i', 'u', 'e', 'I', 'L', 'D', '\'', 'E', 'Y', '\x00', '\x00', '\x00', '\x00'}, + {'r', 'i', 'y', 'a', 'e', 'o', 'u', 'Y', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'h', 'o', 'e', 'E', 'i', 'u', 'r', 'w', 'a', 'H', 'y', 'R', 'Z', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'h', 'i', 'e', 'a', 'o', 'r', 'I', 'y', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'n', 't', 's', 'r', 'l', 'd', 'i', 'y', 'v', 'm', 'b', 'c', 'g', 'p', 'k', 'u'}, + {'e', 'l', 'o', 'u', 'y', 'a', 'r', 'i', 's', 'j', 't', 'b', 'v', 'h', 'm', 'd'}, + {'o', 'e', 'h', 'a', 't', 'k', 'i', 'r', 'l', 'u', 'y', 'c', 'q', 's', '-', 'd'}, + {'e', 'i', 'o', 'a', 's', 'y', 'r', 'u', 'd', 'l', '-', 'g', 'n', 'v', 'm', 'f'}, + {'r', 'n', 'd', 's', 'a', 'l', 't', 'e', 'm', 'c', 'v', 'y', 'i', 'x', 'f', 'p'}, + {'o', 'e', 'r', 'a', 'i', 'f', 'u', 't', 'l', '-', 'y', 's', 'n', 'c', '\'', 'k'}, + {'h', 'e', 'o', 'a', 'r', 'i', 'l', 's', 'u', 'n', 'g', 'b', '-', 't', 'y', 'm'}, + {'e', 'a', 'i', 'o', 't', 'r', 'u', 'y', 'm', 's', 'l', 'b', '\'', '-', 'f', 'd'}, + {'n', 's', 't', 'm', 'o', 'l', 'c', 'd', 'r', 'e', 'g', 'a', 'f', 'v', 'z', 'b'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'e', 'n', 'i', 's', 'h', 'l', 'f', 'y', '-', 'a', 'w', '\'', 'g', 'r', 'o', 't'}, + {'e', 'l', 'i', 'y', 'd', 'o', 'a', 'f', 'u', 't', 's', 'k', 'w', 'v', 'm', 'p'}, + {'e', 'a', 'o', 'i', 'u', 'p', 'y', 's', 'b', 'm', 'f', '\'', 'n', '-', 'l', 't'}, + {'d', 'g', 'e', 't', 'o', 'c', 's', 'i', 'a', 'n', 'y', 'l', 'k', '\'', 'f', 'v'}, + {'u', 'n', 'r', 'f', 'm', 't', 'w', 'o', 's', 'l', 'v', 'd', 'p', 'k', 'i', 'c'}, + {'e', 'r', 'a', 'o', 'l', 'p', 'i', 't', 'u', 's', 'h', 'y', 'b', '-', '\'', 'm'}, + {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'e', 'i', 'o', 'a', 's', 'y', 't', 'd', 'r', 'n', 'c', 'm', 'l', 'u', 'g', 'f'}, + {'e', 't', 'h', 'i', 'o', 's', 'a', 'u', 'p', 'c', 'l', 'w', 'm', 'k', 'f', 'y'}, + {'h', 'o', 'e', 'i', 'a', 't', 'r', 'u', 'y', 'l', 's', 'w', 'c', 'f', '\'', '-'}, + {'r', 't', 'l', 's', 'n', 'g', 'c', 'p', 'e', 'i', 'a', 'd', 'm', 'b', 'f', 'o'}, + {'e', 'i', 'a', 'o', 'y', 'u', 'r', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, + {'a', 'i', 'h', 'e', 'o', 'n', 'r', 's', 'l', 'd', 'k', '-', 'f', '\'', 'c', 'b'}, + {'p', 't', 'c', 'a', 'i', 'e', 'h', 'q', 'u', 'f', '-', 'y', 'o', '\x00', '\x00', '\x00'}, + {'o', 'e', 's', 't', 'i', 'd', '\'', 'l', 'b', '-', 'm', 'a', 'r', 'n', 'p', 'w'}, + }, + + character_count = 32, + successor_count = 16, + + max_successor_n = 7, + packs = { + { 0x80000000, 1, 2, { 26, 24, 24, 24, 24, 24, 24, 24 }, { 15, 3, 0, 0, 0, 0, 0, 0 }, 0xc0, 0x80 }, + { 0xc0000000, 2, 4, { 25, 22, 19, 16, 16, 16, 16, 16 }, { 15, 7, 7, 7, 0, 0, 0, 0 }, 0xe0, 0xc0 }, + { 0xe0000000, 4, 8, { 23, 19, 15, 11, 8, 5, 2, 0 }, { 31, 15, 15, 15, 7, 7, 7, 3 }, 0xf0, 0xe0 }, + }, +} \ No newline at end of file diff --git a/core/compress/shoco/shoco.odin b/core/compress/shoco/shoco.odin new file mode 100644 index 000000000..9c5008f5d --- /dev/null +++ b/core/compress/shoco/shoco.odin @@ -0,0 +1,318 @@ +/* + Copyright 2022 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + List of contributors: + Jeroen van Rijn: Initial implementation. + + An implementation of [shoco](https://github.com/Ed-von-Schleck/shoco) by Christian Schramm. +*/ + +// package shoco is an implementation of the shoco short string compressor +package shoco + +import "core:intrinsics" +import "core:compress" + +Shoco_Pack :: struct { + word: u32, + bytes_packed: i8, + bytes_unpacked: i8, + offsets: [8]u16, + masks: [8]i16, + header_mask: u8, + header: u8, +} + +Shoco_Model :: struct { + min_char: u8, + max_char: u8, + characters_by_id: []u8, + ids_by_character: [256]i16, + successors_by_bigram: [][]i8, + successors_reversed: [][]u8, + + character_count: u8, + successor_count: u8, + max_successor_n: i8, + packs: []Shoco_Pack, +} + +compress_bound :: proc(uncompressed_size: int) -> (worst_case_compressed_size: int) { + // Worst case compression happens when input is non-ASCII (128-255) + // Encoded as 0x00 + the byte in question. + return uncompressed_size * 2 +} + +decompress_bound :: proc(compressed_size: int, model := DEFAULT_MODEL) -> (maximum_decompressed_size: int) { + // Best case compression is 2:1 + most: f64 + for pack in model.packs { + val := f64(compressed_size) / f64(pack.bytes_packed) * f64(pack.bytes_unpacked) + most = max(most, val) + } + return int(most) +} + +find_best_encoding :: proc(indices: []i16, n_consecutive: i8, model := DEFAULT_MODEL) -> (res: int) { + for p := len(model.packs); p > 0; p -= 1 { + pack := model.packs[p - 1] + if n_consecutive >= pack.bytes_unpacked { + have_index := true + for i := 0; i < int(pack.bytes_unpacked); i += 1 { + if indices[i] > pack.masks[i] { + have_index = false + break + } + } + if have_index { + return p - 1 + } + } + } + return -1 +} + +validate_model :: proc(model: Shoco_Model) -> (int, compress.Error) { + if len(model.successors_reversed) != int(model.max_char - model.min_char) { + return 0, .Unknown_Compression_Method + } + + if len(model.characters_by_id) != int(model.character_count) { + return 0, .Unknown_Compression_Method + } + + if len(model.successors_by_bigram) != int(model.character_count) || len(model.successors_by_bigram[0]) != int(model.character_count) { + return 0, .Unknown_Compression_Method + } + + if len(model.successors_reversed[0]) != int(model.successor_count) { + return 0, .Unknown_Compression_Method + } + + // Model seems legit. + return 0, nil +} + +// Decompresses into provided buffer. +decompress_slice_to_output_buffer :: proc(input: []u8, output: []u8, model := DEFAULT_MODEL) -> (size: int, err: compress.Error) { + inp, inp_end := 0, len(input) + out, out_end := 0, len(output) + + validate_model(model) or_return + + for inp < inp_end { + val := transmute(i8)input[inp] + mark := int(-1) + + for val < 0 { + val <<= 1 + mark += 1 + } + + if mark > len(model.packs) { + return out, .Unknown_Compression_Method + } + + if mark < 0 { + if out >= out_end { + return out, .Output_Too_Short + } + + // Ignore the sentinel value for non-ASCII chars + if input[inp] == 0x00 { + inp += 1 + if inp >= inp_end { + return out, .Stream_Too_Short + } + } + output[out] = input[inp] + inp, out = inp + 1, out + 1 + + } else { + pack := model.packs[mark] + + if out + int(pack.bytes_unpacked) > out_end { + return out, .Output_Too_Short + } else if inp + int(pack.bytes_packed) > inp_end { + return out, .Stream_Too_Short + } + + code := intrinsics.unaligned_load((^u32)(&input[inp])) + when ODIN_ENDIAN == .Little { + code = intrinsics.byte_swap(code) + } + + // Unpack the leading char + offset := pack.offsets[0] + mask := pack.masks[0] + + last_chr := model.characters_by_id[(code >> offset) & u32(mask)] + output[out] = last_chr + + // Unpack the successor chars + for i := 1; i < int(pack.bytes_unpacked); i += 1 { + offset = pack.offsets[i] + mask = pack.masks[i] + + last_chr = model.successors_reversed[last_chr - model.min_char][(code >> offset) & u32(mask)] + output[out + i] = last_chr + } + + out += int(pack.bytes_unpacked) + inp += int(pack.bytes_packed) + } + } + + return out, nil +} + +decompress_slice_to_string :: proc(input: []u8, model := DEFAULT_MODEL, allocator := context.allocator) -> (res: string, err: compress.Error) { + context.allocator = allocator + + if len(input) == 0 { + return "", .Stream_Too_Short + } + + max_output_size := decompress_bound(len(input), model) + + buf: [dynamic]u8 + if !resize(&buf, max_output_size) { + return "", .Out_Of_Memory + } + + length, result := decompress_slice_to_output_buffer(input, buf[:]) + resize(&buf, length) + return string(buf[:]), result +} +decompress :: proc{decompress_slice_to_output_buffer, decompress_slice_to_string} + +compress_string_to_buffer :: proc(input: string, output: []u8, model := DEFAULT_MODEL, allocator := context.allocator) -> (size: int, err: compress.Error) { + inp, inp_end := 0, len(input) + out, out_end := 0, len(output) + output := output + + validate_model(model) or_return + + indices := make([]i16, model.max_successor_n + 1) + defer delete(indices) + + last_resort := false + + encode: for inp < inp_end { + if last_resort { + last_resort = false + + if input[inp] & 0x80 == 0x80 { + // Non-ASCII case + if out + 2 > out_end { + return out, .Output_Too_Short + } + + // Put in a sentinel byte + output[out] = 0x00 + out += 1 + } else { + // An ASCII byte + if out + 1 > out_end { + return out, .Output_Too_Short + } + } + output[out] = input[inp] + out, inp = out + 1, inp + 1 + } else { + // Find the longest string of known successors + indices[0] = model.ids_by_character[input[inp]] + last_chr_index := indices[0] + + if last_chr_index < 0 { + last_resort = true + continue encode + } + + rest := inp_end - inp + n_consecutive: i8 = 1 + for ; n_consecutive <= model.max_successor_n; n_consecutive += 1 { + if inp_end > 0 && int(n_consecutive) == rest { + break + } + + current_index := model.ids_by_character[input[inp + int(n_consecutive)]] + if current_index < 0 { // '\0' is always -1 + break + } + + successor_index := model.successors_by_bigram[last_chr_index][current_index] + if successor_index < 0 { + break + } + + indices[n_consecutive] = i16(successor_index) + last_chr_index = current_index + } + + if n_consecutive < 2 { + last_resort = true + continue encode + } + + pack_n := find_best_encoding(indices, n_consecutive) + if pack_n >= 0 { + if out + int(model.packs[pack_n].bytes_packed) > out_end { + return out, .Output_Too_Short + } + + pack := model.packs[pack_n] + code := pack.word + + for i := 0; i < int(pack.bytes_unpacked); i += 1 { + code |= u32(indices[i]) << pack.offsets[i] + } + + // In the little-endian world, we need to swap what's in the register to match the memory representation. + when ODIN_ENDIAN == .Little { + code = intrinsics.byte_swap(code) + } + out_ptr := raw_data(output[out:]) + + switch pack.bytes_packed { + case 4: + intrinsics.unaligned_store(transmute(^u32)out_ptr, code) + case 2: + intrinsics.unaligned_store(transmute(^u16)out_ptr, u16(code)) + case 1: + intrinsics.unaligned_store(transmute(^u8)out_ptr, u8(code)) + case: + return out, .Unknown_Compression_Method + } + + out += int(pack.bytes_packed) + inp += int(pack.bytes_unpacked) + } else { + last_resort = true + continue encode + } + } + } + return out, nil +} + +compress_string :: proc(input: string, model := DEFAULT_MODEL, allocator := context.allocator) -> (output: []u8, err: compress.Error) { + context.allocator = allocator + + if len(input) == 0 { + return {}, .Stream_Too_Short + } + + max_output_size := compress_bound(len(input)) + + buf: [dynamic]u8 + if !resize(&buf, max_output_size) { + return {}, .Out_Of_Memory + } + + length, result := compress_string_to_buffer(input, buf[:]) + resize(&buf, length) + return buf[:length], result +} +compress :: proc{compress_string_to_buffer, compress_string} \ No newline at end of file diff --git a/examples/all/all_main.odin b/examples/all/all_main.odin index 4f5bfbdc1..27f199062 100644 --- a/examples/all/all_main.odin +++ b/examples/all/all_main.odin @@ -10,6 +10,7 @@ import c "core:c" import libc "core:c/libc" import compress "core:compress" +import shoco "core:compress/shoco" import gzip "core:compress/gzip" import zlib "core:compress/zlib" @@ -115,6 +116,7 @@ _ :: bytes _ :: c _ :: libc _ :: compress +_ :: shoco _ :: gzip _ :: zlib _ :: bit_array diff --git a/tests/core/assets/Shoco/LICENSE b/tests/core/assets/Shoco/LICENSE new file mode 100644 index 000000000..9ca94bcdf --- /dev/null +++ b/tests/core/assets/Shoco/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 2016-2021 Ginger Bill. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/tests/core/assets/Shoco/LICENSE.shoco b/tests/core/assets/Shoco/LICENSE.shoco new file mode 100644 index 0000000000000000000000000000000000000000..5d5e4d6236019bf208cc2ebb7a81ed06469b78a8 GIT binary patch literal 1269 zcmah{O=}cE6pS}Bg5XV079PalxF%5)^kUCU?{3TN^w{0A>*B?HY+}H~xDx`oi3E&d zqUIt(5=6*Jy{V{(hy;uW1AY+vKKOxN1%H6ACmW3@dTAc7Usu(uYX8{a$aL?KA#CYt zL3?Z4u5InD?QJN`HP_+w&E~*nVeeBctgjEB%sGyFaC+$Dxl6|}+KsCoBQqUx_>RQ>;av8k~9e?XTDtcz)f#vB>};yZd=z)$zV@`(U(t`ve~CtK;?l>5il6 z(#GTnO}!P?I8w7Chp0ApqHdc59XCii70X*)eBOkCiN=*R;Y@0A7uQU`e_T&-a|HMB z;vp{JfmgpwMh`ArnFQ_dJ;mEq!za-*)87#ObmPnQSq?}CYh8UkeO)x%iC1SP2W%X> z$4QDQ3Jopurot2l)v=Og5%2(B6{g7H%ebmUp=eN)VZfCJivsFKMhP!5k{X+srk9%> zd%>bA_`z6ltsxaeDGmjJ5xQcL5nQ_vksl_3hzc$U0Fg8ZMM)SMGt#xB&Y#a9^C)rU z7YT)VA{3^Y3CRl+S*|>hF~m$6;U^(eh!Yh{%|UB9fzW=)M2QDEVkbuMGLH;&k%i%3 zx3t=S+tK4Bl6fI_GA7zG5Q_W8uJfz%$vM&&y3jHAg)R6&P988-bsLzPA4q73E}ejt zSb=M7`Hv-(iJvH5vYN>Uop{;^lNgSIlz}zc(Oi{<&-Gq}(psNKqPdHJ8I} + Odin logo +
+ The Data-Oriented Language for Sane Software Development. +
+
+ + + + + + +
+ + + + + + +

+ +# The Odin Programming Language + + +Odin is a general-purpose programming language with distinct typing, built for high performance, modern systems, and built-in data-oriented data types. The Odin Programming Language, the C alternative for the joy of programming. + +Website: [https://odin-lang.org/](https://odin-lang.org/) + +```odin +package main + +import "core:fmt" + +main :: proc() { + program := "+ + * 😃 - /" + accumulator := 0 + + for token in program { + switch token { + case '+': accumulator += 1 + case '-': accumulator -= 1 + case '*': accumulator *= 2 + case '/': accumulator /= 2 + case '😃': accumulator *= accumulator + case: // Ignore everything else + } + } + + fmt.printf("The program \"%s\" calculates the value %d\n", + program, accumulator) +} + +``` + +## Documentation + +#### [Getting Started](https://odin-lang.org/docs/install) + +Instructions for downloading and installing the Odin compiler and libraries. + +#### [Nightly Builds](https://odin-lang.org/docs/nightly/) + +Get the latest nightly builds of Odin. + +### Learning Odin + +#### [Overview of Odin](https://odin-lang.org/docs/overview) + +An overview of the Odin programming language. + +#### [Frequently Asked Questions (FAQ)](https://odin-lang.org/docs/faq) + +Answers to common questions about Odin. + +#### [Packages](https://pkg.odin-lang.org/) + +Documentation for all the official packages part of the [core](https://pkg.odin-lang.org/core/) and [vendor](https://pkg.odin-lang.org/vendor/) library collections. + +#### [The Odin Wiki](https://github.com/odin-lang/Odin/wiki) + +A wiki maintained by the Odin community. + +#### [Odin Discord](https://discord.gg/sVBPHEv) + +Get live support and talk with other odiners on the Odin Discord. + +### Articles + +#### [The Odin Blog](https://odin-lang.org/news/) + +The official blog of the Odin programming language, featuring announcements, news, and in-depth articles by the Odin team and guests. + +## Warnings + +* The Odin compiler is still in development. diff --git a/tests/core/assets/Shoco/README.md.shoco b/tests/core/assets/Shoco/README.md.shoco new file mode 100644 index 0000000000000000000000000000000000000000..013f4f46928fb3d5c6ea62d76ddda91f29c6e420 GIT binary patch literal 2227 zcmb_eZ%i9y7)PfcxS7ZoGd~#fEaBQ-k6W+3qjxPf zYC>CJWrU6`YCtCgWoR-o!-q{UF$3*1i-IUxNkiNghgqT@O#E!(``#apDK*B}K(6m| z&+~hJ&-47=C#_L{n-M~8I{SPdeTV}5sTmeP4SU`6N2(V|vLG|+OpsN^Y2YNyO*b!u zfLLjmicP!eIp3(Osn1P%LqoV9o(QS`lz)fu^`-;E}x(e4@V52eP04=7Z z1P5FfC5E%64(RvkK1>QWzGCi--aLh$Bsj_Dq2Yj0 z9_sOJIUf!Uh*4el*m6pa!C8w8OHu8-XZ2ebbXYRQ^TVoU(*inK@^@P)MRj#`VINB2 zya95XatcLdehF(pXNz3^phif&IRI-G8mHZLUm5Nq8rH}y9)ct_qo7~DtCj^v@*7pv8`pc zwag6_rZ2Ls$hKO+A1j5D|17L!;BMuHbap<8<&>LNFM`BH>*7lgAMAxPHTj<%Qu5KxpDm zFE5d^h2I?Qi;8@&;gm0fY&hWzwIMJMIKm`;|4rIre&j+=B#x=qs(}QwMi#%s<(C|( zZ7t20#n1KV8PxR*oP*imwGi|eVcd^#y9V6#7G3N~8%PNVEWQQiO~EMEoJhmDON8m? zzj{SZ0^^<}K{>4%6?9~a^5JBQP$`*6M|80+oX?58!)|zLF_^uZYU)w9I$-Xjb}=B@ z(SO-@cob+ZAdtle(Tr5pBtYZ+5i9m literal 0 HcmV?d00001 diff --git a/tests/core/compress/test_core_compress.odin b/tests/core/compress/test_core_compress.odin index 51952a568..ee7233e52 100644 --- a/tests/core/compress/test_core_compress.odin +++ b/tests/core/compress/test_core_compress.odin @@ -7,13 +7,14 @@ package test_core_compress List of contributors: Jeroen van Rijn: Initial implementation. - A test suite for ZLIB, GZIP. + A test suite for ZLIB, GZIP and Shoco. */ import "core:testing" import "core:compress/zlib" import "core:compress/gzip" +import "core:compress/shoco" import "core:bytes" import "core:fmt" @@ -48,6 +49,7 @@ main :: proc() { t := testing.T{w=w} zlib_test(&t) gzip_test(&t) + shoco_test(&t) fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) if TEST_fail > 0 { @@ -134,3 +136,56 @@ gzip_test :: proc(t: ^testing.T) { expect(t, false, error) } } + +@test +shoco_test :: proc(t: ^testing.T) { + + Shoco_Tests :: []struct{ + compressed: []u8, + raw: []u8, + short_pack: int, + short_sentinel: int, + }{ + { #load("../assets/Shoco/README.md.shoco"), #load("../assets/Shoco/README.md"), 10, 1006 }, + { #load("../assets/Shoco/LICENSE.shoco"), #load("../assets/Shoco/LICENSE"), 25, 68 }, + } + + for v in Shoco_Tests { + expected_raw := len(v.raw) + expected_compressed := len(v.compressed) + + biggest_unpacked := shoco.decompress_bound(expected_compressed) + biggest_packed := shoco.compress_bound(expected_raw) + + buffer := make([]u8, max(biggest_packed, biggest_unpacked)) + defer delete(buffer) + + size, err := shoco.decompress(v.compressed, buffer[:]) + msg := fmt.tprintf("Expected `decompress` to return `nil`, got %v", err) + expect(t, err == nil, msg) + + msg = fmt.tprintf("Decompressed %v bytes into %v. Expected to decompress into %v bytes.", len(v.compressed), size, expected_raw) + expect(t, size == expected_raw, msg) + expect(t, string(buffer[:size]) == string(v.raw), "Decompressed contents don't match.") + + size, err = shoco.compress(string(v.raw), buffer[:]) + expect(t, err == nil, "Expected `compress` to return `nil`.") + + msg = fmt.tprintf("Compressed %v bytes into %v. Expected to compress into %v bytes.", expected_raw, size, expected_compressed) + expect(t, size == expected_compressed, msg) + + size, err = shoco.decompress(v.compressed, buffer[:expected_raw - 10]) + msg = fmt.tprintf("Decompressing into too small a buffer returned %v, expected `.Output_Too_Short`", err) + expect(t, err == .Output_Too_Short, msg) + + size, err = shoco.compress(string(v.raw), buffer[:expected_compressed - 10]) + msg = fmt.tprintf("Compressing into too small a buffer returned %v, expected `.Output_Too_Short`", err) + expect(t, err == .Output_Too_Short, msg) + + size, err = shoco.decompress(v.compressed[:v.short_pack], buffer[:]) + expect(t, err == .Stream_Too_Short, "Expected `decompress` to return `Stream_Too_Short` because there was no more data after selecting a pack.") + + size, err = shoco.decompress(v.compressed[:v.short_sentinel], buffer[:]) + expect(t, err == .Stream_Too_Short, "Expected `decompress` to return `Stream_Too_Short` because there was no more data after non-ASCII sentinel.") + } +} \ No newline at end of file From ac9a358c65820894968cc11b55b08de0646d98d4 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 22 Apr 2022 17:52:38 +0200 Subject: [PATCH 067/245] [shoco] Replace 2D slices in model with 1D slices. --- core/compress/shoco/model.odin | 230 ++++++++++++++++----------------- core/compress/shoco/shoco.odin | 22 ++-- 2 files changed, 127 insertions(+), 125 deletions(-) diff --git a/core/compress/shoco/model.odin b/core/compress/shoco/model.odin index 49e3dd97e..bbc38903d 100644 --- a/core/compress/shoco/model.odin +++ b/core/compress/shoco/model.odin @@ -17,123 +17,123 @@ DEFAULT_MODEL :: Shoco_Model { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 26, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, -1, -1, -1, -1, -1, 23, 29, -1, -1, 31, 24, -1, -1, -1, -1, -1, -1, 25, -1, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 15, 11, 14, 0, 17, 18, 5, 2, -1, 21, 9, 13, 6, 3, 16, -1, 7, 8, 4, 10, 19, 12, 28, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, successors_by_bigram = { - {7, 4, 12, -1, 6, -1, 1, 0, 3, 5, -1, 9, -1, 8, 2, -1, 15, 14, -1, 10, 11, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1}, - {-1, -1, 6, -1, 1, -1, 0, 3, 2, 4, 15, 11, -1, 9, 5, 10, 13, -1, 12, 8, 7, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {9, 11, -1, 4, 2, -1, 0, 8, 1, 5, -1, 6, -1, 3, 7, 15, -1, 12, 10, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {-1, -1, 14, 7, 5, -1, 1, 2, 8, 9, 0, 15, 6, 4, 11, -1, 12, 3, -1, 10, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {2, 4, 3, 1, 5, 0, -1, 6, 10, 9, 7, 12, 11, -1, -1, -1, -1, 13, -1, -1, 8, -1, 15, -1, -1, -1, 14, -1, -1, -1, -1, -1}, - {0, 1, 2, 3, 4, -1, -1, 5, 9, 10, 6, -1, -1, 8, 15, 11, -1, 14, -1, -1, 7, -1, 13, -1, -1, -1, 12, -1, -1, -1, -1, -1}, - {2, 8, 7, 4, 3, -1, 9, -1, 6, 11, -1, 5, -1, -1, 0, -1, -1, 14, 1, 15, 10, 12, -1, -1, -1, -1, 13, -1, -1, -1, -1, -1}, - {0, 3, 1, 2, 6, -1, 9, 8, 4, 12, 13, 10, -1, 11, 7, -1, -1, 15, 14, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {0, 6, 3, 4, 1, 2, -1, -1, 5, 10, 7, 9, 11, 12, -1, -1, 8, 14, -1, -1, 15, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {0, 6, 2, 5, 9, -1, -1, -1, 10, 1, 8, -1, 12, 14, 4, -1, 15, 7, -1, 13, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {8, 10, 9, 15, 1, -1, 4, 0, 3, 2, -1, 6, -1, 12, 11, 13, 7, 14, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {1, 3, 6, 0, 4, 2, -1, 7, 13, 8, 9, 11, -1, -1, 15, -1, -1, -1, -1, -1, 10, 5, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {3, 0, 1, 4, -1, 2, 5, 6, 7, 8, -1, 14, -1, -1, 9, 15, -1, 12, -1, -1, -1, 10, 11, -1, -1, -1, 13, -1, -1, -1, -1, -1}, - {0, 1, 3, 2, 15, -1, 12, -1, 7, 14, 4, -1, -1, 9, -1, 8, 5, 10, -1, -1, 6, -1, 13, -1, -1, -1, 11, -1, -1, -1, -1, -1}, - {0, 3, 1, 2, -1, -1, 12, 6, 4, 9, 7, -1, -1, 14, 8, -1, -1, 15, 11, 13, 5, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {0, 5, 7, 2, 10, 13, -1, 6, 8, 1, 3, -1, -1, 14, 15, 11, -1, -1, -1, 12, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {0, 2, 6, 3, 7, 10, -1, 1, 9, 4, 8, -1, -1, 15, -1, 12, 5, -1, -1, -1, 11, -1, 13, -1, -1, -1, 14, -1, -1, -1, -1, -1}, - {1, 3, 4, 0, 7, -1, 12, 2, 11, 8, 6, 13, -1, -1, -1, -1, -1, 5, -1, -1, 10, 15, 9, -1, -1, -1, 14, -1, -1, -1, -1, -1}, - {1, 3, 5, 2, 13, 0, 9, 4, 7, 6, 8, -1, -1, 15, -1, 11, -1, -1, 10, -1, 14, -1, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {0, 2, 1, 3, -1, -1, -1, 6, -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {1, 11, 4, 0, 3, -1, 13, 12, 2, 7, -1, -1, 15, 10, 5, 8, 14, -1, -1, -1, -1, -1, 9, -1, -1, -1, 6, -1, -1, -1, -1, -1}, - {0, 9, 2, 14, 15, 4, 1, 13, 3, 5, -1, -1, 10, -1, -1, -1, -1, 6, 12, -1, 7, -1, 8, -1, -1, -1, 11, -1, -1, -1, -1, -1}, - {-1, 2, 14, -1, 1, 5, 8, 7, 4, 12, -1, 6, 9, 11, 13, 3, 10, 15, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {0, 1, 3, 2, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {4, 3, 1, 5, -1, -1, -1, 0, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {2, 8, 4, 1, -1, 0, -1, 6, -1, -1, 5, -1, 7, -1, -1, -1, -1, -1, -1, -1, 10, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1}, - {12, 5, -1, -1, 1, -1, -1, 7, 0, 3, -1, 2, -1, 4, 6, -1, -1, -1, -1, 8, -1, -1, 15, -1, 13, 9, -1, -1, -1, -1, -1, 11}, - {1, 3, 2, 4, -1, -1, -1, 5, -1, 7, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1}, - {5, 3, 4, 12, 1, 6, -1, -1, -1, -1, 8, 2, -1, -1, -1, -1, 0, 9, -1, -1, 11, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1}, - {-1, -1, -1, -1, 0, -1, 1, 12, 3, -1, -1, -1, -1, 5, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, 6, -1, 10}, - {2, 3, 1, 4, -1, 0, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1}, - {5, 1, 3, 0, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, 9, -1, -1, 6, -1, 7}, + 7, 4, 12, -1, 6, -1, 1, 0, 3, 5, -1, 9, -1, 8, 2, -1, 15, 14, -1, 10, 11, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, + 1, -1, 6, -1, 1, -1, 0, 3, 2, 4, 15, 11, -1, 9, 5, 10, 13, -1, 12, 8, 7, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 9, 11, -1, 4, 2, -1, 0, 8, 1, 5, -1, 6, -1, 3, 7, 15, -1, 12, 10, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 14, 7, 5, -1, 1, 2, 8, 9, 0, 15, 6, 4, 11, -1, 12, 3, -1, 10, -1, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 2, 4, 3, 1, 5, 0, -1, 6, 10, 9, 7, 12, 11, -1, -1, -1, -1, 13, -1, -1, 8, -1, 15, -1, -1, -1, 14, -1, -1, -1, -1, -1, + 0, 1, 2, 3, 4, -1, -1, 5, 9, 10, 6, -1, -1, 8, 15, 11, -1, 14, -1, -1, 7, -1, 13, -1, -1, -1, 12, -1, -1, -1, -1, -1, + 2, 8, 7, 4, 3, -1, 9, -1, 6, 11, -1, 5, -1, -1, 0, -1, -1, 14, 1, 15, 10, 12, -1, -1, -1, -1, 13, -1, -1, -1, -1, -1, + 0, 3, 1, 2, 6, -1, 9, 8, 4, 12, 13, 10, -1, 11, 7, -1, -1, 15, 14, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 6, 3, 4, 1, 2, -1, -1, 5, 10, 7, 9, 11, 12, -1, -1, 8, 14, -1, -1, 15, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 6, 2, 5, 9, -1, -1, -1, 10, 1, 8, -1, 12, 14, 4, -1, 15, 7, -1, 13, 3, 11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 8, 10, 9, 15, 1, -1, 4, 0, 3, 2, -1, 6, -1, 12, 11, 13, 7, 14, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 1, 3, 6, 0, 4, 2, -1, 7, 13, 8, 9, 11, -1, -1, 15, -1, -1, -1, -1, -1, 10, 5, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 3, 0, 1, 4, -1, 2, 5, 6, 7, 8, -1, 14, -1, -1, 9, 15, -1, 12, -1, -1, -1, 10, 11, -1, -1, -1, 13, -1, -1, -1, -1, -1, + 0, 1, 3, 2, 15, -1, 12, -1, 7, 14, 4, -1, -1, 9, -1, 8, 5, 10, -1, -1, 6, -1, 13, -1, -1, -1, 11, -1, -1, -1, -1, -1, + 0, 3, 1, 2, -1, -1, 12, 6, 4, 9, 7, -1, -1, 14, 8, -1, -1, 15, 11, 13, 5, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 5, 7, 2, 10, 13, -1, 6, 8, 1, 3, -1, -1, 14, 15, 11, -1, -1, -1, 12, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 2, 6, 3, 7, 10, -1, 1, 9, 4, 8, -1, -1, 15, -1, 12, 5, -1, -1, -1, 11, -1, 13, -1, -1, -1, 14, -1, -1, -1, -1, -1, + 1, 3, 4, 0, 7, -1, 12, 2, 11, 8, 6, 13, -1, -1, -1, -1, -1, 5, -1, -1, 10, 15, 9, -1, -1, -1, 14, -1, -1, -1, -1, -1, + 1, 3, 5, 2, 13, 0, 9, 4, 7, 6, 8, -1, -1, 15, -1, 11, -1, -1, 10, -1, 14, -1, 12, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 2, 1, 3, -1, -1, -1, 6, -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 1, 11, 4, 0, 3, -1, 13, 12, 2, 7, -1, -1, 15, 10, 5, 8, 14, -1, -1, -1, -1, -1, 9, -1, -1, -1, 6, -1, -1, -1, -1, -1, + 0, 9, 2, 14, 15, 4, 1, 13, 3, 5, -1, -1, 10, -1, -1, -1, -1, 6, 12, -1, 7, -1, 8, -1, -1, -1, 11, -1, -1, -1, -1, -1, + -1, 2, 14, -1, 1, 5, 8, 7, 4, 12, -1, 6, 9, 11, 13, 3, 10, 15, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 1, 3, 2, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 4, 3, 1, 5, -1, -1, -1, 0, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 2, 8, 4, 1, -1, 0, -1, 6, -1, -1, 5, -1, 7, -1, -1, -1, -1, -1, -1, -1, 10, -1, -1, 9, -1, -1, -1, -1, -1, -1, -1, -1, + 12, 5, -1, -1, 1, -1, -1, 7, 0, 3, -1, 2, -1, 4, 6, -1, -1, -1, -1, 8, -1, -1, 15, -1, 13, 9, -1, -1, -1, -1, -1, 11, + 1, 3, 2, 4, -1, -1, -1, 5, -1, 7, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, + 5, 3, 4, 12, 1, 6, -1, -1, -1, -1, 8, 2, -1, -1, -1, -1, 0, 9, -1, -1, 11, -1, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 0, -1, 1, 12, 3, -1, -1, -1, -1, 5, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1, -1, 6, -1, 10, + 2, 3, 1, 4, -1, 0, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, 6, -1, -1, + 5, 1, 3, 0, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, 9, -1, -1, 6, -1, 7, }, successors_reversed = { - {'s', 't', 'c', 'l', 'm', 'a', 'd', 'r', 'v', 'T', 'A', 'L', 'e', 'M', 'Y', '-'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'-', 't', 'a', 'b', 's', 'h', 'c', 'r', 'n', 'w', 'p', 'm', 'l', 'd', 'i', 'f'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'u', 'e', 'i', 'a', 'o', 'r', 'y', 'l', 'I', 'E', 'R', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'e', 'a', 'o', 'i', 'u', 'A', 'y', 'E', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'t', 'n', 'f', 's', '\'', 'm', 'I', 'N', 'A', 'E', 'L', 'Z', 'r', 'V', 'R', 'C'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'o', 'a', 'y', 'i', 'u', 'e', 'I', 'L', 'D', '\'', 'E', 'Y', '\x00', '\x00', '\x00', '\x00'}, - {'r', 'i', 'y', 'a', 'e', 'o', 'u', 'Y', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'h', 'o', 'e', 'E', 'i', 'u', 'r', 'w', 'a', 'H', 'y', 'R', 'Z', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'h', 'i', 'e', 'a', 'o', 'r', 'I', 'y', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'n', 't', 's', 'r', 'l', 'd', 'i', 'y', 'v', 'm', 'b', 'c', 'g', 'p', 'k', 'u'}, - {'e', 'l', 'o', 'u', 'y', 'a', 'r', 'i', 's', 'j', 't', 'b', 'v', 'h', 'm', 'd'}, - {'o', 'e', 'h', 'a', 't', 'k', 'i', 'r', 'l', 'u', 'y', 'c', 'q', 's', '-', 'd'}, - {'e', 'i', 'o', 'a', 's', 'y', 'r', 'u', 'd', 'l', '-', 'g', 'n', 'v', 'm', 'f'}, - {'r', 'n', 'd', 's', 'a', 'l', 't', 'e', 'm', 'c', 'v', 'y', 'i', 'x', 'f', 'p'}, - {'o', 'e', 'r', 'a', 'i', 'f', 'u', 't', 'l', '-', 'y', 's', 'n', 'c', '\'', 'k'}, - {'h', 'e', 'o', 'a', 'r', 'i', 'l', 's', 'u', 'n', 'g', 'b', '-', 't', 'y', 'm'}, - {'e', 'a', 'i', 'o', 't', 'r', 'u', 'y', 'm', 's', 'l', 'b', '\'', '-', 'f', 'd'}, - {'n', 's', 't', 'm', 'o', 'l', 'c', 'd', 'r', 'e', 'g', 'a', 'f', 'v', 'z', 'b'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'e', 'n', 'i', 's', 'h', 'l', 'f', 'y', '-', 'a', 'w', '\'', 'g', 'r', 'o', 't'}, - {'e', 'l', 'i', 'y', 'd', 'o', 'a', 'f', 'u', 't', 's', 'k', 'w', 'v', 'm', 'p'}, - {'e', 'a', 'o', 'i', 'u', 'p', 'y', 's', 'b', 'm', 'f', '\'', 'n', '-', 'l', 't'}, - {'d', 'g', 'e', 't', 'o', 'c', 's', 'i', 'a', 'n', 'y', 'l', 'k', '\'', 'f', 'v'}, - {'u', 'n', 'r', 'f', 'm', 't', 'w', 'o', 's', 'l', 'v', 'd', 'p', 'k', 'i', 'c'}, - {'e', 'r', 'a', 'o', 'l', 'p', 'i', 't', 'u', 's', 'h', 'y', 'b', '-', '\'', 'm'}, - {'\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'e', 'i', 'o', 'a', 's', 'y', 't', 'd', 'r', 'n', 'c', 'm', 'l', 'u', 'g', 'f'}, - {'e', 't', 'h', 'i', 'o', 's', 'a', 'u', 'p', 'c', 'l', 'w', 'm', 'k', 'f', 'y'}, - {'h', 'o', 'e', 'i', 'a', 't', 'r', 'u', 'y', 'l', 's', 'w', 'c', 'f', '\'', '-'}, - {'r', 't', 'l', 's', 'n', 'g', 'c', 'p', 'e', 'i', 'a', 'd', 'm', 'b', 'f', 'o'}, - {'e', 'i', 'a', 'o', 'y', 'u', 'r', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00'}, - {'a', 'i', 'h', 'e', 'o', 'n', 'r', 's', 'l', 'd', 'k', '-', 'f', '\'', 'c', 'b'}, - {'p', 't', 'c', 'a', 'i', 'e', 'h', 'q', 'u', 'f', '-', 'y', 'o', '\x00', '\x00', '\x00'}, - {'o', 'e', 's', 't', 'i', 'd', '\'', 'l', 'b', '-', 'm', 'a', 'r', 'n', 'p', 'w'}, + 's', 't', 'c', 'l', 'm', 'a', 'd', 'r', 'v', 'T', 'A', 'L', 'e', 'M', 'Y', '-', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '-', 't', 'a', 'b', 's', 'h', 'c', 'r', 'n', 'w', 'p', 'm', 'l', 'd', 'i', 'f', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'u', 'e', 'i', 'a', 'o', 'r', 'y', 'l', 'I', 'E', 'R', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'e', 'a', 'o', 'i', 'u', 'A', 'y', 'E', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 't', 'n', 'f', 's', '\'', 'm', 'I', 'N', 'A', 'E', 'L', 'Z', 'r', 'V', 'R', 'C', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'o', 'a', 'y', 'i', 'u', 'e', 'I', 'L', 'D', '\'', 'E', 'Y', '\x00', '\x00', '\x00', '\x00', + 'r', 'i', 'y', 'a', 'e', 'o', 'u', 'Y', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'h', 'o', 'e', 'E', 'i', 'u', 'r', 'w', 'a', 'H', 'y', 'R', 'Z', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'h', 'i', 'e', 'a', 'o', 'r', 'I', 'y', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'n', 't', 's', 'r', 'l', 'd', 'i', 'y', 'v', 'm', 'b', 'c', 'g', 'p', 'k', 'u', + 'e', 'l', 'o', 'u', 'y', 'a', 'r', 'i', 's', 'j', 't', 'b', 'v', 'h', 'm', 'd', + 'o', 'e', 'h', 'a', 't', 'k', 'i', 'r', 'l', 'u', 'y', 'c', 'q', 's', '-', 'd', + 'e', 'i', 'o', 'a', 's', 'y', 'r', 'u', 'd', 'l', '-', 'g', 'n', 'v', 'm', 'f', + 'r', 'n', 'd', 's', 'a', 'l', 't', 'e', 'm', 'c', 'v', 'y', 'i', 'x', 'f', 'p', + 'o', 'e', 'r', 'a', 'i', 'f', 'u', 't', 'l', '-', 'y', 's', 'n', 'c', '\'', 'k', + 'h', 'e', 'o', 'a', 'r', 'i', 'l', 's', 'u', 'n', 'g', 'b', '-', 't', 'y', 'm', + 'e', 'a', 'i', 'o', 't', 'r', 'u', 'y', 'm', 's', 'l', 'b', '\'', '-', 'f', 'd', + 'n', 's', 't', 'm', 'o', 'l', 'c', 'd', 'r', 'e', 'g', 'a', 'f', 'v', 'z', 'b', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'e', 'n', 'i', 's', 'h', 'l', 'f', 'y', '-', 'a', 'w', '\'', 'g', 'r', 'o', 't', + 'e', 'l', 'i', 'y', 'd', 'o', 'a', 'f', 'u', 't', 's', 'k', 'w', 'v', 'm', 'p', + 'e', 'a', 'o', 'i', 'u', 'p', 'y', 's', 'b', 'm', 'f', '\'', 'n', '-', 'l', 't', + 'd', 'g', 'e', 't', 'o', 'c', 's', 'i', 'a', 'n', 'y', 'l', 'k', '\'', 'f', 'v', + 'u', 'n', 'r', 'f', 'm', 't', 'w', 'o', 's', 'l', 'v', 'd', 'p', 'k', 'i', 'c', + 'e', 'r', 'a', 'o', 'l', 'p', 'i', 't', 'u', 's', 'h', 'y', 'b', '-', '\'', 'm', + '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'e', 'i', 'o', 'a', 's', 'y', 't', 'd', 'r', 'n', 'c', 'm', 'l', 'u', 'g', 'f', + 'e', 't', 'h', 'i', 'o', 's', 'a', 'u', 'p', 'c', 'l', 'w', 'm', 'k', 'f', 'y', + 'h', 'o', 'e', 'i', 'a', 't', 'r', 'u', 'y', 'l', 's', 'w', 'c', 'f', '\'', '-', + 'r', 't', 'l', 's', 'n', 'g', 'c', 'p', 'e', 'i', 'a', 'd', 'm', 'b', 'f', 'o', + 'e', 'i', 'a', 'o', 'y', 'u', 'r', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', + 'a', 'i', 'h', 'e', 'o', 'n', 'r', 's', 'l', 'd', 'k', '-', 'f', '\'', 'c', 'b', + 'p', 't', 'c', 'a', 'i', 'e', 'h', 'q', 'u', 'f', '-', 'y', 'o', '\x00', '\x00', '\x00', + 'o', 'e', 's', 't', 'i', 'd', '\'', 'l', 'b', '-', 'm', 'a', 'r', 'n', 'p', 'w', }, character_count = 32, diff --git a/core/compress/shoco/shoco.odin b/core/compress/shoco/shoco.odin index 9c5008f5d..3f5b696ea 100644 --- a/core/compress/shoco/shoco.odin +++ b/core/compress/shoco/shoco.odin @@ -14,6 +14,8 @@ package shoco import "core:intrinsics" import "core:compress" +import "core:fmt" + Shoco_Pack :: struct { word: u32, bytes_packed: i8, @@ -29,8 +31,8 @@ Shoco_Model :: struct { max_char: u8, characters_by_id: []u8, ids_by_character: [256]i16, - successors_by_bigram: [][]i8, - successors_reversed: [][]u8, + successors_by_bigram: []i8, + successors_reversed: []u8, character_count: u8, successor_count: u8, @@ -74,19 +76,15 @@ find_best_encoding :: proc(indices: []i16, n_consecutive: i8, model := DEFAULT_M } validate_model :: proc(model: Shoco_Model) -> (int, compress.Error) { - if len(model.successors_reversed) != int(model.max_char - model.min_char) { - return 0, .Unknown_Compression_Method - } - if len(model.characters_by_id) != int(model.character_count) { return 0, .Unknown_Compression_Method } - if len(model.successors_by_bigram) != int(model.character_count) || len(model.successors_by_bigram[0]) != int(model.character_count) { + if len(model.successors_by_bigram) != int(model.character_count) * int(model.character_count) { return 0, .Unknown_Compression_Method } - if len(model.successors_reversed[0]) != int(model.successor_count) { + if len(model.successors_reversed) != int(model.successor_count) * int(model.max_char - model.min_char) { return 0, .Unknown_Compression_Method } @@ -155,7 +153,11 @@ decompress_slice_to_output_buffer :: proc(input: []u8, output: []u8, model := DE offset = pack.offsets[i] mask = pack.masks[i] - last_chr = model.successors_reversed[last_chr - model.min_char][(code >> offset) & u32(mask)] + index_major := u32(last_chr - model.min_char) * u32(model.successor_count) + index_minor := (code >> offset) & u32(mask) + + last_chr = model.successors_reversed[index_major + index_minor] + output[out + i] = last_chr } @@ -242,7 +244,7 @@ compress_string_to_buffer :: proc(input: string, output: []u8, model := DEFAULT_ break } - successor_index := model.successors_by_bigram[last_chr_index][current_index] + successor_index := model.successors_by_bigram[last_chr_index * i16(model.character_count) + current_index] if successor_index < 0 { break } From b022167df12b3d62ddacd51e64f7ab3b4e170852 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 22 Apr 2022 17:56:34 +0200 Subject: [PATCH 068/245] Remove unused fmt. --- core/compress/shoco/shoco.odin | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/compress/shoco/shoco.odin b/core/compress/shoco/shoco.odin index 3f5b696ea..f94ce70b7 100644 --- a/core/compress/shoco/shoco.odin +++ b/core/compress/shoco/shoco.odin @@ -14,8 +14,6 @@ package shoco import "core:intrinsics" import "core:compress" -import "core:fmt" - Shoco_Pack :: struct { word: u32, bytes_packed: i8, From b44b6e7e5099cab83f4a6d0feb5af9f245dea738 Mon Sep 17 00:00:00 2001 From: Tetralux Date: Sat, 23 Apr 2022 03:33:35 +0000 Subject: [PATCH 069/245] [path/filepath] Add file stem and long-extension procedures Adds stem(), short_stem(), and long_ext(); also adds doc-comments to base() and ext(). The 'stem' is usually 'the name' of the file; the basename without the file extension. To this end, this adds stem(), which is such that: stem(path) + ext(path) = base(path) However, 'file extension' has two different meanings to what constitutes it! > What is the extension of: 'name.tar.gz' ? Colloquially, you would likely think of it as 'a tarball' - which you might think is '.tar.gz'. But, if you're writing code to process a file of this type, you would first treat it as a Gzip file, and then treat the result as a TAR file - i.e: '.gz' ... _followed by_ '.tar'. ext() returns '.gz' here, since that is the most-immediate format that you would need to use to decode it; it would be a Gzip stream. Sometimes though, you do actually want to consider these longer file extensions. Perhaps you're extracting a tarball, and what to know what to call the intermediate tar file; perhaps you want to check to see if this file is a tarball, or just a Gzip file; or maybe you just want 'the name' of the file, and not this "strange 'name-and-part-of-the-extension' thing". So, this also adds short_stem() and long_ext(), such that: short_stem(path) + long_ext(path) = base(path) Thus, we can use either, but the most immediately-useful one is the easiest to reach for: stem('name.tar.gz') -> 'name.tar' ext('name.tar.gz') -> '.gz' short_stem('name.tar.gz') -> 'name' long_ext('name.tar.gz') -> '.tar.gz' These procedures are identical to their counterparts when the path only has a simple extension: stem('name.txt') -> 'name' ext('name.txt') -> '.txt' short_stem('name.txt') -> 'name' long_ext('name.txt') -> '.txt' --- core/path/filepath/path.odin | 133 ++++++++++++++++++++++++++++++++--- 1 file changed, 124 insertions(+), 9 deletions(-) diff --git a/core/path/filepath/path.odin b/core/path/filepath/path.odin index 42714d736..32e4a8a37 100644 --- a/core/path/filepath/path.odin +++ b/core/path/filepath/path.odin @@ -4,6 +4,8 @@ package filepath import "core:strings" +SEPARATOR_CHARS :: `/\` + // is_separator checks whether the byte is a valid separator character is_separator :: proc(c: byte) -> bool { switch c { @@ -69,6 +71,16 @@ volume_name_len :: proc(path: string) -> int { return 0 } +/* + Gets the file name and extension from a path. + + i.e: + 'path/to/name.tar.gz' -> 'name.tar.gz' + 'path/to/name.txt' -> 'name.txt' + 'path/to/name' -> 'name' + + Returns "." if the path is an empty string. +*/ base :: proc(path: string) -> string { if path == "" { return "." @@ -94,6 +106,118 @@ base :: proc(path: string) -> string { return path } +/* + Gets the name of a file from a path. + + The stem of a file is such that stem(path) + ext(path) = base(path). + + Only the last dot is considered when splitting the file extension. + See `short_stem`. + + i.e: + 'name.tar.gz' -> 'name.tar' + 'name.txt' -> 'name' + + Returns an empty string if there is no stem. e.g: '.gitignore'. + Returns an empty string if there's a trailing path separator. +*/ +stem :: proc(path: string) -> string { + if len(path) > 0 && is_separator(path[len(path) - 1]) { + // NOTE(tetra): Trailing separator + return "" + } + + // NOTE(tetra): Get the basename + path := path + if i := strings.last_index_any(path, SEPARATOR_CHARS); i != -1 { + path = path[i+1:] + } + + if i := strings.last_index_byte(path, '.'); i != -1 { + return path[:i] + } + + return path +} + +/* + Gets the name of a file from a path. + + The short stem is such that short_stem(path) + long_ext(path) = base(path). + + The first dot is used to split off the file extension, unlike `stem` which uses the last dot. + + i.e: + 'name.tar.gz' -> 'name' + 'name.txt' -> 'name' + + Returns an empty string if there is no stem. e.g: '.gitignore'. + Returns an empty string if there's a trailing path separator. +*/ +short_stem :: proc(path: string) -> string { + s := stem(path) + if i := strings.index_byte(s, '.'); i != -1 { + return s[:i] + } + return s +} + +/* + Gets the file extension from a path, including the dot. + + The file extension is such that stem(path) + ext(path) = base(path). + + Only the last dot is considered when splitting the file extension. + See `long_ext`. + + i.e: + 'name.tar.gz' -> '.gz' + 'name.txt' -> '.txt' + + Returns an empty string if there is no dot. + Returns an empty string if there is a trailing path separator. +*/ +ext :: proc(path: string) -> string { + for i := len(path)-1; i >= 0 && !is_separator(path[i]); i -= 1 { + if path[i] == '.' { + return path[i:] + } + } + return "" +} + +/* + Gets the file extension from a path, including the dot. + + The long file extension is such that short_stem(path) + long_ext(path) = base(path). + + The first dot is used to split off the file extension, unlike `ext` which uses the last dot. + + i.e: + 'name.tar.gz' -> '.tar.gz' + 'name.txt' -> '.txt' + + Returns an empty string if there is no dot. + Returns an empty string if there is a trailing path separator. +*/ +long_ext :: proc(path: string) -> string { + if len(path) > 0 && is_separator(path[len(path) - 1]) { + // NOTE(tetra): Trailing separator + return "" + } + + // NOTE(tetra): Get the basename + path := path + if i := strings.last_index_any(path, SEPARATOR_CHARS); i != -1 { + path = path[i+1:] + } + + if i := strings.index_byte(path, '.'); i != -1 { + return path[i:] + } + + return "" +} clean :: proc(path: string, allocator := context.allocator) -> string { context.allocator = allocator @@ -189,15 +313,6 @@ to_slash :: proc(path: string, allocator := context.allocator) -> (new_path: str return strings.replace_all(path, SEPARATOR_STRING, "/", allocator) } -ext :: proc(path: string) -> string { - for i := len(path)-1; i >= 0 && !is_separator(path[i]); i -= 1 { - if path[i] == '.' { - return path[i:] - } - } - return "" -} - Relative_Error :: enum { None, From 3cab2592c3e5a06882ffd711871a08c893b043f1 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 6 Apr 2022 18:26:23 +0200 Subject: [PATCH 070/245] Compiler: Add early error for output path being a directory. - Introduce new `Path` type and an array of build paths on the build context. - Resolve input and output paths/files early (before parsing). - Error early if inputs are missing or outputs are directories. - Plumb new file path generation into linker stage instead of its adhoc method. TODO: - Remove more adhoc file path generation in parser and linker stage. - Make intermediate object file generation use new path system. - Round out and robustify Path helper functions. --- .gitignore | 1 + Makefile | 4 +- build_odin.sh | 4 +- src/build_settings.cpp | 220 +++++++++++++++++++--- src/common.cpp | 257 +------------------------- src/gb/gb.h | 50 +++-- src/llvm_backend.cpp | 14 +- src/llvm_backend_general.cpp | 1 - src/main.cpp | 152 ++++++++-------- src/parser.cpp | 2 +- src/path.cpp | 333 ++++++++++++++++++++++++++++++++++ src/string.cpp | 10 +- tests/core/build.bat | 28 +-- tests/core/math/big/build.bat | 2 +- tests/issues/run.sh | 4 +- 15 files changed, 676 insertions(+), 406 deletions(-) create mode 100644 src/path.cpp diff --git a/.gitignore b/.gitignore index e8b3d3050..d03a86fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -269,6 +269,7 @@ bin/ # - Linux/MacOS odin odin.dSYM +*.bin # shared collection shared/ diff --git a/Makefile b/Makefile index 82150c6a2..1a1c93180 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -all: debug demo +all: debug demo: - ./odin run examples/demo/demo.odin + ./odin run examples/demo report: ./odin report diff --git a/build_odin.sh b/build_odin.sh index aef3f2836..4810cafd2 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -102,7 +102,7 @@ build_odin() { } run_demo() { - ./odin run examples/demo/demo.odin -file + ./odin run examples/demo } case $OS in @@ -147,4 +147,4 @@ if [[ $# -eq 1 ]]; then exit 0 else panic "Too many arguments!" -fi +fi \ No newline at end of file diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 2f3eb03a5..0b582eac8 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -3,7 +3,6 @@ #include #endif - // #if defined(GB_SYSTEM_WINDOWS) // #define DEFAULT_TO_THREADED_CHECKER // #endif @@ -198,6 +197,22 @@ enum RelocMode : u8 { RelocMode_DynamicNoPIC, }; +enum BuildPath : u8 { + BuildPath_Main_Package, // Input Path to the package directory (or file) we're building. + BuildPath_RC, // Input Path for .rc file, can be set with `-resource:`. + BuildPath_RES, // Output Path for .res file, generated from previous. + BuildPath_Win_SDK_Root, // windows_sdk_root + BuildPath_Win_SDK_UM_Lib, // windows_sdk_um_library_path + BuildPath_Win_SDK_UCRT_Lib, // windows_sdk_ucrt_library_path + BuildPath_VS_EXE, // vs_exe_path + BuildPath_VS_LIB, // vs_library_path + + BuildPath_Output, // Output Path for .exe, .dll, .so, etc. Can be overridden with `-out:`. + BuildPath_PDB, // Output Path for .pdb file, can be overridden with `-pdb-name:`. + + BuildPathCOUNT, +}; + // This stores the information for the specify architecture of this build struct BuildContext { // Constants @@ -226,9 +241,13 @@ struct BuildContext { bool show_help; + Array build_paths; // Contains `Path` objects to output filename, pdb, resource and intermediate files. + // BuildPath enum contains the indices of paths we know *before* the work starts. + String out_filepath; String resource_filepath; String pdb_filepath; + bool has_resource; String link_flags; String extra_linker_flags; @@ -300,8 +319,6 @@ struct BuildContext { }; - - gb_global BuildContext build_context = {0}; bool global_warnings_as_errors(void) { @@ -605,28 +622,6 @@ bool allow_check_foreign_filepath(void) { // is_abs_path // has_subdir -enum TargetFileValidity : u8 { - TargetFileValidity_Invalid, - - TargetFileValidity_Writable_File, - TargetFileValidity_No_Write_Permission, - TargetFileValidity_Directory, - - TargetTargetFileValidity_COUNT, -}; - -TargetFileValidity set_output_filename(void) { - // Assembles the output filename from build_context information. - // Returns `true` if it doesn't exist or is a file. - // Returns `false` if a directory or write-protected file. - - - - - return TargetFileValidity_Writable_File; -} - - String const WIN32_SEPARATOR_STRING = {cast(u8 *)"\\", 1}; String const NIX_SEPARATOR_STRING = {cast(u8 *)"/", 1}; @@ -973,7 +968,6 @@ char *token_pos_to_string(TokenPos const &pos) { return s; } - void init_build_context(TargetMetrics *cross_target) { BuildContext *bc = &build_context; @@ -1152,8 +1146,178 @@ void init_build_context(TargetMetrics *cross_target) { bc->optimization_level = gb_clamp(bc->optimization_level, 0, 3); - - #undef LINK_FLAG_X64 #undef LINK_FLAG_386 } + +#if defined(GB_SYSTEM_WINDOWS) +// NOTE(IC): In order to find Visual C++ paths without relying on environment variables. +// NOTE(Jeroen): No longer needed in `main.cpp -> linker_stage`. We now resolve those paths in `init_build_paths`. +#include "microsoft_craziness.h" +#endif + +// NOTE(Jeroen): Set/create the output and other paths and report an error as appropriate. +// We've previously called `parse_build_flags`, so `out_filepath` should be set. +bool init_build_paths(String init_filename) { + gbAllocator ha = heap_allocator(); + BuildContext *bc = &build_context; + + // NOTE(Jeroen): We're pre-allocating BuildPathCOUNT slots so that certain paths are always at the same enumerated index. + array_init(&bc->build_paths, permanent_allocator(), BuildPathCOUNT); + + // [BuildPathMainPackage] Turn given init path into a `Path`, which includes normalizing it into a full path. + bc->build_paths[BuildPath_Main_Package] = path_from_string(ha, init_filename); + + bool produces_output_file = false; + if (bc->command_kind == Command_doc && bc->cmd_doc_flags & CmdDocFlag_DocFormat) { + produces_output_file = true; + } else if (bc->command_kind & Command__does_build) { + produces_output_file = true; + } + + if (!produces_output_file) { + // Command doesn't produce output files. We're done. + return true; + } + + #if defined(GB_SYSTEM_WINDOWS) + if (bc->resource_filepath.len > 0) { + bc->build_paths[BuildPath_RC] = path_from_string(ha, bc->resource_filepath); + bc->build_paths[BuildPath_RES] = path_from_string(ha, bc->resource_filepath); + bc->build_paths[BuildPath_RC].ext = copy_string(ha, STR_LIT("rc")); + bc->build_paths[BuildPath_RES].ext = copy_string(ha, STR_LIT("res")); + } + + if (bc->pdb_filepath.len > 0) { + bc->build_paths[BuildPath_PDB] = path_from_string(ha, bc->pdb_filepath); + } + + if ((bc->command_kind & Command__does_build) && (!bc->ignore_microsoft_magic)) { + // NOTE(ic): It would be nice to extend this so that we could specify the Visual Studio version that we want instead of defaulting to the latest. + Find_Result_Utf8 find_result = find_visual_studio_and_windows_sdk_utf8(); + + if (find_result.windows_sdk_version == 0) { + gb_printf_err("Windows SDK not found.\n"); + return false; + } + + GB_ASSERT(find_result.windows_sdk_um_library_path.len > 0); + GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); + + if (find_result.windows_sdk_root.len > 0) { + bc->build_paths[BuildPath_Win_SDK_Root] = path_from_string(ha, find_result.windows_sdk_root); + } + + if (find_result.windows_sdk_um_library_path.len > 0) { + bc->build_paths[BuildPath_Win_SDK_UM_Lib] = path_from_string(ha, find_result.windows_sdk_um_library_path); + } + + if (find_result.windows_sdk_ucrt_library_path.len > 0) { + bc->build_paths[BuildPath_Win_SDK_UCRT_Lib] = path_from_string(ha, find_result.windows_sdk_ucrt_library_path); + } + + if (find_result.vs_exe_path.len > 0) { + bc->build_paths[BuildPath_VS_EXE] = path_from_string(ha, find_result.vs_exe_path); + } + + if (find_result.vs_library_path.len > 0) { + bc->build_paths[BuildPath_VS_LIB] = path_from_string(ha, find_result.vs_library_path); + } + + gb_free(ha, find_result.windows_sdk_root.text); + gb_free(ha, find_result.windows_sdk_um_library_path.text); + gb_free(ha, find_result.windows_sdk_ucrt_library_path.text); + gb_free(ha, find_result.vs_exe_path.text); + gb_free(ha, find_result.vs_library_path.text); + + } + #endif + + // All the build targets and OSes. + String output_extension; + + if (bc->command_kind == Command_doc && bc->cmd_doc_flags & CmdDocFlag_DocFormat) { + output_extension = STR_LIT("odin-doc"); + } else if (is_arch_wasm()) { + output_extension = STR_LIT("wasm"); + } else if (build_context.build_mode == BuildMode_Executable) { + // By default use a .bin executable extension. + output_extension = STR_LIT("bin"); + + if (build_context.metrics.os == TargetOs_windows) { + output_extension = STR_LIT("exe"); + } else if (build_context.cross_compiling && selected_target_metrics->metrics == &target_essence_amd64) { + output_extension = make_string(nullptr, 0); + } + } else if (build_context.build_mode == BuildMode_DynamicLibrary) { + // By default use a .so shared library extension. + output_extension = STR_LIT("so"); + + if (build_context.metrics.os == TargetOs_windows) { + output_extension = STR_LIT("dll"); + } else if (build_context.metrics.os == TargetOs_darwin) { + output_extension = STR_LIT("dylib"); + } + } else if (build_context.build_mode == BuildMode_Object) { + // By default use a .o object extension. + output_extension = STR_LIT("o"); + + if (build_context.metrics.os == TargetOs_windows) { + output_extension = STR_LIT("obj"); + } + } else if (build_context.build_mode == BuildMode_Assembly) { + // By default use a .S asm extension. + output_extension = STR_LIT("S"); + } else if (build_context.build_mode == BuildMode_LLVM_IR) { + output_extension = STR_LIT("ll"); + } else { + GB_PANIC("Unhandled build mode/target combination.\n"); + } + + if (bc->out_filepath.len > 0) { + bc->build_paths[BuildPath_Output] = path_from_string(ha, bc->out_filepath); + } else { + String output_name = remove_directory_from_path(init_filename); + output_name = remove_extension_from_path(output_name); + output_name = copy_string(ha, string_trim_whitespace(output_name)); + + /* + NOTE(Jeroen): This fallback substitution can't be made at this stage. + if (gen->output_name.len == 0) { + gen->output_name = c->info.init_scope->pkg->name; + } + */ + Path output_path = path_from_string(ha, output_name); + + #ifndef GB_SYSTEM_WINDOWS + char cwd[4096]; + getcwd(&cwd[0], 4096); + + const u8 * cwd_str = (const u8 *)&cwd[0]; + output_path.basename = copy_string(ha, make_string(cwd_str, strlen(cwd))); + #endif + + // Replace extension. + if (output_path.ext.len > 0) { + gb_free(ha, output_path.ext.text); + } + output_path.ext = copy_string(ha, output_extension); + + bc->build_paths[BuildPath_Output] = output_path; + } + + // Do we have an extension? We might not if the output filename was supplied. + if (bc->build_paths[BuildPath_Output].ext.len == 0) { + bc->build_paths[BuildPath_Output].ext = copy_string(ha, output_extension); + } + + // Check if output path is a directory. + if (path_is_directory(bc->build_paths[BuildPath_Output])) { + String output_file = path_to_string(ha, bc->build_paths[BuildPath_Output]); + defer (gb_free(ha, output_file.text)); + gb_printf_err("Output path %.*s is a directory.\n", LIT(output_file)); + return false; + } + + return true; +} \ No newline at end of file diff --git a/src/common.cpp b/src/common.cpp index aaacda04b..94248fb62 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -675,262 +675,7 @@ wchar_t **command_line_to_wargv(wchar_t *cmd_line, int *_argc) { #endif - -#if defined(GB_SYSTEM_WINDOWS) - bool path_is_directory(String path) { - gbAllocator a = heap_allocator(); - String16 wstr = string_to_string16(a, path); - defer (gb_free(a, wstr.text)); - - i32 attribs = GetFileAttributesW(wstr.text); - if (attribs < 0) return false; - - return (attribs & FILE_ATTRIBUTE_DIRECTORY) != 0; - } - -#else - bool path_is_directory(String path) { - gbAllocator a = heap_allocator(); - char *copy = cast(char *)copy_string(a, path).text; - defer (gb_free(a, copy)); - - struct stat s; - if (stat(copy, &s) == 0) { - return (s.st_mode & S_IFDIR) != 0; - } - return false; - } -#endif - - -String path_to_full_path(gbAllocator a, String path) { - gbAllocator ha = heap_allocator(); - char *path_c = gb_alloc_str_len(ha, cast(char *)path.text, path.len); - defer (gb_free(ha, path_c)); - - char *fullpath = gb_path_get_full_name(a, path_c); - String res = string_trim_whitespace(make_string_c(fullpath)); -#if defined(GB_SYSTEM_WINDOWS) - for (isize i = 0; i < res.len; i++) { - if (res.text[i] == '\\') { - res.text[i] = '/'; - } - } -#endif - return res; -} - - - -struct FileInfo { - String name; - String fullpath; - i64 size; - bool is_dir; -}; - -enum ReadDirectoryError { - ReadDirectory_None, - - ReadDirectory_InvalidPath, - ReadDirectory_NotExists, - ReadDirectory_Permission, - ReadDirectory_NotDir, - ReadDirectory_Empty, - ReadDirectory_Unknown, - - ReadDirectory_COUNT, -}; - -i64 get_file_size(String path) { - char *c_str = alloc_cstring(heap_allocator(), path); - defer (gb_free(heap_allocator(), c_str)); - - gbFile f = {}; - gbFileError err = gb_file_open(&f, c_str); - defer (gb_file_close(&f)); - if (err != gbFileError_None) { - return -1; - } - return gb_file_size(&f); -} - - -#if defined(GB_SYSTEM_WINDOWS) -ReadDirectoryError read_directory(String path, Array *fi) { - GB_ASSERT(fi != nullptr); - - gbAllocator a = heap_allocator(); - - while (path.len > 0) { - Rune end = path[path.len-1]; - if (end == '/') { - path.len -= 1; - } else if (end == '\\') { - path.len -= 1; - } else { - break; - } - } - - if (path.len == 0) { - return ReadDirectory_InvalidPath; - } - { - char *c_str = alloc_cstring(a, path); - defer (gb_free(a, c_str)); - - gbFile f = {}; - gbFileError file_err = gb_file_open(&f, c_str); - defer (gb_file_close(&f)); - - switch (file_err) { - case gbFileError_Invalid: return ReadDirectory_InvalidPath; - case gbFileError_NotExists: return ReadDirectory_NotExists; - // case gbFileError_Permission: return ReadDirectory_Permission; - } - } - - if (!path_is_directory(path)) { - return ReadDirectory_NotDir; - } - - - char *new_path = gb_alloc_array(a, char, path.len+3); - defer (gb_free(a, new_path)); - - gb_memmove(new_path, path.text, path.len); - gb_memmove(new_path+path.len, "/*", 2); - new_path[path.len+2] = 0; - - String np = make_string(cast(u8 *)new_path, path.len+2); - String16 wstr = string_to_string16(a, np); - defer (gb_free(a, wstr.text)); - - WIN32_FIND_DATAW file_data = {}; - HANDLE find_file = FindFirstFileW(wstr.text, &file_data); - if (find_file == INVALID_HANDLE_VALUE) { - return ReadDirectory_Unknown; - } - defer (FindClose(find_file)); - - array_init(fi, a, 0, 100); - - do { - wchar_t *filename_w = file_data.cFileName; - i64 size = cast(i64)file_data.nFileSizeLow; - size |= (cast(i64)file_data.nFileSizeHigh) << 32; - String name = string16_to_string(a, make_string16_c(filename_w)); - if (name == "." || name == "..") { - gb_free(a, name.text); - continue; - } - - String filepath = {}; - filepath.len = path.len+1+name.len; - filepath.text = gb_alloc_array(a, u8, filepath.len+1); - defer (gb_free(a, filepath.text)); - gb_memmove(filepath.text, path.text, path.len); - gb_memmove(filepath.text+path.len, "/", 1); - gb_memmove(filepath.text+path.len+1, name.text, name.len); - - FileInfo info = {}; - info.name = name; - info.fullpath = path_to_full_path(a, filepath); - info.size = size; - info.is_dir = (file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; - array_add(fi, info); - } while (FindNextFileW(find_file, &file_data)); - - if (fi->count == 0) { - return ReadDirectory_Empty; - } - - return ReadDirectory_None; -} -#elif defined(GB_SYSTEM_LINUX) || defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_FREEBSD) || defined(GB_SYSTEM_OPENBSD) - -#include - -ReadDirectoryError read_directory(String path, Array *fi) { - GB_ASSERT(fi != nullptr); - - gbAllocator a = heap_allocator(); - - char *c_path = alloc_cstring(a, path); - defer (gb_free(a, c_path)); - - DIR *dir = opendir(c_path); - if (!dir) { - switch (errno) { - case ENOENT: - return ReadDirectory_NotExists; - case EACCES: - return ReadDirectory_Permission; - case ENOTDIR: - return ReadDirectory_NotDir; - default: - // ENOMEM: out of memory - // EMFILE: per-process limit on open fds reached - // ENFILE: system-wide limit on total open files reached - return ReadDirectory_Unknown; - } - GB_PANIC("unreachable"); - } - - array_init(fi, a, 0, 100); - - for (;;) { - struct dirent *entry = readdir(dir); - if (entry == nullptr) { - break; - } - - String name = make_string_c(entry->d_name); - if (name == "." || name == "..") { - continue; - } - - String filepath = {}; - filepath.len = path.len+1+name.len; - filepath.text = gb_alloc_array(a, u8, filepath.len+1); - defer (gb_free(a, filepath.text)); - gb_memmove(filepath.text, path.text, path.len); - gb_memmove(filepath.text+path.len, "/", 1); - gb_memmove(filepath.text+path.len+1, name.text, name.len); - filepath.text[filepath.len] = 0; - - - struct stat dir_stat = {}; - - if (stat((char *)filepath.text, &dir_stat)) { - continue; - } - - if (S_ISDIR(dir_stat.st_mode)) { - continue; - } - - i64 size = dir_stat.st_size; - - FileInfo info = {}; - info.name = name; - info.fullpath = path_to_full_path(a, filepath); - info.size = size; - array_add(fi, info); - } - - if (fi->count == 0) { - return ReadDirectory_Empty; - } - - return ReadDirectory_None; -} -#else -#error Implement read_directory -#endif - - +#include "path.cpp" struct LoadedFile { void *handle; diff --git a/src/gb/gb.h b/src/gb/gb.h index b72a893f7..3b2d6434c 100644 --- a/src/gb/gb.h +++ b/src/gb/gb.h @@ -6273,20 +6273,44 @@ char *gb_path_get_full_name(gbAllocator a, char const *path) { #else char *p, *result, *fullpath = NULL; isize len; - p = realpath(path, NULL); - fullpath = p; - if (p == NULL) { - // NOTE(bill): File does not exist - fullpath = cast(char *)path; + fullpath = realpath(path, NULL); + + if (fullpath == NULL) { + // NOTE(Jeroen): Path doesn't exist. + if (gb_strlen(path) > 0 && path[0] == '/') { + // But it is an absolute path, so return as-is. + + fullpath = (char *)path; + len = gb_strlen(fullpath) + 1; + result = gb_alloc_array(a, char, len + 1); + + gb_memmove(result, fullpath, len); + result[len] = 0; + + } else { + // Appears to be a relative path, so construct an absolute one relative to . + char cwd[4096]; + getcwd(&cwd[0], 4096); + + isize path_len = gb_strlen(path); + isize cwd_len = gb_strlen(cwd); + len = cwd_len + 1 + path_len + 1; + result = gb_alloc_array(a, char, len); + + gb_memmove(result, (void *)cwd, cwd_len); + result[cwd_len] = '/'; + + gb_memmove(result + cwd_len + 1, (void *)path, gb_strlen(path)); + result[len] = 0; + + } + } else { + len = gb_strlen(fullpath) + 1; + result = gb_alloc_array(a, char, len + 1); + gb_memmove(result, fullpath, len); + result[len] = 0; + free(fullpath); } - - len = gb_strlen(fullpath); - - result = gb_alloc_array(a, char, len + 1); - gb_memmove(result, fullpath, len); - result[len] = 0; - free(p); - return result; #endif } diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index f5cb84785..7781997f7 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -967,7 +967,12 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) } String lb_filepath_ll_for_module(lbModule *m) { - String path = m->gen->output_base; + String path = concatenate3_strings(permanent_allocator(), + build_context.build_paths[BuildPath_Output].basename, + STR_LIT("/"), + build_context.build_paths[BuildPath_Output].name + ); + if (m->pkg) { path = concatenate3_strings(permanent_allocator(), path, STR_LIT("-"), m->pkg->name); } else if (USE_SEPARATE_MODULES) { @@ -978,7 +983,12 @@ String lb_filepath_ll_for_module(lbModule *m) { return path; } String lb_filepath_obj_for_module(lbModule *m) { - String path = m->gen->output_base; + String path = concatenate3_strings(permanent_allocator(), + build_context.build_paths[BuildPath_Output].basename, + STR_LIT("/"), + build_context.build_paths[BuildPath_Output].name + ); + if (m->pkg) { path = concatenate3_strings(permanent_allocator(), path, STR_LIT("-"), m->pkg->name); } diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp index 330059622..1a431a4ac 100644 --- a/src/llvm_backend_general.cpp +++ b/src/llvm_backend_general.cpp @@ -87,7 +87,6 @@ bool lb_init_generator(lbGenerator *gen, Checker *c) { return false; } - String init_fullpath = c->parser->init_fullpath; if (build_context.out_filepath.len == 0) { diff --git a/src/main.cpp b/src/main.cpp index fc8792ceb..7b0364149 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,7 +46,6 @@ gb_global Timings global_timings = {0}; #include "checker.cpp" #include "docs.cpp" - #include "llvm_backend.cpp" #if defined(GB_SYSTEM_OSX) @@ -57,16 +56,8 @@ gb_global Timings global_timings = {0}; #endif #include "query_data.cpp" - - -#if defined(GB_SYSTEM_WINDOWS) -// NOTE(IC): In order to find Visual C++ paths without relying on environment variables. -#include "microsoft_craziness.h" -#endif - #include "bug_report.cpp" - // NOTE(bill): 'name' is used in debugging and profiling modes i32 system_exec_command_line_app(char const *name, char const *fmt, ...) { isize const cmd_cap = 64<<20; // 64 MiB should be more than enough @@ -130,34 +121,35 @@ i32 system_exec_command_line_app(char const *name, char const *fmt, ...) { } - - i32 linker_stage(lbGenerator *gen) { i32 result = 0; Timings *timings = &global_timings; - String output_base = gen->output_base; + String output_filename = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]); + debugf("Linking %.*s\n", LIT(output_filename)); + + // TOOD(Jeroen): Make a `build_paths[BuildPath_Object] to avoid `%.*s.o`. if (is_arch_wasm()) { timings_start_section(timings, str_lit("wasm-ld")); #if defined(GB_SYSTEM_WINDOWS) result = system_exec_command_line_app("wasm-ld", - "\"%.*s\\bin\\wasm-ld\" \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", + "\"%.*s\\bin\\wasm-ld\" \"%.*s.o\" -o \"%.*s\" %.*s %.*s", LIT(build_context.ODIN_ROOT), - LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + LIT(output_filename), LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); #else result = system_exec_command_line_app("wasm-ld", - "wasm-ld \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", - LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + "wasm-ld \"%.*s.o\" -o \"%.*s\" %.*s %.*s", + LIT(output_filename), LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); #endif return result; } if (build_context.cross_compiling && selected_target_metrics->metrics == &target_essence_amd64) { -#ifdef GB_SYSTEM_UNIX +#if defined(GB_SYSTEM_UNIX) result = system_exec_command_line_app("linker", "x86_64-essence-gcc \"%.*s.o\" -o \"%.*s\" %.*s %.*s", - LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + LIT(output_filename), LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); #else gb_printf_err("Linking for cross compilation for this platform is not yet supported (%.*s %.*s)\n", LIT(target_os_names[build_context.metrics.os]), @@ -181,28 +173,11 @@ i32 linker_stage(lbGenerator *gen) { gbString lib_str = gb_string_make(heap_allocator(), ""); defer (gb_string_free(lib_str)); - char const *output_ext = "exe"; gbString link_settings = gb_string_make_reserve(heap_allocator(), 256); defer (gb_string_free(link_settings)); - - // NOTE(ic): It would be nice to extend this so that we could specify the Visual Studio version that we want instead of defaulting to the latest. - Find_Result_Utf8 find_result = find_visual_studio_and_windows_sdk_utf8(); - - if (find_result.windows_sdk_version == 0) { - gb_printf_err("Windows SDK not found.\n"); - exit(1); - } - - if (build_context.ignore_microsoft_magic) { - find_result = {}; - } - // Add library search paths. - if (find_result.vs_library_path.len > 0) { - GB_ASSERT(find_result.windows_sdk_um_library_path.len > 0); - GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); - + if (build_context.build_paths[BuildPath_VS_LIB].basename.len > 0) { String path = {}; auto add_path = [&](String path) { if (path[path.len-1] == '\\') { @@ -210,9 +185,9 @@ i32 linker_stage(lbGenerator *gen) { } link_settings = gb_string_append_fmt(link_settings, " /LIBPATH:\"%.*s\"", LIT(path)); }; - add_path(find_result.windows_sdk_um_library_path); - add_path(find_result.windows_sdk_ucrt_library_path); - add_path(find_result.vs_library_path); + add_path(build_context.build_paths[BuildPath_Win_SDK_UM_Lib].basename); + add_path(build_context.build_paths[BuildPath_Win_SDK_UCRT_Lib].basename); + add_path(build_context.build_paths[BuildPath_VS_LIB].basename); } @@ -252,14 +227,14 @@ i32 linker_stage(lbGenerator *gen) { if (build_context.build_mode == BuildMode_DynamicLibrary) { - output_ext = "dll"; link_settings = gb_string_append_fmt(link_settings, " /DLL"); } else { link_settings = gb_string_append_fmt(link_settings, " /ENTRY:mainCRTStartup"); } if (build_context.pdb_filepath != "") { - link_settings = gb_string_append_fmt(link_settings, " /PDB:%.*s", LIT(build_context.pdb_filepath)); + String pdb_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_PDB]); + link_settings = gb_string_append_fmt(link_settings, " /PDB:%.*s", LIT(pdb_path)); } if (build_context.no_crt) { @@ -300,13 +275,21 @@ i32 linker_stage(lbGenerator *gen) { object_files = gb_string_append_fmt(object_files, "\"%.*s\" ", LIT(object_path)); } + String vs_exe_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_VS_EXE]); + defer (gb_free(heap_allocator(), vs_exe_path.text)); + char const *subsystem_str = build_context.use_subsystem_windows ? "WINDOWS" : "CONSOLE"; if (!build_context.use_lld) { // msvc if (build_context.has_resource) { + String rc_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_RC]); + String res_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_RES]); + defer (gb_free(heap_allocator(), rc_path.text)); + defer (gb_free(heap_allocator(), res_path.text)); + result = system_exec_command_line_app("msvc-link", - "\"rc.exe\" /nologo /fo \"%.*s.res\" \"%.*s.rc\"", - LIT(output_base), - LIT(build_context.resource_filepath) + "\"rc.exe\" /nologo /fo \"%.*s\" \"%.*s\"", + LIT(res_path), + LIT(rc_path) ); if (result) { @@ -314,13 +297,13 @@ i32 linker_stage(lbGenerator *gen) { } result = system_exec_command_line_app("msvc-link", - "\"%.*slink.exe\" %s \"%.*s.res\" -OUT:\"%.*s.%s\" %s " + "\"%.*slink.exe\" %s \"%.*s\" -OUT:\"%.*s\" %s " "/nologo /incremental:no /opt:ref /subsystem:%s " " %.*s " " %.*s " " %s " "", - LIT(find_result.vs_exe_path), object_files, LIT(output_base), LIT(output_base), output_ext, + LIT(vs_exe_path), object_files, LIT(res_path), LIT(output_filename), link_settings, subsystem_str, LIT(build_context.link_flags), @@ -329,13 +312,13 @@ i32 linker_stage(lbGenerator *gen) { ); } else { result = system_exec_command_line_app("msvc-link", - "\"%.*slink.exe\" %s -OUT:\"%.*s.%s\" %s " + "\"%.*slink.exe\" %s -OUT:\"%.*s\" %s " "/nologo /incremental:no /opt:ref /subsystem:%s " " %.*s " " %.*s " " %s " "", - LIT(find_result.vs_exe_path), object_files, LIT(output_base), output_ext, + LIT(vs_exe_path), object_files, LIT(output_filename), link_settings, subsystem_str, LIT(build_context.link_flags), @@ -350,13 +333,13 @@ i32 linker_stage(lbGenerator *gen) { } else { // lld result = system_exec_command_line_app("msvc-lld-link", - "\"%.*s\\bin\\lld-link\" %s -OUT:\"%.*s.%s\" %s " + "\"%.*s\\bin\\lld-link\" %s -OUT:\"%.*s\" %s " "/nologo /incremental:no /opt:ref /subsystem:%s " " %.*s " " %.*s " " %s " "", - LIT(build_context.ODIN_ROOT), object_files, LIT(output_base),output_ext, + LIT(build_context.ODIN_ROOT), object_files, LIT(output_filename), link_settings, subsystem_str, LIT(build_context.link_flags), @@ -415,7 +398,7 @@ i32 linker_stage(lbGenerator *gen) { } else if (string_ends_with(lib, str_lit(".so"))) { // dynamic lib, relative path to executable // NOTE(vassvik): it is the user's responsibility to make sure the shared library files are visible - // at runtimeto the executable + // at runtime to the executable lib_str = gb_string_append_fmt(lib_str, " -l:\"%s/%.*s\" ", cwd, LIT(lib)); } else { // dynamic or static system lib, just link regularly searching system library paths @@ -431,9 +414,6 @@ i32 linker_stage(lbGenerator *gen) { object_files = gb_string_append_fmt(object_files, "\"%.*s\" ", LIT(object_path)); } - // Unlike the Win32 linker code, the output_ext includes the dot, because - // typically executable files on *NIX systems don't have extensions. - String output_ext = {}; gbString link_settings = gb_string_make_reserve(heap_allocator(), 32); if (build_context.no_crt) { @@ -461,26 +441,12 @@ i32 linker_stage(lbGenerator *gen) { // correctly this way since all the other dependencies provided implicitly // by the compiler frontend are still needed and most of the command // line arguments prepared previously are incompatible with ld. - // - // Shared libraries are .dylib on MacOS and .so on Linux. - if (build_context.metrics.os == TargetOs_darwin) { - output_ext = STR_LIT(".dylib"); - } else { - output_ext = STR_LIT(".so"); - } link_settings = gb_string_appendc(link_settings, "-Wl,-init,'_odin_entry_point' "); link_settings = gb_string_appendc(link_settings, "-Wl,-fini,'_odin_exit_point' "); } else if (build_context.metrics.os != TargetOs_openbsd) { // OpenBSD defaults to PIE executable. do not pass -no-pie for it. link_settings = gb_string_appendc(link_settings, "-no-pie "); } - if (build_context.out_filepath.len > 0) { - //NOTE(thebirk): We have a custom -out arguments, so we should use the extension from that - isize pos = string_extension_position(build_context.out_filepath); - if (pos > 0) { - output_ext = substring(build_context.out_filepath, pos, build_context.out_filepath.len); - } - } gbString platform_lib_str = gb_string_make(heap_allocator(), ""); defer (gb_string_free(platform_lib_str)); @@ -507,7 +473,7 @@ i32 linker_stage(lbGenerator *gen) { defer (gb_string_free(link_command_line)); link_command_line = gb_string_appendc(link_command_line, object_files); - link_command_line = gb_string_append_fmt(link_command_line, " -o \"%.*s%.*s\" ", LIT(output_base), LIT(output_ext)); + link_command_line = gb_string_append_fmt(link_command_line, " -o \"%.*s\" ", LIT(output_filename)); link_command_line = gb_string_append_fmt(link_command_line, " %s ", platform_lib_str); link_command_line = gb_string_append_fmt(link_command_line, " %s ", lib_str); link_command_line = gb_string_append_fmt(link_command_line, " %.*s ", LIT(build_context.link_flags)); @@ -524,9 +490,7 @@ i32 linker_stage(lbGenerator *gen) { if (build_context.ODIN_DEBUG) { // NOTE: macOS links DWARF symbols dynamically. Dsymutil will map the stubs in the exe // to the symbols in the object file - result = system_exec_command_line_app("dsymutil", - "dsymutil %.*s%.*s", LIT(output_base), LIT(output_ext) - ); + result = system_exec_command_line_app("dsymutil", "dsymutil %.*s", LIT(output_filename)); if (result) { return result; @@ -1526,6 +1490,10 @@ bool parse_build_flags(Array args) { gb_printf_err("Invalid -resource path %.*s, missing .rc\n", LIT(path)); bad_flags = true; break; + } else if (!gb_file_exists((const char *)path.text)) { + gb_printf_err("Invalid -resource path %.*s, file does not exist.\n", LIT(path)); + bad_flags = true; + break; } build_context.resource_filepath = substring(path, 0, string_extension_position(path)); build_context.has_resource = true; @@ -1540,6 +1508,11 @@ bool parse_build_flags(Array args) { String path = value.value_string; path = string_trim_whitespace(path); if (is_build_flag_path_valid(path)) { + if (path_is_directory(path)) { + gb_printf_err("Invalid -pdb-name path. %.*s, is a directory.\n", LIT(path)); + bad_flags = true; + break; + } // #if defined(GB_SYSTEM_WINDOWS) // String ext = path_extension(path); // if (ext != ".pdb") { @@ -2666,6 +2639,8 @@ int main(int arg_count, char const **arg_ptr) { return 1; } + init_filename = copy_string(permanent_allocator(), init_filename); + if (init_filename == "-help" || init_filename == "--help") { build_context.show_help = true; @@ -2688,6 +2663,12 @@ int main(int arg_count, char const **arg_ptr) { gb_printf_err("Did you mean `%.*s %.*s %.*s -file`?\n", LIT(args[0]), LIT(command), LIT(init_filename)); gb_printf_err("The `-file` flag tells it to treat a file as a self-contained package.\n"); return 1; + } else { + String const ext = str_lit(".odin"); + if (!string_ends_with(init_filename, ext)) { + gb_printf_err("Expected either a directory or a .odin file, got '%.*s'\n", LIT(init_filename)); + return 1; + } } } } @@ -2709,13 +2690,24 @@ int main(int arg_count, char const **arg_ptr) { get_fullpath_relative(heap_allocator(), odin_root_dir(), str_lit("shared"))); } - init_build_context(selected_target_metrics ? selected_target_metrics->metrics : nullptr); // if (build_context.word_size == 4 && build_context.metrics.os != TargetOs_js) { // print_usage_line(0, "%.*s 32-bit is not yet supported for this platform", LIT(args[0])); // return 1; // } + // Set and check build paths... + if (!init_build_paths(init_filename)) { + return 1; + } + + if (build_context.show_debug_messages) { + for_array(i, build_context.build_paths) { + String build_path = path_to_string(heap_allocator(), build_context.build_paths[i]); + debugf("build_paths[%ld]: %.*s\n", i, LIT(build_path)); + } + } + init_global_thread_pool(); defer (thread_pool_destroy(&global_thread_pool)); @@ -2732,6 +2724,8 @@ int main(int arg_count, char const **arg_ptr) { } defer (destroy_parser(parser)); + // TODO(jeroen): Remove the `init_filename` param. + // Let's put that on `build_context.build_paths[0]` instead. if (parse_packages(parser, init_filename) != ParseFile_None) { return 1; } @@ -2810,16 +2804,14 @@ int main(int arg_count, char const **arg_ptr) { } if (run_output) { + String exe_name = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]); + defer (gb_free(heap_allocator(), exe_name.text)); + #if defined(GB_SYSTEM_WINDOWS) - return system_exec_command_line_app("odin run", "%.*s.exe %.*s", LIT(gen->output_base), LIT(run_args_string)); + return system_exec_command_line_app("odin run", "%.*s %.*s", LIT(exe_name), LIT(run_args_string)); #else - //NOTE(thebirk): This whole thing is a little leaky - String output_ext = {}; - String complete_path = concatenate_strings(permanent_allocator(), gen->output_base, output_ext); - complete_path = path_to_full_path(permanent_allocator(), complete_path); - return system_exec_command_line_app("odin run", "\"%.*s\" %.*s", LIT(complete_path), LIT(run_args_string)); + return system_exec_command_line_app("odin run", "\"%.*s\" %.*s", LIT(exe_name), LIT(run_args_string)); #endif } - return 0; } diff --git a/src/parser.cpp b/src/parser.cpp index 767119aa8..df7f908a6 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -5751,7 +5751,7 @@ ParseFileError parse_packages(Parser *p, String init_filename) { } } } - + { // Add these packages serially and then process them parallel mutex_lock(&p->wait_mutex); diff --git a/src/path.cpp b/src/path.cpp new file mode 100644 index 000000000..8d8e532b8 --- /dev/null +++ b/src/path.cpp @@ -0,0 +1,333 @@ +/* + Path handling utilities. +*/ + +#if defined(GB_SYSTEM_WINDOWS) + bool path_is_directory(String path) { + gbAllocator a = heap_allocator(); + String16 wstr = string_to_string16(a, path); + defer (gb_free(a, wstr.text)); + + i32 attribs = GetFileAttributesW(wstr.text); + if (attribs < 0) return false; + + return (attribs & FILE_ATTRIBUTE_DIRECTORY) != 0; + } + +#else + bool path_is_directory(String path) { + gbAllocator a = heap_allocator(); + char *copy = cast(char *)copy_string(a, path).text; + defer (gb_free(a, copy)); + + struct stat s; + if (stat(copy, &s) == 0) { + return (s.st_mode & S_IFDIR) != 0; + } + return false; + } +#endif + + +String path_to_full_path(gbAllocator a, String path) { + gbAllocator ha = heap_allocator(); + char *path_c = gb_alloc_str_len(ha, cast(char *)path.text, path.len); + defer (gb_free(ha, path_c)); + + char *fullpath = gb_path_get_full_name(a, path_c); + String res = string_trim_whitespace(make_string_c(fullpath)); +#if defined(GB_SYSTEM_WINDOWS) + for (isize i = 0; i < res.len; i++) { + if (res.text[i] == '\\') { + res.text[i] = '/'; + } + } +#endif + return copy_string(a, res); +} + +struct Path { + String basename; + String name; + String ext; +}; + +// NOTE(Jeroen): Naively turns a Path into a string. +String path_to_string(gbAllocator a, Path path) { + if (path.basename.len + path.name.len + path.ext.len == 0) { + return make_string(nullptr, 0); + } + + isize len = path.basename.len + 1 + path.name.len + 1; + if (path.ext.len > 0) { + len += path.ext.len + 1; + } + + u8 *str = gb_alloc_array(a, u8, len); + + isize i = 0; + gb_memmove(str+i, path.basename.text, path.basename.len); i += path.basename.len; + gb_memmove(str+i, "/", 1); i += 1; + gb_memmove(str+i, path.name.text, path.name.len); i += path.name.len; + if (path.ext.len > 0) { + gb_memmove(str+i, ".", 1); i += 1; + gb_memmove(str+i, path.ext.text, path.ext.len); i += path.ext.len; + } + str[i] = 0; + + String res = make_string(str, i); + res = string_trim_whitespace(res); + return res; +} + +// NOTE(Jeroen): Naively turns a Path into a string, then normalizes it using `path_to_full_path`. +String path_to_full_path(gbAllocator a, Path path) { + String temp = path_to_string(heap_allocator(), path); + defer (gb_free(heap_allocator(), temp.text)); + + return path_to_full_path(a, temp); +} + +// NOTE(Jeroen): Takes a path like "odin" or "W:\Odin", turns it into a full path, +// and then breaks it into its components to make a Path. +Path path_from_string(gbAllocator a, String const &path) { + Path res = {}; + + if (path.len == 0) return res; + + String fullpath = path_to_full_path(a, path); + defer (gb_free(heap_allocator(), fullpath.text)); + + res.basename = directory_from_path(fullpath); + res.basename = copy_string(a, res.basename); + + if (string_ends_with(fullpath, '/')) { + // It's a directory. We don't need to tinker with the name and extension. + return res; + } + + isize name_start = (res.basename.len > 0) ? res.basename.len + 1 : res.basename.len; + res.name = substring(fullpath, name_start, fullpath.len); + res.name = remove_extension_from_path(res.name); + res.name = copy_string(a, res.name); + + res.ext = path_extension(fullpath, false); // false says not to include the dot. + res.ext = copy_string(a, res.ext); + return res; +} + +bool path_is_directory(Path path) { + String path_string = path_to_full_path(heap_allocator(), path); + defer (gb_free(heap_allocator(), path_string.text)); + + return path_is_directory(path_string); +} + +struct FileInfo { + String name; + String fullpath; + i64 size; + bool is_dir; +}; + +enum ReadDirectoryError { + ReadDirectory_None, + + ReadDirectory_InvalidPath, + ReadDirectory_NotExists, + ReadDirectory_Permission, + ReadDirectory_NotDir, + ReadDirectory_Empty, + ReadDirectory_Unknown, + + ReadDirectory_COUNT, +}; + +i64 get_file_size(String path) { + char *c_str = alloc_cstring(heap_allocator(), path); + defer (gb_free(heap_allocator(), c_str)); + + gbFile f = {}; + gbFileError err = gb_file_open(&f, c_str); + defer (gb_file_close(&f)); + if (err != gbFileError_None) { + return -1; + } + return gb_file_size(&f); +} + + +#if defined(GB_SYSTEM_WINDOWS) +ReadDirectoryError read_directory(String path, Array *fi) { + GB_ASSERT(fi != nullptr); + + gbAllocator a = heap_allocator(); + + while (path.len > 0) { + Rune end = path[path.len-1]; + if (end == '/') { + path.len -= 1; + } else if (end == '\\') { + path.len -= 1; + } else { + break; + } + } + + if (path.len == 0) { + return ReadDirectory_InvalidPath; + } + { + char *c_str = alloc_cstring(a, path); + defer (gb_free(a, c_str)); + + gbFile f = {}; + gbFileError file_err = gb_file_open(&f, c_str); + defer (gb_file_close(&f)); + + switch (file_err) { + case gbFileError_Invalid: return ReadDirectory_InvalidPath; + case gbFileError_NotExists: return ReadDirectory_NotExists; + // case gbFileError_Permission: return ReadDirectory_Permission; + } + } + + if (!path_is_directory(path)) { + return ReadDirectory_NotDir; + } + + + char *new_path = gb_alloc_array(a, char, path.len+3); + defer (gb_free(a, new_path)); + + gb_memmove(new_path, path.text, path.len); + gb_memmove(new_path+path.len, "/*", 2); + new_path[path.len+2] = 0; + + String np = make_string(cast(u8 *)new_path, path.len+2); + String16 wstr = string_to_string16(a, np); + defer (gb_free(a, wstr.text)); + + WIN32_FIND_DATAW file_data = {}; + HANDLE find_file = FindFirstFileW(wstr.text, &file_data); + if (find_file == INVALID_HANDLE_VALUE) { + return ReadDirectory_Unknown; + } + defer (FindClose(find_file)); + + array_init(fi, a, 0, 100); + + do { + wchar_t *filename_w = file_data.cFileName; + i64 size = cast(i64)file_data.nFileSizeLow; + size |= (cast(i64)file_data.nFileSizeHigh) << 32; + String name = string16_to_string(a, make_string16_c(filename_w)); + if (name == "." || name == "..") { + gb_free(a, name.text); + continue; + } + + String filepath = {}; + filepath.len = path.len+1+name.len; + filepath.text = gb_alloc_array(a, u8, filepath.len+1); + defer (gb_free(a, filepath.text)); + gb_memmove(filepath.text, path.text, path.len); + gb_memmove(filepath.text+path.len, "/", 1); + gb_memmove(filepath.text+path.len+1, name.text, name.len); + + FileInfo info = {}; + info.name = name; + info.fullpath = path_to_full_path(a, filepath); + info.size = size; + info.is_dir = (file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; + array_add(fi, info); + } while (FindNextFileW(find_file, &file_data)); + + if (fi->count == 0) { + return ReadDirectory_Empty; + } + + return ReadDirectory_None; +} +#elif defined(GB_SYSTEM_LINUX) || defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_FREEBSD) || defined(GB_SYSTEM_OPENBSD) + +#include + +ReadDirectoryError read_directory(String path, Array *fi) { + GB_ASSERT(fi != nullptr); + + gbAllocator a = heap_allocator(); + + char *c_path = alloc_cstring(a, path); + defer (gb_free(a, c_path)); + + DIR *dir = opendir(c_path); + if (!dir) { + switch (errno) { + case ENOENT: + return ReadDirectory_NotExists; + case EACCES: + return ReadDirectory_Permission; + case ENOTDIR: + return ReadDirectory_NotDir; + default: + // ENOMEM: out of memory + // EMFILE: per-process limit on open fds reached + // ENFILE: system-wide limit on total open files reached + return ReadDirectory_Unknown; + } + GB_PANIC("unreachable"); + } + + array_init(fi, a, 0, 100); + + for (;;) { + struct dirent *entry = readdir(dir); + if (entry == nullptr) { + break; + } + + String name = make_string_c(entry->d_name); + if (name == "." || name == "..") { + continue; + } + + String filepath = {}; + filepath.len = path.len+1+name.len; + filepath.text = gb_alloc_array(a, u8, filepath.len+1); + defer (gb_free(a, filepath.text)); + gb_memmove(filepath.text, path.text, path.len); + gb_memmove(filepath.text+path.len, "/", 1); + gb_memmove(filepath.text+path.len+1, name.text, name.len); + filepath.text[filepath.len] = 0; + + + struct stat dir_stat = {}; + + if (stat((char *)filepath.text, &dir_stat)) { + continue; + } + + if (S_ISDIR(dir_stat.st_mode)) { + continue; + } + + i64 size = dir_stat.st_size; + + FileInfo info = {}; + info.name = name; + info.fullpath = path_to_full_path(a, filepath); + info.size = size; + array_add(fi, info); + } + + if (fi->count == 0) { + return ReadDirectory_Empty; + } + + return ReadDirectory_None; +} +#else +#error Implement read_directory +#endif + diff --git a/src/string.cpp b/src/string.cpp index d3dbc6904..3515df48e 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -245,15 +245,14 @@ gb_inline isize string_extension_position(String const &str) { return dot_pos; } -String path_extension(String const &str) { +String path_extension(String const &str, bool include_dot = true) { isize pos = string_extension_position(str); if (pos < 0) { return make_string(nullptr, 0); } - return substring(str, pos, str.len); + return substring(str, include_dot ? pos : pos + 1, str.len); } - String string_trim_whitespace(String str) { while (str.len > 0 && rune_is_whitespace(str[str.len-1])) { str.len--; @@ -328,7 +327,10 @@ String directory_from_path(String const &s) { break; } } - return substring(s, 0, i); + if (i >= 0) { + return substring(s, 0, i); + } + return substring(s, 0, 0); } String concatenate_strings(gbAllocator a, String const &x, String const &y) { diff --git a/tests/core/build.bat b/tests/core/build.bat index 2f9ba672e..1973c22aa 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -5,61 +5,61 @@ python3 download_assets.py echo --- echo Running core:image tests echo --- -%PATH_TO_ODIN% run image %COMMON% +%PATH_TO_ODIN% run image %COMMON% -out:test_image echo --- echo Running core:compress tests echo --- -%PATH_TO_ODIN% run compress %COMMON% +%PATH_TO_ODIN% run compress %COMMON% -out:test_compress echo --- echo Running core:strings tests echo --- -%PATH_TO_ODIN% run strings %COMMON% +%PATH_TO_ODIN% run strings %COMMON% -out:test_strings echo --- echo Running core:hash tests echo --- -%PATH_TO_ODIN% run hash %COMMON% -o:size +%PATH_TO_ODIN% run hash %COMMON% -o:size -out:test_hash echo --- echo Running core:odin tests echo --- -%PATH_TO_ODIN% run odin %COMMON% -o:size +%PATH_TO_ODIN% run odin %COMMON% -o:size -out:test_odin echo --- echo Running core:crypto hash tests echo --- -%PATH_TO_ODIN% run crypto %COMMON% +%PATH_TO_ODIN% run crypto %COMMON% -out:test_crypto echo --- echo Running core:encoding tests echo --- -%PATH_TO_ODIN% run encoding/hxa %COMMON% -%PATH_TO_ODIN% run encoding/json %COMMON% -%PATH_TO_ODIN% run encoding/varint %COMMON% +%PATH_TO_ODIN% run encoding/hxa %COMMON% -out:test_hxa +%PATH_TO_ODIN% run encoding/json %COMMON% -out:test_json +%PATH_TO_ODIN% run encoding/varint %COMMON% -out:test_varint echo --- echo Running core:math/noise tests echo --- -%PATH_TO_ODIN% run math/noise %COMMON% +%PATH_TO_ODIN% run math/noise %COMMON% -out:test_noise echo --- echo Running core:math tests echo --- -%PATH_TO_ODIN% run math %COMMON% +%PATH_TO_ODIN% run math %COMMON% -out:test_math echo --- echo Running core:math/linalg/glsl tests echo --- -%PATH_TO_ODIN% run math/linalg/glsl %COMMON% +%PATH_TO_ODIN% run math/linalg/glsl %COMMON% -out:test_glsl echo --- echo Running core:path/filepath tests echo --- -%PATH_TO_ODIN% run path/filepath %COMMON% +%PATH_TO_ODIN% run path/filepath %COMMON% -out:test_filepath echo --- echo Running core:reflect tests echo --- -%PATH_TO_ODIN% run reflect %COMMON% +%PATH_TO_ODIN% run reflect %COMMON% -out:test_reflect diff --git a/tests/core/math/big/build.bat b/tests/core/math/big/build.bat index 16bdbc8ca..ad199d775 100644 --- a/tests/core/math/big/build.bat +++ b/tests/core/math/big/build.bat @@ -4,7 +4,7 @@ set PATH_TO_ODIN==..\..\..\..\odin set TEST_ARGS=-fast-tests set TEST_ARGS=-no-random set TEST_ARGS= -set OUT_NAME=math_big_test_library +set OUT_NAME=math_big_test_library.dll set COMMON=-build-mode:shared -show-timings -no-bounds-check -define:MATH_BIG_EXE=false -vet -strict-style echo --- echo Running core:math/big tests diff --git a/tests/issues/run.sh b/tests/issues/run.sh index 117a9a5f1..91ec99e05 100755 --- a/tests/issues/run.sh +++ b/tests/issues/run.sh @@ -8,10 +8,10 @@ COMMON="-collection:tests=tests -out:tests/issues/build/test_issue" set -x ./odin build tests/issues/test_issue_829.odin $COMMON -file -tests/issues/build/test_issue +tests/issues/build/test_issue.bin ./odin build tests/issues/test_issue_1592.odin $COMMON -file -tests/issues/build/test_issue +tests/issues/build/test_issue.bin set +x From 76d48b38d394b953ea4bbe1420ecd11e6e7dd028 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 8 Apr 2022 19:02:14 +0200 Subject: [PATCH 071/245] Compiler: Allow -out: to not have an extension on *nix for executables (only). --- src/build_settings.cpp | 4 +++- tests/issues/run.sh | 4 ++-- tests/vendor/Makefile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 0b582eac8..55d129124 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1308,7 +1308,9 @@ bool init_build_paths(String init_filename) { // Do we have an extension? We might not if the output filename was supplied. if (bc->build_paths[BuildPath_Output].ext.len == 0) { - bc->build_paths[BuildPath_Output].ext = copy_string(ha, output_extension); + if (build_context.metrics.os == TargetOs_windows || build_context.build_mode != BuildMode_Executable) { + bc->build_paths[BuildPath_Output].ext = copy_string(ha, output_extension); + } } // Check if output path is a directory. diff --git a/tests/issues/run.sh b/tests/issues/run.sh index 91ec99e05..117a9a5f1 100755 --- a/tests/issues/run.sh +++ b/tests/issues/run.sh @@ -8,10 +8,10 @@ COMMON="-collection:tests=tests -out:tests/issues/build/test_issue" set -x ./odin build tests/issues/test_issue_829.odin $COMMON -file -tests/issues/build/test_issue.bin +tests/issues/build/test_issue ./odin build tests/issues/test_issue_1592.odin $COMMON -file -tests/issues/build/test_issue.bin +tests/issues/build/test_issue set +x diff --git a/tests/vendor/Makefile b/tests/vendor/Makefile index 341067c6e..c508f6c50 100644 --- a/tests/vendor/Makefile +++ b/tests/vendor/Makefile @@ -10,4 +10,4 @@ endif all: botan_test botan_test: - $(ODIN) run botan -out=botan_hash -o:speed -no-bounds-check $(ODINFLAGS) + $(ODIN) run botan -out=test_botan_hash -o:speed -no-bounds-check $(ODINFLAGS) From f4723aea4cb610a8ccc7d3614f8787d638d284d6 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 8 Apr 2022 19:14:59 +0200 Subject: [PATCH 072/245] Remove redundant bit for non-Windows. --- src/build_settings.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 55d129124..212ded5c8 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1281,22 +1281,8 @@ bool init_build_paths(String init_filename) { output_name = remove_extension_from_path(output_name); output_name = copy_string(ha, string_trim_whitespace(output_name)); - /* - NOTE(Jeroen): This fallback substitution can't be made at this stage. - if (gen->output_name.len == 0) { - gen->output_name = c->info.init_scope->pkg->name; - } - */ Path output_path = path_from_string(ha, output_name); - #ifndef GB_SYSTEM_WINDOWS - char cwd[4096]; - getcwd(&cwd[0], 4096); - - const u8 * cwd_str = (const u8 *)&cwd[0]; - output_path.basename = copy_string(ha, make_string(cwd_str, strlen(cwd))); - #endif - // Replace extension. if (output_path.ext.len > 0) { gb_free(ha, output_path.ext.text); From 3d2856db31456e9a117209eccf8e1167b4401205 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 24 Apr 2022 14:19:25 +0200 Subject: [PATCH 073/245] Update tests to use new filename generation code. --- .github/workflows/ci.yml | 11 ++++++++--- core/crypto/util/util.odin | 1 + tests/core/Makefile | 29 +++++++++++++++-------------- tests/core/build.bat | 32 +++++++++++++++++--------------- tests/issues/run.bat | 21 ++++++++------------- tests/issues/run.sh | 19 +++++++++---------- tests/vendor/Makefile | 3 ++- tests/vendor/build.bat | 3 ++- 8 files changed, 62 insertions(+), 57 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cc4283b0..989f56712 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,9 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: tests/issues/run.sh + run: | + cd tests/issues + run.sh timeout-minutes: 10 - name: Odin check examples/all for Linux i386 run: ./odin check examples/all -vet -strict-style -target:linux_i386 @@ -91,7 +93,9 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: tests/issues/run.sh + run: | + cd tests/issues + run.sh timeout-minutes: 10 - name: Odin check examples/all for Darwin arm64 run: ./odin check examples/all -vet -strict-style -target:darwin_arm64 @@ -163,7 +167,8 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat - call tests\issues\run.bat + cd tests\issues + call build.bat timeout-minutes: 10 - name: Odin check examples/all for Windows 32bits shell: cmd diff --git a/core/crypto/util/util.odin b/core/crypto/util/util.odin index 6273a232e..83b07e546 100644 --- a/core/crypto/util/util.odin +++ b/core/crypto/util/util.odin @@ -11,6 +11,7 @@ package util */ import "core:mem" +_ :: mem // @note(bp): this can replace the other two cast_slice :: #force_inline proc "contextless" ($D: typeid/[]$DE, src: $S/[]$SE) -> D { diff --git a/tests/core/Makefile b/tests/core/Makefile index 6a92b4efb..9bb622633 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,5 +1,6 @@ ODIN=../../odin PYTHON=$(shell which python3) +OUT_FILE=test_binary.bin all: download_test_assets image_test compress_test strings_test hash_test crypto_test noise_test encoding_test \ math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test @@ -8,39 +9,39 @@ download_test_assets: $(PYTHON) download_assets.py image_test: - $(ODIN) run image/test_core_image.odin -file + $(ODIN) run image/test_core_image.odin -out=$(OUT_FILE) -file compress_test: - $(ODIN) run compress/test_core_compress.odin -file + $(ODIN) run compress/test_core_compress.odin -out=$(OUT_FILE) -file strings_test: - $(ODIN) run strings/test_core_strings.odin -file + $(ODIN) run strings/test_core_strings.odin -out=$(OUT_FILE) -file hash_test: - $(ODIN) run hash -out=test_hash -o:speed -no-bounds-check + $(ODIN) run hash -out=$(OUT_FILE) -o:speed -no-bounds-check crypto_test: - $(ODIN) run crypto -out=test_crypto_hash -o:speed -no-bounds-check + $(ODIN) run crypto -out=$(OUT_FILE) -o:speed -no-bounds-check noise_test: - $(ODIN) run math/noise -out=test_noise + $(ODIN) run math/noise -out=$(OUT_FILE) encoding_test: - $(ODIN) run encoding/hxa -out=test_hxa -collection:tests=.. - $(ODIN) run encoding/json -out=test_json - $(ODIN) run encoding/varint -out=test_varint + $(ODIN) run encoding/hxa -out=$(OUT_FILE) -collection:tests=.. + $(ODIN) run encoding/json -out=$(OUT_FILE) + $(ODIN) run encoding/varint -out=$(OUT_FILE) math_test: - $(ODIN) run math/test_core_math.odin -out=test_core_math -file -collection:tests=.. + $(ODIN) run math/test_core_math.odin -out=$(OUT_FILE) -file -collection:tests=.. linalg_glsl_math_test: - $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=test_linalg_glsl_math -collection:tests=.. + $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=$(OUT_FILE) -collection:tests=.. filepath_test: - $(ODIN) run path/filepath/test_core_filepath.odin -file -out=test_core_filepath -collection:tests=.. + $(ODIN) run path/filepath/test_core_filepath.odin -file -out=$(OUT_FILE) -collection:tests=.. reflect_test: - $(ODIN) run reflect/test_core_reflect.odin -file -out=test_core_reflect -collection:tests=.. + $(ODIN) run reflect/test_core_reflect.odin -file -out=$(OUT_FILE) -collection:tests=.. os_exit_test: - $(ODIN) run os/test_core_os_exit.odin -file -out=test_core_os_exit && exit 1 || exit 0 + $(ODIN) run os/test_core_os_exit.odin -file -out=$(OUT_FILE) && exit 1 || exit 0 diff --git a/tests/core/build.bat b/tests/core/build.bat index 1973c22aa..331a473aa 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -1,65 +1,67 @@ @echo off -set COMMON=-show-timings -no-bounds-check -vet -strict-style -collection:tests=.. +set OUT_FILE=test_binary.exe +set COMMON=-show-timings -no-bounds-check -vet -strict-style -collection:tests=.. -out:%OUT_FILE% set PATH_TO_ODIN==..\..\odin + python3 download_assets.py echo --- echo Running core:image tests echo --- -%PATH_TO_ODIN% run image %COMMON% -out:test_image +%PATH_TO_ODIN% run image %COMMON% echo --- echo Running core:compress tests echo --- -%PATH_TO_ODIN% run compress %COMMON% -out:test_compress +%PATH_TO_ODIN% run compress %COMMON% echo --- echo Running core:strings tests echo --- -%PATH_TO_ODIN% run strings %COMMON% -out:test_strings +%PATH_TO_ODIN% run strings %COMMON% echo --- echo Running core:hash tests echo --- -%PATH_TO_ODIN% run hash %COMMON% -o:size -out:test_hash +%PATH_TO_ODIN% run hash %COMMON% -o:size echo --- echo Running core:odin tests echo --- -%PATH_TO_ODIN% run odin %COMMON% -o:size -out:test_odin +%PATH_TO_ODIN% run odin %COMMON% -o:size echo --- echo Running core:crypto hash tests echo --- -%PATH_TO_ODIN% run crypto %COMMON% -out:test_crypto +%PATH_TO_ODIN% run crypto %COMMON% echo --- echo Running core:encoding tests echo --- -%PATH_TO_ODIN% run encoding/hxa %COMMON% -out:test_hxa -%PATH_TO_ODIN% run encoding/json %COMMON% -out:test_json -%PATH_TO_ODIN% run encoding/varint %COMMON% -out:test_varint +%PATH_TO_ODIN% run encoding/hxa %COMMON% +%PATH_TO_ODIN% run encoding/json %COMMON% +%PATH_TO_ODIN% run encoding/varint %COMMON% echo --- echo Running core:math/noise tests echo --- -%PATH_TO_ODIN% run math/noise %COMMON% -out:test_noise +%PATH_TO_ODIN% run math/noise %COMMON% echo --- echo Running core:math tests echo --- -%PATH_TO_ODIN% run math %COMMON% -out:test_math +%PATH_TO_ODIN% run math %COMMON% echo --- echo Running core:math/linalg/glsl tests echo --- -%PATH_TO_ODIN% run math/linalg/glsl %COMMON% -out:test_glsl +%PATH_TO_ODIN% run math/linalg/glsl %COMMON% echo --- echo Running core:path/filepath tests echo --- -%PATH_TO_ODIN% run path/filepath %COMMON% -out:test_filepath +%PATH_TO_ODIN% run path/filepath %COMMON% echo --- echo Running core:reflect tests echo --- -%PATH_TO_ODIN% run reflect %COMMON% -out:test_reflect +%PATH_TO_ODIN% run reflect %COMMON% diff --git a/tests/issues/run.bat b/tests/issues/run.bat index a652d9694..a936bd896 100644 --- a/tests/issues/run.bat +++ b/tests/issues/run.bat @@ -1,17 +1,12 @@ @echo off +set PATH_TO_ODIN==..\..\odin +set COMMON=-collection:tests=.. -out:build\test_issue +if not exist "build" mkdir build -if not exist "tests\issues\build\" mkdir tests\issues\build +%PATH_TO_ODIN% build test_issue_829.odin %COMMON% -file +build\test_issue -set COMMON=-collection:tests=tests -out:tests\issues\build\test_issue +%PATH_TO_ODIN% build test_issue_1592.odin %COMMON% -file +build\test_issue -@echo on - -.\odin build tests\issues\test_issue_829.odin %COMMON% -file -tests\issues\build\test_issue - -.\odin build tests\issues\test_issue_1592.odin %COMMON% -file -tests\issues\build\test_issue - -@echo off - -rmdir /S /Q tests\issues\build +rmdir /S /Q build diff --git a/tests/issues/run.sh b/tests/issues/run.sh index 117a9a5f1..ec6d7130d 100755 --- a/tests/issues/run.sh +++ b/tests/issues/run.sh @@ -1,18 +1,17 @@ #!/bin/bash +ODIN=../../odin +COMMON="-collection:tests=.. -out:build/test_issue.bin" + set -eu - -mkdir -p tests/issues/build - -COMMON="-collection:tests=tests -out:tests/issues/build/test_issue" - +mkdir -p build set -x -./odin build tests/issues/test_issue_829.odin $COMMON -file -tests/issues/build/test_issue +$ODIN build test_issue_829.odin $COMMON -file +build/test_issue.bin -./odin build tests/issues/test_issue_1592.odin $COMMON -file -tests/issues/build/test_issue +$ODIN build test_issue_1592.odin $COMMON -file +build/test_issue.bin set +x -rm -rf tests/issues/build +rm -rf build diff --git a/tests/vendor/Makefile b/tests/vendor/Makefile index c508f6c50..380e64e09 100644 --- a/tests/vendor/Makefile +++ b/tests/vendor/Makefile @@ -1,5 +1,6 @@ ODIN=../../odin ODINFLAGS= +OUT_FILE=test_binary.bin OS=$(shell uname) @@ -10,4 +11,4 @@ endif all: botan_test botan_test: - $(ODIN) run botan -out=test_botan_hash -o:speed -no-bounds-check $(ODINFLAGS) + $(ODIN) run botan -out=$(OUT_FILE) -o:speed -no-bounds-check $(ODINFLAGS) diff --git a/tests/vendor/build.bat b/tests/vendor/build.bat index e70d9f1d5..4bd9a6496 100644 --- a/tests/vendor/build.bat +++ b/tests/vendor/build.bat @@ -1,5 +1,6 @@ @echo off -set COMMON=-show-timings -no-bounds-check -vet -strict-style +set OUT_FILE=test_binary.exe +set COMMON=-show-timings -no-bounds-check -vet -strict-style -out:%OUT_FILE% set PATH_TO_ODIN==..\..\odin echo --- From 9f8d90f466454f4d14e755d44e4ba47ccbf0c92e Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 24 Apr 2022 14:28:00 +0200 Subject: [PATCH 074/245] Update CI paths for issue tests. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 989f56712..d72775636 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: - name: Odin issues tests run: | cd tests/issues - run.sh + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Linux i386 run: ./odin check examples/all -vet -strict-style -target:linux_i386 @@ -95,7 +95,7 @@ jobs: - name: Odin issues tests run: | cd tests/issues - run.sh + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Darwin arm64 run: ./odin check examples/all -vet -strict-style -target:darwin_arm64 @@ -168,7 +168,7 @@ jobs: run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat cd tests\issues - call build.bat + call run.bat timeout-minutes: 10 - name: Odin check examples/all for Windows 32bits shell: cmd From 63331ef731209ec8db65d7f26bdbebdf9459107d Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 24 Apr 2022 19:53:36 +0200 Subject: [PATCH 075/245] Revert "Merge pull request #1702 from Kelimion/filename_generation" This reverts commit a40a53b10447c9223c24cccf565a95f1773d3922, reversing changes made to 5422a3b17eae821df4adf869960995e922eb0e76. --- .github/workflows/ci.yml | 11 +- .gitignore | 1 - Makefile | 4 +- build_odin.sh | 4 +- core/crypto/util/util.odin | 1 - src/build_settings.cpp | 208 +++------------------ src/common.cpp | 257 +++++++++++++++++++++++++- src/gb/gb.h | 50 ++--- src/llvm_backend.cpp | 14 +- src/llvm_backend_general.cpp | 1 + src/main.cpp | 152 ++++++++-------- src/parser.cpp | 2 +- src/path.cpp | 333 ---------------------------------- src/string.cpp | 10 +- tests/core/Makefile | 29 ++- tests/core/build.bat | 10 +- tests/core/math/big/build.bat | 2 +- tests/issues/run.bat | 21 ++- tests/issues/run.sh | 19 +- tests/vendor/Makefile | 3 +- tests/vendor/build.bat | 3 +- 21 files changed, 436 insertions(+), 699 deletions(-) delete mode 100644 src/path.cpp diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d72775636..3cc4283b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,9 +39,7 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: | - cd tests/issues - ./run.sh + run: tests/issues/run.sh timeout-minutes: 10 - name: Odin check examples/all for Linux i386 run: ./odin check examples/all -vet -strict-style -target:linux_i386 @@ -93,9 +91,7 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: | - cd tests/issues - ./run.sh + run: tests/issues/run.sh timeout-minutes: 10 - name: Odin check examples/all for Darwin arm64 run: ./odin check examples/all -vet -strict-style -target:darwin_arm64 @@ -167,8 +163,7 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat - cd tests\issues - call run.bat + call tests\issues\run.bat timeout-minutes: 10 - name: Odin check examples/all for Windows 32bits shell: cmd diff --git a/.gitignore b/.gitignore index d03a86fd7..e8b3d3050 100644 --- a/.gitignore +++ b/.gitignore @@ -269,7 +269,6 @@ bin/ # - Linux/MacOS odin odin.dSYM -*.bin # shared collection shared/ diff --git a/Makefile b/Makefile index 1a1c93180..82150c6a2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -all: debug +all: debug demo demo: - ./odin run examples/demo + ./odin run examples/demo/demo.odin report: ./odin report diff --git a/build_odin.sh b/build_odin.sh index 4810cafd2..aef3f2836 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -102,7 +102,7 @@ build_odin() { } run_demo() { - ./odin run examples/demo + ./odin run examples/demo/demo.odin -file } case $OS in @@ -147,4 +147,4 @@ if [[ $# -eq 1 ]]; then exit 0 else panic "Too many arguments!" -fi \ No newline at end of file +fi diff --git a/core/crypto/util/util.odin b/core/crypto/util/util.odin index 83b07e546..6273a232e 100644 --- a/core/crypto/util/util.odin +++ b/core/crypto/util/util.odin @@ -11,7 +11,6 @@ package util */ import "core:mem" -_ :: mem // @note(bp): this can replace the other two cast_slice :: #force_inline proc "contextless" ($D: typeid/[]$DE, src: $S/[]$SE) -> D { diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 212ded5c8..2f3eb03a5 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -3,6 +3,7 @@ #include #endif + // #if defined(GB_SYSTEM_WINDOWS) // #define DEFAULT_TO_THREADED_CHECKER // #endif @@ -197,22 +198,6 @@ enum RelocMode : u8 { RelocMode_DynamicNoPIC, }; -enum BuildPath : u8 { - BuildPath_Main_Package, // Input Path to the package directory (or file) we're building. - BuildPath_RC, // Input Path for .rc file, can be set with `-resource:`. - BuildPath_RES, // Output Path for .res file, generated from previous. - BuildPath_Win_SDK_Root, // windows_sdk_root - BuildPath_Win_SDK_UM_Lib, // windows_sdk_um_library_path - BuildPath_Win_SDK_UCRT_Lib, // windows_sdk_ucrt_library_path - BuildPath_VS_EXE, // vs_exe_path - BuildPath_VS_LIB, // vs_library_path - - BuildPath_Output, // Output Path for .exe, .dll, .so, etc. Can be overridden with `-out:`. - BuildPath_PDB, // Output Path for .pdb file, can be overridden with `-pdb-name:`. - - BuildPathCOUNT, -}; - // This stores the information for the specify architecture of this build struct BuildContext { // Constants @@ -241,13 +226,9 @@ struct BuildContext { bool show_help; - Array build_paths; // Contains `Path` objects to output filename, pdb, resource and intermediate files. - // BuildPath enum contains the indices of paths we know *before* the work starts. - String out_filepath; String resource_filepath; String pdb_filepath; - bool has_resource; String link_flags; String extra_linker_flags; @@ -319,6 +300,8 @@ struct BuildContext { }; + + gb_global BuildContext build_context = {0}; bool global_warnings_as_errors(void) { @@ -622,6 +605,28 @@ bool allow_check_foreign_filepath(void) { // is_abs_path // has_subdir +enum TargetFileValidity : u8 { + TargetFileValidity_Invalid, + + TargetFileValidity_Writable_File, + TargetFileValidity_No_Write_Permission, + TargetFileValidity_Directory, + + TargetTargetFileValidity_COUNT, +}; + +TargetFileValidity set_output_filename(void) { + // Assembles the output filename from build_context information. + // Returns `true` if it doesn't exist or is a file. + // Returns `false` if a directory or write-protected file. + + + + + return TargetFileValidity_Writable_File; +} + + String const WIN32_SEPARATOR_STRING = {cast(u8 *)"\\", 1}; String const NIX_SEPARATOR_STRING = {cast(u8 *)"/", 1}; @@ -968,6 +973,7 @@ char *token_pos_to_string(TokenPos const &pos) { return s; } + void init_build_context(TargetMetrics *cross_target) { BuildContext *bc = &build_context; @@ -1146,166 +1152,8 @@ void init_build_context(TargetMetrics *cross_target) { bc->optimization_level = gb_clamp(bc->optimization_level, 0, 3); + + #undef LINK_FLAG_X64 #undef LINK_FLAG_386 } - -#if defined(GB_SYSTEM_WINDOWS) -// NOTE(IC): In order to find Visual C++ paths without relying on environment variables. -// NOTE(Jeroen): No longer needed in `main.cpp -> linker_stage`. We now resolve those paths in `init_build_paths`. -#include "microsoft_craziness.h" -#endif - -// NOTE(Jeroen): Set/create the output and other paths and report an error as appropriate. -// We've previously called `parse_build_flags`, so `out_filepath` should be set. -bool init_build_paths(String init_filename) { - gbAllocator ha = heap_allocator(); - BuildContext *bc = &build_context; - - // NOTE(Jeroen): We're pre-allocating BuildPathCOUNT slots so that certain paths are always at the same enumerated index. - array_init(&bc->build_paths, permanent_allocator(), BuildPathCOUNT); - - // [BuildPathMainPackage] Turn given init path into a `Path`, which includes normalizing it into a full path. - bc->build_paths[BuildPath_Main_Package] = path_from_string(ha, init_filename); - - bool produces_output_file = false; - if (bc->command_kind == Command_doc && bc->cmd_doc_flags & CmdDocFlag_DocFormat) { - produces_output_file = true; - } else if (bc->command_kind & Command__does_build) { - produces_output_file = true; - } - - if (!produces_output_file) { - // Command doesn't produce output files. We're done. - return true; - } - - #if defined(GB_SYSTEM_WINDOWS) - if (bc->resource_filepath.len > 0) { - bc->build_paths[BuildPath_RC] = path_from_string(ha, bc->resource_filepath); - bc->build_paths[BuildPath_RES] = path_from_string(ha, bc->resource_filepath); - bc->build_paths[BuildPath_RC].ext = copy_string(ha, STR_LIT("rc")); - bc->build_paths[BuildPath_RES].ext = copy_string(ha, STR_LIT("res")); - } - - if (bc->pdb_filepath.len > 0) { - bc->build_paths[BuildPath_PDB] = path_from_string(ha, bc->pdb_filepath); - } - - if ((bc->command_kind & Command__does_build) && (!bc->ignore_microsoft_magic)) { - // NOTE(ic): It would be nice to extend this so that we could specify the Visual Studio version that we want instead of defaulting to the latest. - Find_Result_Utf8 find_result = find_visual_studio_and_windows_sdk_utf8(); - - if (find_result.windows_sdk_version == 0) { - gb_printf_err("Windows SDK not found.\n"); - return false; - } - - GB_ASSERT(find_result.windows_sdk_um_library_path.len > 0); - GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); - - if (find_result.windows_sdk_root.len > 0) { - bc->build_paths[BuildPath_Win_SDK_Root] = path_from_string(ha, find_result.windows_sdk_root); - } - - if (find_result.windows_sdk_um_library_path.len > 0) { - bc->build_paths[BuildPath_Win_SDK_UM_Lib] = path_from_string(ha, find_result.windows_sdk_um_library_path); - } - - if (find_result.windows_sdk_ucrt_library_path.len > 0) { - bc->build_paths[BuildPath_Win_SDK_UCRT_Lib] = path_from_string(ha, find_result.windows_sdk_ucrt_library_path); - } - - if (find_result.vs_exe_path.len > 0) { - bc->build_paths[BuildPath_VS_EXE] = path_from_string(ha, find_result.vs_exe_path); - } - - if (find_result.vs_library_path.len > 0) { - bc->build_paths[BuildPath_VS_LIB] = path_from_string(ha, find_result.vs_library_path); - } - - gb_free(ha, find_result.windows_sdk_root.text); - gb_free(ha, find_result.windows_sdk_um_library_path.text); - gb_free(ha, find_result.windows_sdk_ucrt_library_path.text); - gb_free(ha, find_result.vs_exe_path.text); - gb_free(ha, find_result.vs_library_path.text); - - } - #endif - - // All the build targets and OSes. - String output_extension; - - if (bc->command_kind == Command_doc && bc->cmd_doc_flags & CmdDocFlag_DocFormat) { - output_extension = STR_LIT("odin-doc"); - } else if (is_arch_wasm()) { - output_extension = STR_LIT("wasm"); - } else if (build_context.build_mode == BuildMode_Executable) { - // By default use a .bin executable extension. - output_extension = STR_LIT("bin"); - - if (build_context.metrics.os == TargetOs_windows) { - output_extension = STR_LIT("exe"); - } else if (build_context.cross_compiling && selected_target_metrics->metrics == &target_essence_amd64) { - output_extension = make_string(nullptr, 0); - } - } else if (build_context.build_mode == BuildMode_DynamicLibrary) { - // By default use a .so shared library extension. - output_extension = STR_LIT("so"); - - if (build_context.metrics.os == TargetOs_windows) { - output_extension = STR_LIT("dll"); - } else if (build_context.metrics.os == TargetOs_darwin) { - output_extension = STR_LIT("dylib"); - } - } else if (build_context.build_mode == BuildMode_Object) { - // By default use a .o object extension. - output_extension = STR_LIT("o"); - - if (build_context.metrics.os == TargetOs_windows) { - output_extension = STR_LIT("obj"); - } - } else if (build_context.build_mode == BuildMode_Assembly) { - // By default use a .S asm extension. - output_extension = STR_LIT("S"); - } else if (build_context.build_mode == BuildMode_LLVM_IR) { - output_extension = STR_LIT("ll"); - } else { - GB_PANIC("Unhandled build mode/target combination.\n"); - } - - if (bc->out_filepath.len > 0) { - bc->build_paths[BuildPath_Output] = path_from_string(ha, bc->out_filepath); - } else { - String output_name = remove_directory_from_path(init_filename); - output_name = remove_extension_from_path(output_name); - output_name = copy_string(ha, string_trim_whitespace(output_name)); - - Path output_path = path_from_string(ha, output_name); - - // Replace extension. - if (output_path.ext.len > 0) { - gb_free(ha, output_path.ext.text); - } - output_path.ext = copy_string(ha, output_extension); - - bc->build_paths[BuildPath_Output] = output_path; - } - - // Do we have an extension? We might not if the output filename was supplied. - if (bc->build_paths[BuildPath_Output].ext.len == 0) { - if (build_context.metrics.os == TargetOs_windows || build_context.build_mode != BuildMode_Executable) { - bc->build_paths[BuildPath_Output].ext = copy_string(ha, output_extension); - } - } - - // Check if output path is a directory. - if (path_is_directory(bc->build_paths[BuildPath_Output])) { - String output_file = path_to_string(ha, bc->build_paths[BuildPath_Output]); - defer (gb_free(ha, output_file.text)); - gb_printf_err("Output path %.*s is a directory.\n", LIT(output_file)); - return false; - } - - return true; -} \ No newline at end of file diff --git a/src/common.cpp b/src/common.cpp index 94248fb62..aaacda04b 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -675,7 +675,262 @@ wchar_t **command_line_to_wargv(wchar_t *cmd_line, int *_argc) { #endif -#include "path.cpp" + +#if defined(GB_SYSTEM_WINDOWS) + bool path_is_directory(String path) { + gbAllocator a = heap_allocator(); + String16 wstr = string_to_string16(a, path); + defer (gb_free(a, wstr.text)); + + i32 attribs = GetFileAttributesW(wstr.text); + if (attribs < 0) return false; + + return (attribs & FILE_ATTRIBUTE_DIRECTORY) != 0; + } + +#else + bool path_is_directory(String path) { + gbAllocator a = heap_allocator(); + char *copy = cast(char *)copy_string(a, path).text; + defer (gb_free(a, copy)); + + struct stat s; + if (stat(copy, &s) == 0) { + return (s.st_mode & S_IFDIR) != 0; + } + return false; + } +#endif + + +String path_to_full_path(gbAllocator a, String path) { + gbAllocator ha = heap_allocator(); + char *path_c = gb_alloc_str_len(ha, cast(char *)path.text, path.len); + defer (gb_free(ha, path_c)); + + char *fullpath = gb_path_get_full_name(a, path_c); + String res = string_trim_whitespace(make_string_c(fullpath)); +#if defined(GB_SYSTEM_WINDOWS) + for (isize i = 0; i < res.len; i++) { + if (res.text[i] == '\\') { + res.text[i] = '/'; + } + } +#endif + return res; +} + + + +struct FileInfo { + String name; + String fullpath; + i64 size; + bool is_dir; +}; + +enum ReadDirectoryError { + ReadDirectory_None, + + ReadDirectory_InvalidPath, + ReadDirectory_NotExists, + ReadDirectory_Permission, + ReadDirectory_NotDir, + ReadDirectory_Empty, + ReadDirectory_Unknown, + + ReadDirectory_COUNT, +}; + +i64 get_file_size(String path) { + char *c_str = alloc_cstring(heap_allocator(), path); + defer (gb_free(heap_allocator(), c_str)); + + gbFile f = {}; + gbFileError err = gb_file_open(&f, c_str); + defer (gb_file_close(&f)); + if (err != gbFileError_None) { + return -1; + } + return gb_file_size(&f); +} + + +#if defined(GB_SYSTEM_WINDOWS) +ReadDirectoryError read_directory(String path, Array *fi) { + GB_ASSERT(fi != nullptr); + + gbAllocator a = heap_allocator(); + + while (path.len > 0) { + Rune end = path[path.len-1]; + if (end == '/') { + path.len -= 1; + } else if (end == '\\') { + path.len -= 1; + } else { + break; + } + } + + if (path.len == 0) { + return ReadDirectory_InvalidPath; + } + { + char *c_str = alloc_cstring(a, path); + defer (gb_free(a, c_str)); + + gbFile f = {}; + gbFileError file_err = gb_file_open(&f, c_str); + defer (gb_file_close(&f)); + + switch (file_err) { + case gbFileError_Invalid: return ReadDirectory_InvalidPath; + case gbFileError_NotExists: return ReadDirectory_NotExists; + // case gbFileError_Permission: return ReadDirectory_Permission; + } + } + + if (!path_is_directory(path)) { + return ReadDirectory_NotDir; + } + + + char *new_path = gb_alloc_array(a, char, path.len+3); + defer (gb_free(a, new_path)); + + gb_memmove(new_path, path.text, path.len); + gb_memmove(new_path+path.len, "/*", 2); + new_path[path.len+2] = 0; + + String np = make_string(cast(u8 *)new_path, path.len+2); + String16 wstr = string_to_string16(a, np); + defer (gb_free(a, wstr.text)); + + WIN32_FIND_DATAW file_data = {}; + HANDLE find_file = FindFirstFileW(wstr.text, &file_data); + if (find_file == INVALID_HANDLE_VALUE) { + return ReadDirectory_Unknown; + } + defer (FindClose(find_file)); + + array_init(fi, a, 0, 100); + + do { + wchar_t *filename_w = file_data.cFileName; + i64 size = cast(i64)file_data.nFileSizeLow; + size |= (cast(i64)file_data.nFileSizeHigh) << 32; + String name = string16_to_string(a, make_string16_c(filename_w)); + if (name == "." || name == "..") { + gb_free(a, name.text); + continue; + } + + String filepath = {}; + filepath.len = path.len+1+name.len; + filepath.text = gb_alloc_array(a, u8, filepath.len+1); + defer (gb_free(a, filepath.text)); + gb_memmove(filepath.text, path.text, path.len); + gb_memmove(filepath.text+path.len, "/", 1); + gb_memmove(filepath.text+path.len+1, name.text, name.len); + + FileInfo info = {}; + info.name = name; + info.fullpath = path_to_full_path(a, filepath); + info.size = size; + info.is_dir = (file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; + array_add(fi, info); + } while (FindNextFileW(find_file, &file_data)); + + if (fi->count == 0) { + return ReadDirectory_Empty; + } + + return ReadDirectory_None; +} +#elif defined(GB_SYSTEM_LINUX) || defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_FREEBSD) || defined(GB_SYSTEM_OPENBSD) + +#include + +ReadDirectoryError read_directory(String path, Array *fi) { + GB_ASSERT(fi != nullptr); + + gbAllocator a = heap_allocator(); + + char *c_path = alloc_cstring(a, path); + defer (gb_free(a, c_path)); + + DIR *dir = opendir(c_path); + if (!dir) { + switch (errno) { + case ENOENT: + return ReadDirectory_NotExists; + case EACCES: + return ReadDirectory_Permission; + case ENOTDIR: + return ReadDirectory_NotDir; + default: + // ENOMEM: out of memory + // EMFILE: per-process limit on open fds reached + // ENFILE: system-wide limit on total open files reached + return ReadDirectory_Unknown; + } + GB_PANIC("unreachable"); + } + + array_init(fi, a, 0, 100); + + for (;;) { + struct dirent *entry = readdir(dir); + if (entry == nullptr) { + break; + } + + String name = make_string_c(entry->d_name); + if (name == "." || name == "..") { + continue; + } + + String filepath = {}; + filepath.len = path.len+1+name.len; + filepath.text = gb_alloc_array(a, u8, filepath.len+1); + defer (gb_free(a, filepath.text)); + gb_memmove(filepath.text, path.text, path.len); + gb_memmove(filepath.text+path.len, "/", 1); + gb_memmove(filepath.text+path.len+1, name.text, name.len); + filepath.text[filepath.len] = 0; + + + struct stat dir_stat = {}; + + if (stat((char *)filepath.text, &dir_stat)) { + continue; + } + + if (S_ISDIR(dir_stat.st_mode)) { + continue; + } + + i64 size = dir_stat.st_size; + + FileInfo info = {}; + info.name = name; + info.fullpath = path_to_full_path(a, filepath); + info.size = size; + array_add(fi, info); + } + + if (fi->count == 0) { + return ReadDirectory_Empty; + } + + return ReadDirectory_None; +} +#else +#error Implement read_directory +#endif + + struct LoadedFile { void *handle; diff --git a/src/gb/gb.h b/src/gb/gb.h index 3b2d6434c..b72a893f7 100644 --- a/src/gb/gb.h +++ b/src/gb/gb.h @@ -6273,44 +6273,20 @@ char *gb_path_get_full_name(gbAllocator a, char const *path) { #else char *p, *result, *fullpath = NULL; isize len; - fullpath = realpath(path, NULL); - - if (fullpath == NULL) { - // NOTE(Jeroen): Path doesn't exist. - if (gb_strlen(path) > 0 && path[0] == '/') { - // But it is an absolute path, so return as-is. - - fullpath = (char *)path; - len = gb_strlen(fullpath) + 1; - result = gb_alloc_array(a, char, len + 1); - - gb_memmove(result, fullpath, len); - result[len] = 0; - - } else { - // Appears to be a relative path, so construct an absolute one relative to . - char cwd[4096]; - getcwd(&cwd[0], 4096); - - isize path_len = gb_strlen(path); - isize cwd_len = gb_strlen(cwd); - len = cwd_len + 1 + path_len + 1; - result = gb_alloc_array(a, char, len); - - gb_memmove(result, (void *)cwd, cwd_len); - result[cwd_len] = '/'; - - gb_memmove(result + cwd_len + 1, (void *)path, gb_strlen(path)); - result[len] = 0; - - } - } else { - len = gb_strlen(fullpath) + 1; - result = gb_alloc_array(a, char, len + 1); - gb_memmove(result, fullpath, len); - result[len] = 0; - free(fullpath); + p = realpath(path, NULL); + fullpath = p; + if (p == NULL) { + // NOTE(bill): File does not exist + fullpath = cast(char *)path; } + + len = gb_strlen(fullpath); + + result = gb_alloc_array(a, char, len + 1); + gb_memmove(result, fullpath, len); + result[len] = 0; + free(p); + return result; #endif } diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 7781997f7..f5cb84785 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -967,12 +967,7 @@ lbProcedure *lb_create_main_procedure(lbModule *m, lbProcedure *startup_runtime) } String lb_filepath_ll_for_module(lbModule *m) { - String path = concatenate3_strings(permanent_allocator(), - build_context.build_paths[BuildPath_Output].basename, - STR_LIT("/"), - build_context.build_paths[BuildPath_Output].name - ); - + String path = m->gen->output_base; if (m->pkg) { path = concatenate3_strings(permanent_allocator(), path, STR_LIT("-"), m->pkg->name); } else if (USE_SEPARATE_MODULES) { @@ -983,12 +978,7 @@ String lb_filepath_ll_for_module(lbModule *m) { return path; } String lb_filepath_obj_for_module(lbModule *m) { - String path = concatenate3_strings(permanent_allocator(), - build_context.build_paths[BuildPath_Output].basename, - STR_LIT("/"), - build_context.build_paths[BuildPath_Output].name - ); - + String path = m->gen->output_base; if (m->pkg) { path = concatenate3_strings(permanent_allocator(), path, STR_LIT("-"), m->pkg->name); } diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp index 1a431a4ac..330059622 100644 --- a/src/llvm_backend_general.cpp +++ b/src/llvm_backend_general.cpp @@ -87,6 +87,7 @@ bool lb_init_generator(lbGenerator *gen, Checker *c) { return false; } + String init_fullpath = c->parser->init_fullpath; if (build_context.out_filepath.len == 0) { diff --git a/src/main.cpp b/src/main.cpp index 7b0364149..fc8792ceb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,6 +46,7 @@ gb_global Timings global_timings = {0}; #include "checker.cpp" #include "docs.cpp" + #include "llvm_backend.cpp" #if defined(GB_SYSTEM_OSX) @@ -56,8 +57,16 @@ gb_global Timings global_timings = {0}; #endif #include "query_data.cpp" + + +#if defined(GB_SYSTEM_WINDOWS) +// NOTE(IC): In order to find Visual C++ paths without relying on environment variables. +#include "microsoft_craziness.h" +#endif + #include "bug_report.cpp" + // NOTE(bill): 'name' is used in debugging and profiling modes i32 system_exec_command_line_app(char const *name, char const *fmt, ...) { isize const cmd_cap = 64<<20; // 64 MiB should be more than enough @@ -121,35 +130,34 @@ i32 system_exec_command_line_app(char const *name, char const *fmt, ...) { } + + i32 linker_stage(lbGenerator *gen) { i32 result = 0; Timings *timings = &global_timings; - String output_filename = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]); - debugf("Linking %.*s\n", LIT(output_filename)); - - // TOOD(Jeroen): Make a `build_paths[BuildPath_Object] to avoid `%.*s.o`. + String output_base = gen->output_base; if (is_arch_wasm()) { timings_start_section(timings, str_lit("wasm-ld")); #if defined(GB_SYSTEM_WINDOWS) result = system_exec_command_line_app("wasm-ld", - "\"%.*s\\bin\\wasm-ld\" \"%.*s.o\" -o \"%.*s\" %.*s %.*s", + "\"%.*s\\bin\\wasm-ld\" \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", LIT(build_context.ODIN_ROOT), - LIT(output_filename), LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); #else result = system_exec_command_line_app("wasm-ld", - "wasm-ld \"%.*s.o\" -o \"%.*s\" %.*s %.*s", - LIT(output_filename), LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + "wasm-ld \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", + LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); #endif return result; } if (build_context.cross_compiling && selected_target_metrics->metrics == &target_essence_amd64) { -#if defined(GB_SYSTEM_UNIX) +#ifdef GB_SYSTEM_UNIX result = system_exec_command_line_app("linker", "x86_64-essence-gcc \"%.*s.o\" -o \"%.*s\" %.*s %.*s", - LIT(output_filename), LIT(output_filename), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); #else gb_printf_err("Linking for cross compilation for this platform is not yet supported (%.*s %.*s)\n", LIT(target_os_names[build_context.metrics.os]), @@ -173,11 +181,28 @@ i32 linker_stage(lbGenerator *gen) { gbString lib_str = gb_string_make(heap_allocator(), ""); defer (gb_string_free(lib_str)); + char const *output_ext = "exe"; gbString link_settings = gb_string_make_reserve(heap_allocator(), 256); defer (gb_string_free(link_settings)); + + // NOTE(ic): It would be nice to extend this so that we could specify the Visual Studio version that we want instead of defaulting to the latest. + Find_Result_Utf8 find_result = find_visual_studio_and_windows_sdk_utf8(); + + if (find_result.windows_sdk_version == 0) { + gb_printf_err("Windows SDK not found.\n"); + exit(1); + } + + if (build_context.ignore_microsoft_magic) { + find_result = {}; + } + // Add library search paths. - if (build_context.build_paths[BuildPath_VS_LIB].basename.len > 0) { + if (find_result.vs_library_path.len > 0) { + GB_ASSERT(find_result.windows_sdk_um_library_path.len > 0); + GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); + String path = {}; auto add_path = [&](String path) { if (path[path.len-1] == '\\') { @@ -185,9 +210,9 @@ i32 linker_stage(lbGenerator *gen) { } link_settings = gb_string_append_fmt(link_settings, " /LIBPATH:\"%.*s\"", LIT(path)); }; - add_path(build_context.build_paths[BuildPath_Win_SDK_UM_Lib].basename); - add_path(build_context.build_paths[BuildPath_Win_SDK_UCRT_Lib].basename); - add_path(build_context.build_paths[BuildPath_VS_LIB].basename); + add_path(find_result.windows_sdk_um_library_path); + add_path(find_result.windows_sdk_ucrt_library_path); + add_path(find_result.vs_library_path); } @@ -227,14 +252,14 @@ i32 linker_stage(lbGenerator *gen) { if (build_context.build_mode == BuildMode_DynamicLibrary) { + output_ext = "dll"; link_settings = gb_string_append_fmt(link_settings, " /DLL"); } else { link_settings = gb_string_append_fmt(link_settings, " /ENTRY:mainCRTStartup"); } if (build_context.pdb_filepath != "") { - String pdb_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_PDB]); - link_settings = gb_string_append_fmt(link_settings, " /PDB:%.*s", LIT(pdb_path)); + link_settings = gb_string_append_fmt(link_settings, " /PDB:%.*s", LIT(build_context.pdb_filepath)); } if (build_context.no_crt) { @@ -275,21 +300,13 @@ i32 linker_stage(lbGenerator *gen) { object_files = gb_string_append_fmt(object_files, "\"%.*s\" ", LIT(object_path)); } - String vs_exe_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_VS_EXE]); - defer (gb_free(heap_allocator(), vs_exe_path.text)); - char const *subsystem_str = build_context.use_subsystem_windows ? "WINDOWS" : "CONSOLE"; if (!build_context.use_lld) { // msvc if (build_context.has_resource) { - String rc_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_RC]); - String res_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_RES]); - defer (gb_free(heap_allocator(), rc_path.text)); - defer (gb_free(heap_allocator(), res_path.text)); - result = system_exec_command_line_app("msvc-link", - "\"rc.exe\" /nologo /fo \"%.*s\" \"%.*s\"", - LIT(res_path), - LIT(rc_path) + "\"rc.exe\" /nologo /fo \"%.*s.res\" \"%.*s.rc\"", + LIT(output_base), + LIT(build_context.resource_filepath) ); if (result) { @@ -297,13 +314,13 @@ i32 linker_stage(lbGenerator *gen) { } result = system_exec_command_line_app("msvc-link", - "\"%.*slink.exe\" %s \"%.*s\" -OUT:\"%.*s\" %s " + "\"%.*slink.exe\" %s \"%.*s.res\" -OUT:\"%.*s.%s\" %s " "/nologo /incremental:no /opt:ref /subsystem:%s " " %.*s " " %.*s " " %s " "", - LIT(vs_exe_path), object_files, LIT(res_path), LIT(output_filename), + LIT(find_result.vs_exe_path), object_files, LIT(output_base), LIT(output_base), output_ext, link_settings, subsystem_str, LIT(build_context.link_flags), @@ -312,13 +329,13 @@ i32 linker_stage(lbGenerator *gen) { ); } else { result = system_exec_command_line_app("msvc-link", - "\"%.*slink.exe\" %s -OUT:\"%.*s\" %s " + "\"%.*slink.exe\" %s -OUT:\"%.*s.%s\" %s " "/nologo /incremental:no /opt:ref /subsystem:%s " " %.*s " " %.*s " " %s " "", - LIT(vs_exe_path), object_files, LIT(output_filename), + LIT(find_result.vs_exe_path), object_files, LIT(output_base), output_ext, link_settings, subsystem_str, LIT(build_context.link_flags), @@ -333,13 +350,13 @@ i32 linker_stage(lbGenerator *gen) { } else { // lld result = system_exec_command_line_app("msvc-lld-link", - "\"%.*s\\bin\\lld-link\" %s -OUT:\"%.*s\" %s " + "\"%.*s\\bin\\lld-link\" %s -OUT:\"%.*s.%s\" %s " "/nologo /incremental:no /opt:ref /subsystem:%s " " %.*s " " %.*s " " %s " "", - LIT(build_context.ODIN_ROOT), object_files, LIT(output_filename), + LIT(build_context.ODIN_ROOT), object_files, LIT(output_base),output_ext, link_settings, subsystem_str, LIT(build_context.link_flags), @@ -398,7 +415,7 @@ i32 linker_stage(lbGenerator *gen) { } else if (string_ends_with(lib, str_lit(".so"))) { // dynamic lib, relative path to executable // NOTE(vassvik): it is the user's responsibility to make sure the shared library files are visible - // at runtime to the executable + // at runtimeto the executable lib_str = gb_string_append_fmt(lib_str, " -l:\"%s/%.*s\" ", cwd, LIT(lib)); } else { // dynamic or static system lib, just link regularly searching system library paths @@ -414,6 +431,9 @@ i32 linker_stage(lbGenerator *gen) { object_files = gb_string_append_fmt(object_files, "\"%.*s\" ", LIT(object_path)); } + // Unlike the Win32 linker code, the output_ext includes the dot, because + // typically executable files on *NIX systems don't have extensions. + String output_ext = {}; gbString link_settings = gb_string_make_reserve(heap_allocator(), 32); if (build_context.no_crt) { @@ -441,12 +461,26 @@ i32 linker_stage(lbGenerator *gen) { // correctly this way since all the other dependencies provided implicitly // by the compiler frontend are still needed and most of the command // line arguments prepared previously are incompatible with ld. + // + // Shared libraries are .dylib on MacOS and .so on Linux. + if (build_context.metrics.os == TargetOs_darwin) { + output_ext = STR_LIT(".dylib"); + } else { + output_ext = STR_LIT(".so"); + } link_settings = gb_string_appendc(link_settings, "-Wl,-init,'_odin_entry_point' "); link_settings = gb_string_appendc(link_settings, "-Wl,-fini,'_odin_exit_point' "); } else if (build_context.metrics.os != TargetOs_openbsd) { // OpenBSD defaults to PIE executable. do not pass -no-pie for it. link_settings = gb_string_appendc(link_settings, "-no-pie "); } + if (build_context.out_filepath.len > 0) { + //NOTE(thebirk): We have a custom -out arguments, so we should use the extension from that + isize pos = string_extension_position(build_context.out_filepath); + if (pos > 0) { + output_ext = substring(build_context.out_filepath, pos, build_context.out_filepath.len); + } + } gbString platform_lib_str = gb_string_make(heap_allocator(), ""); defer (gb_string_free(platform_lib_str)); @@ -473,7 +507,7 @@ i32 linker_stage(lbGenerator *gen) { defer (gb_string_free(link_command_line)); link_command_line = gb_string_appendc(link_command_line, object_files); - link_command_line = gb_string_append_fmt(link_command_line, " -o \"%.*s\" ", LIT(output_filename)); + link_command_line = gb_string_append_fmt(link_command_line, " -o \"%.*s%.*s\" ", LIT(output_base), LIT(output_ext)); link_command_line = gb_string_append_fmt(link_command_line, " %s ", platform_lib_str); link_command_line = gb_string_append_fmt(link_command_line, " %s ", lib_str); link_command_line = gb_string_append_fmt(link_command_line, " %.*s ", LIT(build_context.link_flags)); @@ -490,7 +524,9 @@ i32 linker_stage(lbGenerator *gen) { if (build_context.ODIN_DEBUG) { // NOTE: macOS links DWARF symbols dynamically. Dsymutil will map the stubs in the exe // to the symbols in the object file - result = system_exec_command_line_app("dsymutil", "dsymutil %.*s", LIT(output_filename)); + result = system_exec_command_line_app("dsymutil", + "dsymutil %.*s%.*s", LIT(output_base), LIT(output_ext) + ); if (result) { return result; @@ -1490,10 +1526,6 @@ bool parse_build_flags(Array args) { gb_printf_err("Invalid -resource path %.*s, missing .rc\n", LIT(path)); bad_flags = true; break; - } else if (!gb_file_exists((const char *)path.text)) { - gb_printf_err("Invalid -resource path %.*s, file does not exist.\n", LIT(path)); - bad_flags = true; - break; } build_context.resource_filepath = substring(path, 0, string_extension_position(path)); build_context.has_resource = true; @@ -1508,11 +1540,6 @@ bool parse_build_flags(Array args) { String path = value.value_string; path = string_trim_whitespace(path); if (is_build_flag_path_valid(path)) { - if (path_is_directory(path)) { - gb_printf_err("Invalid -pdb-name path. %.*s, is a directory.\n", LIT(path)); - bad_flags = true; - break; - } // #if defined(GB_SYSTEM_WINDOWS) // String ext = path_extension(path); // if (ext != ".pdb") { @@ -2639,8 +2666,6 @@ int main(int arg_count, char const **arg_ptr) { return 1; } - init_filename = copy_string(permanent_allocator(), init_filename); - if (init_filename == "-help" || init_filename == "--help") { build_context.show_help = true; @@ -2663,12 +2688,6 @@ int main(int arg_count, char const **arg_ptr) { gb_printf_err("Did you mean `%.*s %.*s %.*s -file`?\n", LIT(args[0]), LIT(command), LIT(init_filename)); gb_printf_err("The `-file` flag tells it to treat a file as a self-contained package.\n"); return 1; - } else { - String const ext = str_lit(".odin"); - if (!string_ends_with(init_filename, ext)) { - gb_printf_err("Expected either a directory or a .odin file, got '%.*s'\n", LIT(init_filename)); - return 1; - } } } } @@ -2690,24 +2709,13 @@ int main(int arg_count, char const **arg_ptr) { get_fullpath_relative(heap_allocator(), odin_root_dir(), str_lit("shared"))); } + init_build_context(selected_target_metrics ? selected_target_metrics->metrics : nullptr); // if (build_context.word_size == 4 && build_context.metrics.os != TargetOs_js) { // print_usage_line(0, "%.*s 32-bit is not yet supported for this platform", LIT(args[0])); // return 1; // } - // Set and check build paths... - if (!init_build_paths(init_filename)) { - return 1; - } - - if (build_context.show_debug_messages) { - for_array(i, build_context.build_paths) { - String build_path = path_to_string(heap_allocator(), build_context.build_paths[i]); - debugf("build_paths[%ld]: %.*s\n", i, LIT(build_path)); - } - } - init_global_thread_pool(); defer (thread_pool_destroy(&global_thread_pool)); @@ -2724,8 +2732,6 @@ int main(int arg_count, char const **arg_ptr) { } defer (destroy_parser(parser)); - // TODO(jeroen): Remove the `init_filename` param. - // Let's put that on `build_context.build_paths[0]` instead. if (parse_packages(parser, init_filename) != ParseFile_None) { return 1; } @@ -2804,14 +2810,16 @@ int main(int arg_count, char const **arg_ptr) { } if (run_output) { - String exe_name = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]); - defer (gb_free(heap_allocator(), exe_name.text)); - #if defined(GB_SYSTEM_WINDOWS) - return system_exec_command_line_app("odin run", "%.*s %.*s", LIT(exe_name), LIT(run_args_string)); + return system_exec_command_line_app("odin run", "%.*s.exe %.*s", LIT(gen->output_base), LIT(run_args_string)); #else - return system_exec_command_line_app("odin run", "\"%.*s\" %.*s", LIT(exe_name), LIT(run_args_string)); + //NOTE(thebirk): This whole thing is a little leaky + String output_ext = {}; + String complete_path = concatenate_strings(permanent_allocator(), gen->output_base, output_ext); + complete_path = path_to_full_path(permanent_allocator(), complete_path); + return system_exec_command_line_app("odin run", "\"%.*s\" %.*s", LIT(complete_path), LIT(run_args_string)); #endif } + return 0; } diff --git a/src/parser.cpp b/src/parser.cpp index df7f908a6..767119aa8 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -5751,7 +5751,7 @@ ParseFileError parse_packages(Parser *p, String init_filename) { } } } - + { // Add these packages serially and then process them parallel mutex_lock(&p->wait_mutex); diff --git a/src/path.cpp b/src/path.cpp deleted file mode 100644 index 8d8e532b8..000000000 --- a/src/path.cpp +++ /dev/null @@ -1,333 +0,0 @@ -/* - Path handling utilities. -*/ - -#if defined(GB_SYSTEM_WINDOWS) - bool path_is_directory(String path) { - gbAllocator a = heap_allocator(); - String16 wstr = string_to_string16(a, path); - defer (gb_free(a, wstr.text)); - - i32 attribs = GetFileAttributesW(wstr.text); - if (attribs < 0) return false; - - return (attribs & FILE_ATTRIBUTE_DIRECTORY) != 0; - } - -#else - bool path_is_directory(String path) { - gbAllocator a = heap_allocator(); - char *copy = cast(char *)copy_string(a, path).text; - defer (gb_free(a, copy)); - - struct stat s; - if (stat(copy, &s) == 0) { - return (s.st_mode & S_IFDIR) != 0; - } - return false; - } -#endif - - -String path_to_full_path(gbAllocator a, String path) { - gbAllocator ha = heap_allocator(); - char *path_c = gb_alloc_str_len(ha, cast(char *)path.text, path.len); - defer (gb_free(ha, path_c)); - - char *fullpath = gb_path_get_full_name(a, path_c); - String res = string_trim_whitespace(make_string_c(fullpath)); -#if defined(GB_SYSTEM_WINDOWS) - for (isize i = 0; i < res.len; i++) { - if (res.text[i] == '\\') { - res.text[i] = '/'; - } - } -#endif - return copy_string(a, res); -} - -struct Path { - String basename; - String name; - String ext; -}; - -// NOTE(Jeroen): Naively turns a Path into a string. -String path_to_string(gbAllocator a, Path path) { - if (path.basename.len + path.name.len + path.ext.len == 0) { - return make_string(nullptr, 0); - } - - isize len = path.basename.len + 1 + path.name.len + 1; - if (path.ext.len > 0) { - len += path.ext.len + 1; - } - - u8 *str = gb_alloc_array(a, u8, len); - - isize i = 0; - gb_memmove(str+i, path.basename.text, path.basename.len); i += path.basename.len; - gb_memmove(str+i, "/", 1); i += 1; - gb_memmove(str+i, path.name.text, path.name.len); i += path.name.len; - if (path.ext.len > 0) { - gb_memmove(str+i, ".", 1); i += 1; - gb_memmove(str+i, path.ext.text, path.ext.len); i += path.ext.len; - } - str[i] = 0; - - String res = make_string(str, i); - res = string_trim_whitespace(res); - return res; -} - -// NOTE(Jeroen): Naively turns a Path into a string, then normalizes it using `path_to_full_path`. -String path_to_full_path(gbAllocator a, Path path) { - String temp = path_to_string(heap_allocator(), path); - defer (gb_free(heap_allocator(), temp.text)); - - return path_to_full_path(a, temp); -} - -// NOTE(Jeroen): Takes a path like "odin" or "W:\Odin", turns it into a full path, -// and then breaks it into its components to make a Path. -Path path_from_string(gbAllocator a, String const &path) { - Path res = {}; - - if (path.len == 0) return res; - - String fullpath = path_to_full_path(a, path); - defer (gb_free(heap_allocator(), fullpath.text)); - - res.basename = directory_from_path(fullpath); - res.basename = copy_string(a, res.basename); - - if (string_ends_with(fullpath, '/')) { - // It's a directory. We don't need to tinker with the name and extension. - return res; - } - - isize name_start = (res.basename.len > 0) ? res.basename.len + 1 : res.basename.len; - res.name = substring(fullpath, name_start, fullpath.len); - res.name = remove_extension_from_path(res.name); - res.name = copy_string(a, res.name); - - res.ext = path_extension(fullpath, false); // false says not to include the dot. - res.ext = copy_string(a, res.ext); - return res; -} - -bool path_is_directory(Path path) { - String path_string = path_to_full_path(heap_allocator(), path); - defer (gb_free(heap_allocator(), path_string.text)); - - return path_is_directory(path_string); -} - -struct FileInfo { - String name; - String fullpath; - i64 size; - bool is_dir; -}; - -enum ReadDirectoryError { - ReadDirectory_None, - - ReadDirectory_InvalidPath, - ReadDirectory_NotExists, - ReadDirectory_Permission, - ReadDirectory_NotDir, - ReadDirectory_Empty, - ReadDirectory_Unknown, - - ReadDirectory_COUNT, -}; - -i64 get_file_size(String path) { - char *c_str = alloc_cstring(heap_allocator(), path); - defer (gb_free(heap_allocator(), c_str)); - - gbFile f = {}; - gbFileError err = gb_file_open(&f, c_str); - defer (gb_file_close(&f)); - if (err != gbFileError_None) { - return -1; - } - return gb_file_size(&f); -} - - -#if defined(GB_SYSTEM_WINDOWS) -ReadDirectoryError read_directory(String path, Array *fi) { - GB_ASSERT(fi != nullptr); - - gbAllocator a = heap_allocator(); - - while (path.len > 0) { - Rune end = path[path.len-1]; - if (end == '/') { - path.len -= 1; - } else if (end == '\\') { - path.len -= 1; - } else { - break; - } - } - - if (path.len == 0) { - return ReadDirectory_InvalidPath; - } - { - char *c_str = alloc_cstring(a, path); - defer (gb_free(a, c_str)); - - gbFile f = {}; - gbFileError file_err = gb_file_open(&f, c_str); - defer (gb_file_close(&f)); - - switch (file_err) { - case gbFileError_Invalid: return ReadDirectory_InvalidPath; - case gbFileError_NotExists: return ReadDirectory_NotExists; - // case gbFileError_Permission: return ReadDirectory_Permission; - } - } - - if (!path_is_directory(path)) { - return ReadDirectory_NotDir; - } - - - char *new_path = gb_alloc_array(a, char, path.len+3); - defer (gb_free(a, new_path)); - - gb_memmove(new_path, path.text, path.len); - gb_memmove(new_path+path.len, "/*", 2); - new_path[path.len+2] = 0; - - String np = make_string(cast(u8 *)new_path, path.len+2); - String16 wstr = string_to_string16(a, np); - defer (gb_free(a, wstr.text)); - - WIN32_FIND_DATAW file_data = {}; - HANDLE find_file = FindFirstFileW(wstr.text, &file_data); - if (find_file == INVALID_HANDLE_VALUE) { - return ReadDirectory_Unknown; - } - defer (FindClose(find_file)); - - array_init(fi, a, 0, 100); - - do { - wchar_t *filename_w = file_data.cFileName; - i64 size = cast(i64)file_data.nFileSizeLow; - size |= (cast(i64)file_data.nFileSizeHigh) << 32; - String name = string16_to_string(a, make_string16_c(filename_w)); - if (name == "." || name == "..") { - gb_free(a, name.text); - continue; - } - - String filepath = {}; - filepath.len = path.len+1+name.len; - filepath.text = gb_alloc_array(a, u8, filepath.len+1); - defer (gb_free(a, filepath.text)); - gb_memmove(filepath.text, path.text, path.len); - gb_memmove(filepath.text+path.len, "/", 1); - gb_memmove(filepath.text+path.len+1, name.text, name.len); - - FileInfo info = {}; - info.name = name; - info.fullpath = path_to_full_path(a, filepath); - info.size = size; - info.is_dir = (file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; - array_add(fi, info); - } while (FindNextFileW(find_file, &file_data)); - - if (fi->count == 0) { - return ReadDirectory_Empty; - } - - return ReadDirectory_None; -} -#elif defined(GB_SYSTEM_LINUX) || defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_FREEBSD) || defined(GB_SYSTEM_OPENBSD) - -#include - -ReadDirectoryError read_directory(String path, Array *fi) { - GB_ASSERT(fi != nullptr); - - gbAllocator a = heap_allocator(); - - char *c_path = alloc_cstring(a, path); - defer (gb_free(a, c_path)); - - DIR *dir = opendir(c_path); - if (!dir) { - switch (errno) { - case ENOENT: - return ReadDirectory_NotExists; - case EACCES: - return ReadDirectory_Permission; - case ENOTDIR: - return ReadDirectory_NotDir; - default: - // ENOMEM: out of memory - // EMFILE: per-process limit on open fds reached - // ENFILE: system-wide limit on total open files reached - return ReadDirectory_Unknown; - } - GB_PANIC("unreachable"); - } - - array_init(fi, a, 0, 100); - - for (;;) { - struct dirent *entry = readdir(dir); - if (entry == nullptr) { - break; - } - - String name = make_string_c(entry->d_name); - if (name == "." || name == "..") { - continue; - } - - String filepath = {}; - filepath.len = path.len+1+name.len; - filepath.text = gb_alloc_array(a, u8, filepath.len+1); - defer (gb_free(a, filepath.text)); - gb_memmove(filepath.text, path.text, path.len); - gb_memmove(filepath.text+path.len, "/", 1); - gb_memmove(filepath.text+path.len+1, name.text, name.len); - filepath.text[filepath.len] = 0; - - - struct stat dir_stat = {}; - - if (stat((char *)filepath.text, &dir_stat)) { - continue; - } - - if (S_ISDIR(dir_stat.st_mode)) { - continue; - } - - i64 size = dir_stat.st_size; - - FileInfo info = {}; - info.name = name; - info.fullpath = path_to_full_path(a, filepath); - info.size = size; - array_add(fi, info); - } - - if (fi->count == 0) { - return ReadDirectory_Empty; - } - - return ReadDirectory_None; -} -#else -#error Implement read_directory -#endif - diff --git a/src/string.cpp b/src/string.cpp index 3515df48e..d3dbc6904 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -245,14 +245,15 @@ gb_inline isize string_extension_position(String const &str) { return dot_pos; } -String path_extension(String const &str, bool include_dot = true) { +String path_extension(String const &str) { isize pos = string_extension_position(str); if (pos < 0) { return make_string(nullptr, 0); } - return substring(str, include_dot ? pos : pos + 1, str.len); + return substring(str, pos, str.len); } + String string_trim_whitespace(String str) { while (str.len > 0 && rune_is_whitespace(str[str.len-1])) { str.len--; @@ -327,10 +328,7 @@ String directory_from_path(String const &s) { break; } } - if (i >= 0) { - return substring(s, 0, i); - } - return substring(s, 0, 0); + return substring(s, 0, i); } String concatenate_strings(gbAllocator a, String const &x, String const &y) { diff --git a/tests/core/Makefile b/tests/core/Makefile index 9bb622633..6a92b4efb 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,6 +1,5 @@ ODIN=../../odin PYTHON=$(shell which python3) -OUT_FILE=test_binary.bin all: download_test_assets image_test compress_test strings_test hash_test crypto_test noise_test encoding_test \ math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test @@ -9,39 +8,39 @@ download_test_assets: $(PYTHON) download_assets.py image_test: - $(ODIN) run image/test_core_image.odin -out=$(OUT_FILE) -file + $(ODIN) run image/test_core_image.odin -file compress_test: - $(ODIN) run compress/test_core_compress.odin -out=$(OUT_FILE) -file + $(ODIN) run compress/test_core_compress.odin -file strings_test: - $(ODIN) run strings/test_core_strings.odin -out=$(OUT_FILE) -file + $(ODIN) run strings/test_core_strings.odin -file hash_test: - $(ODIN) run hash -out=$(OUT_FILE) -o:speed -no-bounds-check + $(ODIN) run hash -out=test_hash -o:speed -no-bounds-check crypto_test: - $(ODIN) run crypto -out=$(OUT_FILE) -o:speed -no-bounds-check + $(ODIN) run crypto -out=test_crypto_hash -o:speed -no-bounds-check noise_test: - $(ODIN) run math/noise -out=$(OUT_FILE) + $(ODIN) run math/noise -out=test_noise encoding_test: - $(ODIN) run encoding/hxa -out=$(OUT_FILE) -collection:tests=.. - $(ODIN) run encoding/json -out=$(OUT_FILE) - $(ODIN) run encoding/varint -out=$(OUT_FILE) + $(ODIN) run encoding/hxa -out=test_hxa -collection:tests=.. + $(ODIN) run encoding/json -out=test_json + $(ODIN) run encoding/varint -out=test_varint math_test: - $(ODIN) run math/test_core_math.odin -out=$(OUT_FILE) -file -collection:tests=.. + $(ODIN) run math/test_core_math.odin -out=test_core_math -file -collection:tests=.. linalg_glsl_math_test: - $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=$(OUT_FILE) -collection:tests=.. + $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=test_linalg_glsl_math -collection:tests=.. filepath_test: - $(ODIN) run path/filepath/test_core_filepath.odin -file -out=$(OUT_FILE) -collection:tests=.. + $(ODIN) run path/filepath/test_core_filepath.odin -file -out=test_core_filepath -collection:tests=.. reflect_test: - $(ODIN) run reflect/test_core_reflect.odin -file -out=$(OUT_FILE) -collection:tests=.. + $(ODIN) run reflect/test_core_reflect.odin -file -out=test_core_reflect -collection:tests=.. os_exit_test: - $(ODIN) run os/test_core_os_exit.odin -file -out=$(OUT_FILE) && exit 1 || exit 0 + $(ODIN) run os/test_core_os_exit.odin -file -out=test_core_os_exit && exit 1 || exit 0 diff --git a/tests/core/build.bat b/tests/core/build.bat index 331a473aa..2f9ba672e 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -1,8 +1,6 @@ @echo off -set OUT_FILE=test_binary.exe -set COMMON=-show-timings -no-bounds-check -vet -strict-style -collection:tests=.. -out:%OUT_FILE% +set COMMON=-show-timings -no-bounds-check -vet -strict-style -collection:tests=.. set PATH_TO_ODIN==..\..\odin - python3 download_assets.py echo --- echo Running core:image tests @@ -37,14 +35,14 @@ echo --- echo --- echo Running core:encoding tests echo --- -%PATH_TO_ODIN% run encoding/hxa %COMMON% -%PATH_TO_ODIN% run encoding/json %COMMON% +%PATH_TO_ODIN% run encoding/hxa %COMMON% +%PATH_TO_ODIN% run encoding/json %COMMON% %PATH_TO_ODIN% run encoding/varint %COMMON% echo --- echo Running core:math/noise tests echo --- -%PATH_TO_ODIN% run math/noise %COMMON% +%PATH_TO_ODIN% run math/noise %COMMON% echo --- echo Running core:math tests diff --git a/tests/core/math/big/build.bat b/tests/core/math/big/build.bat index ad199d775..16bdbc8ca 100644 --- a/tests/core/math/big/build.bat +++ b/tests/core/math/big/build.bat @@ -4,7 +4,7 @@ set PATH_TO_ODIN==..\..\..\..\odin set TEST_ARGS=-fast-tests set TEST_ARGS=-no-random set TEST_ARGS= -set OUT_NAME=math_big_test_library.dll +set OUT_NAME=math_big_test_library set COMMON=-build-mode:shared -show-timings -no-bounds-check -define:MATH_BIG_EXE=false -vet -strict-style echo --- echo Running core:math/big tests diff --git a/tests/issues/run.bat b/tests/issues/run.bat index a936bd896..a652d9694 100644 --- a/tests/issues/run.bat +++ b/tests/issues/run.bat @@ -1,12 +1,17 @@ @echo off -set PATH_TO_ODIN==..\..\odin -set COMMON=-collection:tests=.. -out:build\test_issue -if not exist "build" mkdir build -%PATH_TO_ODIN% build test_issue_829.odin %COMMON% -file -build\test_issue +if not exist "tests\issues\build\" mkdir tests\issues\build -%PATH_TO_ODIN% build test_issue_1592.odin %COMMON% -file -build\test_issue +set COMMON=-collection:tests=tests -out:tests\issues\build\test_issue -rmdir /S /Q build +@echo on + +.\odin build tests\issues\test_issue_829.odin %COMMON% -file +tests\issues\build\test_issue + +.\odin build tests\issues\test_issue_1592.odin %COMMON% -file +tests\issues\build\test_issue + +@echo off + +rmdir /S /Q tests\issues\build diff --git a/tests/issues/run.sh b/tests/issues/run.sh index ec6d7130d..117a9a5f1 100755 --- a/tests/issues/run.sh +++ b/tests/issues/run.sh @@ -1,17 +1,18 @@ #!/bin/bash -ODIN=../../odin -COMMON="-collection:tests=.. -out:build/test_issue.bin" - set -eu -mkdir -p build + +mkdir -p tests/issues/build + +COMMON="-collection:tests=tests -out:tests/issues/build/test_issue" + set -x -$ODIN build test_issue_829.odin $COMMON -file -build/test_issue.bin +./odin build tests/issues/test_issue_829.odin $COMMON -file +tests/issues/build/test_issue -$ODIN build test_issue_1592.odin $COMMON -file -build/test_issue.bin +./odin build tests/issues/test_issue_1592.odin $COMMON -file +tests/issues/build/test_issue set +x -rm -rf build +rm -rf tests/issues/build diff --git a/tests/vendor/Makefile b/tests/vendor/Makefile index 380e64e09..341067c6e 100644 --- a/tests/vendor/Makefile +++ b/tests/vendor/Makefile @@ -1,6 +1,5 @@ ODIN=../../odin ODINFLAGS= -OUT_FILE=test_binary.bin OS=$(shell uname) @@ -11,4 +10,4 @@ endif all: botan_test botan_test: - $(ODIN) run botan -out=$(OUT_FILE) -o:speed -no-bounds-check $(ODINFLAGS) + $(ODIN) run botan -out=botan_hash -o:speed -no-bounds-check $(ODINFLAGS) diff --git a/tests/vendor/build.bat b/tests/vendor/build.bat index 4bd9a6496..e70d9f1d5 100644 --- a/tests/vendor/build.bat +++ b/tests/vendor/build.bat @@ -1,6 +1,5 @@ @echo off -set OUT_FILE=test_binary.exe -set COMMON=-show-timings -no-bounds-check -vet -strict-style -out:%OUT_FILE% +set COMMON=-show-timings -no-bounds-check -vet -strict-style set PATH_TO_ODIN==..\..\odin echo --- From e01662c13959469c9c0bc4974a3b7c03d577d7a4 Mon Sep 17 00:00:00 2001 From: Florian Behr Date: Mon, 25 Apr 2022 13:23:05 +0200 Subject: [PATCH 076/245] Make allocator in pool_add_task() explicit --- core/thread/thread_pool.odin | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/thread/thread_pool.odin b/core/thread/thread_pool.odin index 3f782cf73..fe289d8aa 100644 --- a/core/thread/thread_pool.odin +++ b/core/thread/thread_pool.odin @@ -113,9 +113,8 @@ pool_join :: proc(pool: ^Pool) { // the thread pool. You can even add tasks from inside other tasks. // // Each task also needs an allocator which it either owns, or which is thread -// safe. By default, allocations in the task are disabled by use of the -// nil_allocator. -pool_add_task :: proc(pool: ^Pool, procedure: Task_Proc, data: rawptr, user_index: int = 0, allocator := context.allocator) { +// safe. +pool_add_task :: proc(pool: ^Pool, procedure: Task_Proc, data: rawptr, user_index: int = 0, allocator: mem.Allocator) { sync.guard(&pool.mutex) append(&pool.tasks, Task{ From 1fb76ad7687bc9efe538b79ac05dc0fafad06950 Mon Sep 17 00:00:00 2001 From: Florian Behr Date: Mon, 25 Apr 2022 13:41:19 +0200 Subject: [PATCH 077/245] change usage in demo.odin --- examples/demo/demo.odin | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/demo/demo.odin b/examples/demo/demo.odin index b03345849..a36acdf18 100644 --- a/examples/demo/demo.odin +++ b/examples/demo/demo.odin @@ -1166,7 +1166,8 @@ threading_example :: proc() { for i in 0..<30 { - thread.pool_add_task(pool=&pool, procedure=task_proc, data=nil, user_index=i) + // be mindful of the allocator used for tasks. The allocator needs to be thread safe, or be owned by the task for exclusive use + thread.pool_add_task(pool=&pool, procedure=task_proc, data=nil, user_index=i, allocator=context.allocator) } thread.pool_start(&pool) From ca6a1db7576dd72f5a5b4b73fec8cbad34e5bced Mon Sep 17 00:00:00 2001 From: Florian Behr Date: Mon, 25 Apr 2022 13:41:39 +0200 Subject: [PATCH 078/245] fix doc comment for pool_init --- core/thread/thread_pool.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/thread/thread_pool.odin b/core/thread/thread_pool.odin index fe289d8aa..4fc02309e 100644 --- a/core/thread/thread_pool.odin +++ b/core/thread/thread_pool.odin @@ -44,7 +44,7 @@ Pool :: struct { } // Once initialized, the pool's memory address is not allowed to change until -// it is destroyed. If thread_count < 1, thread count 1 will be used. +// it is destroyed. // // The thread pool requires an allocator which it either owns, or which is thread safe. pool_init :: proc(pool: ^Pool, thread_count: int, allocator: mem.Allocator) { From ee67a0b9a1d83acad3e8ade9314bdad3bb0d2197 Mon Sep 17 00:00:00 2001 From: Florian Behr Date: Mon, 25 Apr 2022 14:08:09 +0200 Subject: [PATCH 079/245] reorder procedure parameters to make sure the optional argument in pool_add_task() is last, and the argument order is consistent with pool_init() --- core/thread/thread_pool.odin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/thread/thread_pool.odin b/core/thread/thread_pool.odin index 4fc02309e..af80da9aa 100644 --- a/core/thread/thread_pool.odin +++ b/core/thread/thread_pool.odin @@ -47,7 +47,7 @@ Pool :: struct { // it is destroyed. // // The thread pool requires an allocator which it either owns, or which is thread safe. -pool_init :: proc(pool: ^Pool, thread_count: int, allocator: mem.Allocator) { +pool_init :: proc(pool: ^Pool, allocator: mem.Allocator, thread_count: int) { context.allocator = allocator pool.allocator = allocator pool.tasks = make([dynamic]Task) @@ -114,7 +114,7 @@ pool_join :: proc(pool: ^Pool) { // // Each task also needs an allocator which it either owns, or which is thread // safe. -pool_add_task :: proc(pool: ^Pool, procedure: Task_Proc, data: rawptr, user_index: int = 0, allocator: mem.Allocator) { +pool_add_task :: proc(pool: ^Pool, allocator: mem.Allocator, procedure: Task_Proc, data: rawptr, user_index: int = 0) { sync.guard(&pool.mutex) append(&pool.tasks, Task{ From a412d34574649cceacea6a171ccd4af6119c7a0f Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 11:35:34 +0100 Subject: [PATCH 080/245] Fix #1740 --- core/mem/virtual/virtual.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mem/virtual/virtual.odin b/core/mem/virtual/virtual.odin index 2035171a7..21ab5ef21 100644 --- a/core/mem/virtual/virtual.odin +++ b/core/mem/virtual/virtual.odin @@ -120,7 +120,7 @@ alloc_from_memory_block :: proc(block: ^Memory_Block, min_size, alignment: int) do_commit_if_necessary :: proc(block: ^Memory_Block, size: uint) -> (err: Allocator_Error) { if block.committed - block.used < size { pmblock := (^Platform_Memory_Block)(block) - base_offset := uint(uintptr(block) - uintptr(pmblock)) + base_offset := uint(uintptr(pmblock.block.base) - uintptr(pmblock)) platform_total_commit := base_offset + block.used + size assert(pmblock.committed <= pmblock.reserved) From 530401e5ee84bd3346b6a3213814a904696019df Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 11:38:32 +0100 Subject: [PATCH 081/245] Fix #1729 --- src/check_type.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/check_type.cpp b/src/check_type.cpp index 51f472961..c0ae64baa 100644 --- a/src/check_type.cpp +++ b/src/check_type.cpp @@ -1338,14 +1338,14 @@ ParameterValue handle_parameter_value(CheckerContext *ctx, Type *in_type, Type * } } } - } else if (allow_caller_location && o.mode == Addressing_Context) { + } else if (allow_caller_location && (o.mode == Addressing_Context || are_types_identical(o.type, t_source_code_location))) { param_value.kind = ParameterValue_Value; param_value.ast_value = expr; } else if (o.value.kind != ExactValue_Invalid) { param_value.kind = ParameterValue_Constant; param_value.value = o.value; } else { - error(expr, "Default parameter must be a constant, %d", o.mode); + error(expr, "Default parameter must be a constant"); } } } else { From 3bd71229596427d43551ff6612d71505bb79c796 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 11:42:01 +0100 Subject: [PATCH 082/245] Fix #1720 --- vendor/vulkan/_gen/create_vulkan_odin_wrapper.py | 3 +++ vendor/vulkan/core.odin | 3 +++ 2 files changed, 6 insertions(+) diff --git a/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py b/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py index ae1bc8d64..9a32f5796 100644 --- a/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py +++ b/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py @@ -626,6 +626,9 @@ with open("../core.odin", 'w', encoding='utf-8') as f: f.write(BASE) f.write(""" API_VERSION_1_0 :: (1<<22) | (0<<12) | (0) +API_VERSION_1_1 :: (1<<22) | (1<<12) | (0) +API_VERSION_1_2 :: (1<<22) | (2<<12) | (0) +API_VERSION_1_3 :: (1<<22) | (3<<12) | (0) MAKE_VERSION :: proc(major, minor, patch: u32) -> u32 { return (major<<22) | (minor<<12) | (patch) diff --git a/vendor/vulkan/core.odin b/vendor/vulkan/core.odin index 94c667910..b90bfad17 100644 --- a/vendor/vulkan/core.odin +++ b/vendor/vulkan/core.odin @@ -3,6 +3,9 @@ // package vulkan API_VERSION_1_0 :: (1<<22) | (0<<12) | (0) +API_VERSION_1_1 :: (1<<22) | (1<<12) | (0) +API_VERSION_1_2 :: (1<<22) | (2<<12) | (0) +API_VERSION_1_3 :: (1<<22) | (3<<12) | (0) MAKE_VERSION :: proc(major, minor, patch: u32) -> u32 { return (major<<22) | (minor<<12) | (patch) From c81fd2e5dd82fba0d5a1eb6771b1816cdb4ba574 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 11:45:46 +0100 Subject: [PATCH 083/245] Fix #1644 --- core/math/linalg/specific.odin | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/math/linalg/specific.odin b/core/math/linalg/specific.odin index cb007bd91..a4aaeb012 100644 --- a/core/math/linalg/specific.odin +++ b/core/math/linalg/specific.odin @@ -479,21 +479,21 @@ angle_from_quaternion_f16 :: proc(q: Quaternionf16) -> f16 { return math.asin(q.x*q.x + q.y*q.y + q.z*q.z) * 2 } - return math.cos(q.x) * 2 + return math.acos(q.w) * 2 } angle_from_quaternion_f32 :: proc(q: Quaternionf32) -> f32 { if abs(q.w) > math.SQRT_THREE*0.5 { return math.asin(q.x*q.x + q.y*q.y + q.z*q.z) * 2 } - return math.cos(q.x) * 2 + return math.acos(q.w) * 2 } angle_from_quaternion_f64 :: proc(q: Quaternionf64) -> f64 { if abs(q.w) > math.SQRT_THREE*0.5 { return math.asin(q.x*q.x + q.y*q.y + q.z*q.z) * 2 } - return math.cos(q.x) * 2 + return math.acos(q.w) * 2 } angle_from_quaternion :: proc{ angle_from_quaternion_f16, From a5342a01267f55dec5a5b9f775cec8c8379139b1 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 26 Apr 2022 13:14:09 +0200 Subject: [PATCH 084/245] Address edge cases. --- .github/workflows/ci.yml | 11 ++---- .gitignore | 1 - Makefile | 4 +-- build_odin.sh | 4 +-- core/crypto/util/util.odin | 1 - src/build_settings.cpp | 42 ++++++++++++++++++---- src/path.cpp | 67 +++++++++++++++++++++++++++++++++-- src/string.cpp | 35 ------------------ tests/core/Makefile | 29 ++++++++------- tests/core/build.bat | 10 +++--- tests/core/math/big/build.bat | 2 +- tests/issues/run.bat | 21 ++++++----- tests/issues/run.sh | 19 +++++----- tests/vendor/Makefile | 3 +- tests/vendor/build.bat | 3 +- 15 files changed, 150 insertions(+), 102 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d72775636..3cc4283b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,9 +39,7 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: | - cd tests/issues - ./run.sh + run: tests/issues/run.sh timeout-minutes: 10 - name: Odin check examples/all for Linux i386 run: ./odin check examples/all -vet -strict-style -target:linux_i386 @@ -93,9 +91,7 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: | - cd tests/issues - ./run.sh + run: tests/issues/run.sh timeout-minutes: 10 - name: Odin check examples/all for Darwin arm64 run: ./odin check examples/all -vet -strict-style -target:darwin_arm64 @@ -167,8 +163,7 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat - cd tests\issues - call run.bat + call tests\issues\run.bat timeout-minutes: 10 - name: Odin check examples/all for Windows 32bits shell: cmd diff --git a/.gitignore b/.gitignore index d03a86fd7..e8b3d3050 100644 --- a/.gitignore +++ b/.gitignore @@ -269,7 +269,6 @@ bin/ # - Linux/MacOS odin odin.dSYM -*.bin # shared collection shared/ diff --git a/Makefile b/Makefile index 1a1c93180..82150c6a2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -all: debug +all: debug demo demo: - ./odin run examples/demo + ./odin run examples/demo/demo.odin report: ./odin report diff --git a/build_odin.sh b/build_odin.sh index 4810cafd2..aef3f2836 100755 --- a/build_odin.sh +++ b/build_odin.sh @@ -102,7 +102,7 @@ build_odin() { } run_demo() { - ./odin run examples/demo + ./odin run examples/demo/demo.odin -file } case $OS in @@ -147,4 +147,4 @@ if [[ $# -eq 1 ]]; then exit 0 else panic "Too many arguments!" -fi \ No newline at end of file +fi diff --git a/core/crypto/util/util.odin b/core/crypto/util/util.odin index 83b07e546..6273a232e 100644 --- a/core/crypto/util/util.odin +++ b/core/crypto/util/util.odin @@ -11,7 +11,6 @@ package util */ import "core:mem" -_ :: mem // @note(bp): this can replace the other two cast_slice :: #force_inline proc "contextless" ($D: typeid/[]$DE, src: $S/[]$SE) -> D { diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 212ded5c8..89d370144 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1276,16 +1276,44 @@ bool init_build_paths(String init_filename) { if (bc->out_filepath.len > 0) { bc->build_paths[BuildPath_Output] = path_from_string(ha, bc->out_filepath); + if (build_context.metrics.os == TargetOs_windows) { + String output_file = path_to_string(ha, bc->build_paths[BuildPath_Output]); + defer (gb_free(ha, output_file.text)); + if (path_is_directory(bc->build_paths[BuildPath_Output])) { + gb_printf_err("Output path %.*s is a directory.\n", LIT(output_file)); + return false; + } else if (bc->build_paths[BuildPath_Output].ext.len == 0) { + gb_printf_err("Output path %.*s must have an appropriate extension.\n", LIT(output_file)); + return false; + } + } } else { - String output_name = remove_directory_from_path(init_filename); - output_name = remove_extension_from_path(output_name); - output_name = copy_string(ha, string_trim_whitespace(output_name)); + Path output_path; - Path output_path = path_from_string(ha, output_name); + if (str_eq(init_filename, str_lit("."))) { + // We must name the output file after the current directory. + debugf("Output name will be created from current base name %.*s.\n", LIT(bc->build_paths[BuildPath_Main_Package].basename)); + String last_element = last_path_element(bc->build_paths[BuildPath_Main_Package].basename); - // Replace extension. - if (output_path.ext.len > 0) { - gb_free(ha, output_path.ext.text); + if (last_element.len == 0) { + gb_printf_err("The output name is created from the last path element. `%.*s` has none. Use `-out:output_name.ext` to set it.\n", LIT(bc->build_paths[BuildPath_Main_Package].basename)); + return false; + } + output_path.basename = copy_string(ha, bc->build_paths[BuildPath_Main_Package].basename); + output_path.name = copy_string(ha, last_element); + + } else { + // Init filename was not 'current path'. + // Contruct the output name from the path elements as usual. + String output_name = remove_directory_from_path(init_filename); + output_name = remove_extension_from_path(output_name); + output_name = copy_string(ha, string_trim_whitespace(output_name)); + output_path = path_from_string(ha, output_name); + + // Replace extension. + if (output_path.ext.len > 0) { + gb_free(ha, output_path.ext.text); + } } output_path.ext = copy_string(ha, output_extension); diff --git a/src/path.cpp b/src/path.cpp index 8d8e532b8..6f83c39ea 100644 --- a/src/path.cpp +++ b/src/path.cpp @@ -1,6 +1,46 @@ /* Path handling utilities. */ +String remove_extension_from_path(String const &s) { + for (isize i = s.len-1; i >= 0; i--) { + if (s[i] == '.') { + return substring(s, 0, i); + } + } + return s; +} + +String remove_directory_from_path(String const &s) { + isize len = 0; + for (isize i = s.len-1; i >= 0; i--) { + if (s[i] == '/' || + s[i] == '\\') { + break; + } + len += 1; + } + return substring(s, s.len-len, s.len); +} + +bool path_is_directory(String path); + +String directory_from_path(String const &s) { + if (path_is_directory(s)) { + return s; + } + + isize i = s.len-1; + for (; i >= 0; i--) { + if (s[i] == '/' || + s[i] == '\\') { + break; + } + } + if (i >= 0) { + return substring(s, 0, i); + } + return substring(s, 0, 0); +} #if defined(GB_SYSTEM_WINDOWS) bool path_is_directory(String path) { @@ -98,11 +138,15 @@ Path path_from_string(gbAllocator a, String const &path) { String fullpath = path_to_full_path(a, path); defer (gb_free(heap_allocator(), fullpath.text)); - res.basename = directory_from_path(fullpath); - res.basename = copy_string(a, res.basename); + res.basename = directory_from_path(fullpath); + res.basename = copy_string(a, res.basename); - if (string_ends_with(fullpath, '/')) { + if (path_is_directory(fullpath)) { // It's a directory. We don't need to tinker with the name and extension. + // It could have a superfluous trailing `/`. Remove it if so. + if (res.basename.len > 0 && res.basename.text[res.basename.len - 1] == '/') { + res.basename.len--; + } return res; } @@ -116,6 +160,23 @@ Path path_from_string(gbAllocator a, String const &path) { return res; } +// NOTE(Jeroen): Takes a path String and returns the last path element. +String last_path_element(String const &path) { + isize count = 0; + u8 * start = (u8 *)(&path.text[path.len - 1]); + for (isize length = path.len; length > 0 && path.text[length - 1] != '/'; length--) { + count++; + start--; + } + if (count > 0) { + start++; // Advance past the `/` and return the substring. + String res = make_string(start, count); + return res; + } + // Must be a root path like `/` or `C:/`, return empty String. + return STR_LIT(""); +} + bool path_is_directory(Path path) { String path_string = path_to_full_path(heap_allocator(), path); defer (gb_free(heap_allocator(), path_string.text)); diff --git a/src/string.cpp b/src/string.cpp index 3515df48e..616761265 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -298,41 +298,6 @@ String filename_from_path(String s) { return make_string(nullptr, 0); } -String remove_extension_from_path(String const &s) { - for (isize i = s.len-1; i >= 0; i--) { - if (s[i] == '.') { - return substring(s, 0, i); - } - } - return s; -} - -String remove_directory_from_path(String const &s) { - isize len = 0; - for (isize i = s.len-1; i >= 0; i--) { - if (s[i] == '/' || - s[i] == '\\') { - break; - } - len += 1; - } - return substring(s, s.len-len, s.len); -} - -String directory_from_path(String const &s) { - isize i = s.len-1; - for (; i >= 0; i--) { - if (s[i] == '/' || - s[i] == '\\') { - break; - } - } - if (i >= 0) { - return substring(s, 0, i); - } - return substring(s, 0, 0); -} - String concatenate_strings(gbAllocator a, String const &x, String const &y) { isize len = x.len+y.len; u8 *data = gb_alloc_array(a, u8, len+1); diff --git a/tests/core/Makefile b/tests/core/Makefile index 9bb622633..6a92b4efb 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,6 +1,5 @@ ODIN=../../odin PYTHON=$(shell which python3) -OUT_FILE=test_binary.bin all: download_test_assets image_test compress_test strings_test hash_test crypto_test noise_test encoding_test \ math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test @@ -9,39 +8,39 @@ download_test_assets: $(PYTHON) download_assets.py image_test: - $(ODIN) run image/test_core_image.odin -out=$(OUT_FILE) -file + $(ODIN) run image/test_core_image.odin -file compress_test: - $(ODIN) run compress/test_core_compress.odin -out=$(OUT_FILE) -file + $(ODIN) run compress/test_core_compress.odin -file strings_test: - $(ODIN) run strings/test_core_strings.odin -out=$(OUT_FILE) -file + $(ODIN) run strings/test_core_strings.odin -file hash_test: - $(ODIN) run hash -out=$(OUT_FILE) -o:speed -no-bounds-check + $(ODIN) run hash -out=test_hash -o:speed -no-bounds-check crypto_test: - $(ODIN) run crypto -out=$(OUT_FILE) -o:speed -no-bounds-check + $(ODIN) run crypto -out=test_crypto_hash -o:speed -no-bounds-check noise_test: - $(ODIN) run math/noise -out=$(OUT_FILE) + $(ODIN) run math/noise -out=test_noise encoding_test: - $(ODIN) run encoding/hxa -out=$(OUT_FILE) -collection:tests=.. - $(ODIN) run encoding/json -out=$(OUT_FILE) - $(ODIN) run encoding/varint -out=$(OUT_FILE) + $(ODIN) run encoding/hxa -out=test_hxa -collection:tests=.. + $(ODIN) run encoding/json -out=test_json + $(ODIN) run encoding/varint -out=test_varint math_test: - $(ODIN) run math/test_core_math.odin -out=$(OUT_FILE) -file -collection:tests=.. + $(ODIN) run math/test_core_math.odin -out=test_core_math -file -collection:tests=.. linalg_glsl_math_test: - $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=$(OUT_FILE) -collection:tests=.. + $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=test_linalg_glsl_math -collection:tests=.. filepath_test: - $(ODIN) run path/filepath/test_core_filepath.odin -file -out=$(OUT_FILE) -collection:tests=.. + $(ODIN) run path/filepath/test_core_filepath.odin -file -out=test_core_filepath -collection:tests=.. reflect_test: - $(ODIN) run reflect/test_core_reflect.odin -file -out=$(OUT_FILE) -collection:tests=.. + $(ODIN) run reflect/test_core_reflect.odin -file -out=test_core_reflect -collection:tests=.. os_exit_test: - $(ODIN) run os/test_core_os_exit.odin -file -out=$(OUT_FILE) && exit 1 || exit 0 + $(ODIN) run os/test_core_os_exit.odin -file -out=test_core_os_exit && exit 1 || exit 0 diff --git a/tests/core/build.bat b/tests/core/build.bat index 331a473aa..2f9ba672e 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -1,8 +1,6 @@ @echo off -set OUT_FILE=test_binary.exe -set COMMON=-show-timings -no-bounds-check -vet -strict-style -collection:tests=.. -out:%OUT_FILE% +set COMMON=-show-timings -no-bounds-check -vet -strict-style -collection:tests=.. set PATH_TO_ODIN==..\..\odin - python3 download_assets.py echo --- echo Running core:image tests @@ -37,14 +35,14 @@ echo --- echo --- echo Running core:encoding tests echo --- -%PATH_TO_ODIN% run encoding/hxa %COMMON% -%PATH_TO_ODIN% run encoding/json %COMMON% +%PATH_TO_ODIN% run encoding/hxa %COMMON% +%PATH_TO_ODIN% run encoding/json %COMMON% %PATH_TO_ODIN% run encoding/varint %COMMON% echo --- echo Running core:math/noise tests echo --- -%PATH_TO_ODIN% run math/noise %COMMON% +%PATH_TO_ODIN% run math/noise %COMMON% echo --- echo Running core:math tests diff --git a/tests/core/math/big/build.bat b/tests/core/math/big/build.bat index ad199d775..16bdbc8ca 100644 --- a/tests/core/math/big/build.bat +++ b/tests/core/math/big/build.bat @@ -4,7 +4,7 @@ set PATH_TO_ODIN==..\..\..\..\odin set TEST_ARGS=-fast-tests set TEST_ARGS=-no-random set TEST_ARGS= -set OUT_NAME=math_big_test_library.dll +set OUT_NAME=math_big_test_library set COMMON=-build-mode:shared -show-timings -no-bounds-check -define:MATH_BIG_EXE=false -vet -strict-style echo --- echo Running core:math/big tests diff --git a/tests/issues/run.bat b/tests/issues/run.bat index a936bd896..a652d9694 100644 --- a/tests/issues/run.bat +++ b/tests/issues/run.bat @@ -1,12 +1,17 @@ @echo off -set PATH_TO_ODIN==..\..\odin -set COMMON=-collection:tests=.. -out:build\test_issue -if not exist "build" mkdir build -%PATH_TO_ODIN% build test_issue_829.odin %COMMON% -file -build\test_issue +if not exist "tests\issues\build\" mkdir tests\issues\build -%PATH_TO_ODIN% build test_issue_1592.odin %COMMON% -file -build\test_issue +set COMMON=-collection:tests=tests -out:tests\issues\build\test_issue -rmdir /S /Q build +@echo on + +.\odin build tests\issues\test_issue_829.odin %COMMON% -file +tests\issues\build\test_issue + +.\odin build tests\issues\test_issue_1592.odin %COMMON% -file +tests\issues\build\test_issue + +@echo off + +rmdir /S /Q tests\issues\build diff --git a/tests/issues/run.sh b/tests/issues/run.sh index ec6d7130d..117a9a5f1 100755 --- a/tests/issues/run.sh +++ b/tests/issues/run.sh @@ -1,17 +1,18 @@ #!/bin/bash -ODIN=../../odin -COMMON="-collection:tests=.. -out:build/test_issue.bin" - set -eu -mkdir -p build + +mkdir -p tests/issues/build + +COMMON="-collection:tests=tests -out:tests/issues/build/test_issue" + set -x -$ODIN build test_issue_829.odin $COMMON -file -build/test_issue.bin +./odin build tests/issues/test_issue_829.odin $COMMON -file +tests/issues/build/test_issue -$ODIN build test_issue_1592.odin $COMMON -file -build/test_issue.bin +./odin build tests/issues/test_issue_1592.odin $COMMON -file +tests/issues/build/test_issue set +x -rm -rf build +rm -rf tests/issues/build diff --git a/tests/vendor/Makefile b/tests/vendor/Makefile index 380e64e09..341067c6e 100644 --- a/tests/vendor/Makefile +++ b/tests/vendor/Makefile @@ -1,6 +1,5 @@ ODIN=../../odin ODINFLAGS= -OUT_FILE=test_binary.bin OS=$(shell uname) @@ -11,4 +10,4 @@ endif all: botan_test botan_test: - $(ODIN) run botan -out=$(OUT_FILE) -o:speed -no-bounds-check $(ODINFLAGS) + $(ODIN) run botan -out=botan_hash -o:speed -no-bounds-check $(ODINFLAGS) diff --git a/tests/vendor/build.bat b/tests/vendor/build.bat index 4bd9a6496..e70d9f1d5 100644 --- a/tests/vendor/build.bat +++ b/tests/vendor/build.bat @@ -1,6 +1,5 @@ @echo off -set OUT_FILE=test_binary.exe -set COMMON=-show-timings -no-bounds-check -vet -strict-style -out:%OUT_FILE% +set COMMON=-show-timings -no-bounds-check -vet -strict-style set PATH_TO_ODIN==..\..\odin echo --- From ec8221cb5def171deb5bea0cf4d6a935e74e33d2 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 13:04:50 +0100 Subject: [PATCH 085/245] Simplify Atomic_Cond implementation --- core/sync/atomic.odin | 4 +- core/sync/primitives_atomic.odin | 109 +++++-------------------------- 2 files changed, 19 insertions(+), 94 deletions(-) diff --git a/core/sync/atomic.odin b/core/sync/atomic.odin index f537764c4..0900a6544 100644 --- a/core/sync/atomic.odin +++ b/core/sync/atomic.odin @@ -6,8 +6,8 @@ cpu_relax :: intrinsics.cpu_relax /* Atomic_Memory_Order :: enum { - Relaxed = 0, - Consume = 1, + Relaxed = 0, // Unordered + Consume = 1, // Monotonic Acquire = 2, Release = 3, Acq_Rel = 4, diff --git a/core/sync/primitives_atomic.odin b/core/sync/primitives_atomic.odin index 11fff4e60..bd32eb192 100644 --- a/core/sync/primitives_atomic.odin +++ b/core/sync/primitives_atomic.odin @@ -281,118 +281,43 @@ atomic_recursive_mutex_guard :: proc(m: ^Atomic_Recursive_Mutex) -> bool { - -@(private="file") -Queue_Item :: struct { - next: ^Queue_Item, - futex: Futex, -} - -@(private="file") -queue_item_wait :: proc(item: ^Queue_Item) { - for atomic_load_explicit(&item.futex, .Acquire) == 0 { - futex_wait(&item.futex, 0) - cpu_relax() - } -} -@(private="file") -queue_item_wait_with_timeout :: proc(item: ^Queue_Item, duration: time.Duration) -> bool { - start := time.tick_now() - for atomic_load_explicit(&item.futex, .Acquire) == 0 { - remaining := duration - time.tick_since(start) - if remaining < 0 { - return false - } - if !futex_wait_with_timeout(&item.futex, 0, remaining) { - return false - } - cpu_relax() - } - return true -} -@(private="file") -queue_item_signal :: proc(item: ^Queue_Item) { - atomic_store_explicit(&item.futex, 1, .Release) - futex_signal(&item.futex) -} - - // Atomic_Cond implements a condition variable, a rendezvous point for threads // waiting for signalling the occurence of an event // // An Atomic_Cond must not be copied after first use Atomic_Cond :: struct { - queue_mutex: Atomic_Mutex, - queue_head: ^Queue_Item, - pending: bool, + state: Futex, + prev: u32, } atomic_cond_wait :: proc(c: ^Atomic_Cond, m: ^Atomic_Mutex) { - waiter := &Queue_Item{} + state := u32(atomic_load(&c.state)) + atomic_store(&c.prev, state) + unlock(m) + futex_wait(&c.state, state) + lock(m) - atomic_mutex_lock(&c.queue_mutex) - waiter.next = c.queue_head - c.queue_head = waiter - - atomic_store(&c.pending, true) - atomic_mutex_unlock(&c.queue_mutex) - - atomic_mutex_unlock(m) - queue_item_wait(waiter) - atomic_mutex_lock(m) } atomic_cond_wait_with_timeout :: proc(c: ^Atomic_Cond, m: ^Atomic_Mutex, duration: time.Duration) -> (ok: bool) { - waiter := &Queue_Item{} - - atomic_mutex_lock(&c.queue_mutex) - waiter.next = c.queue_head - c.queue_head = waiter - - atomic_store(&c.pending, true) - atomic_mutex_unlock(&c.queue_mutex) - - atomic_mutex_unlock(m) - ok = queue_item_wait_with_timeout(waiter, duration) - atomic_mutex_lock(m) + state := u32(atomic_load(&c.state)) + unlock(m) + ok = futex_wait_with_timeout(&c.state, state, duration) + lock(m) return } atomic_cond_signal :: proc(c: ^Atomic_Cond) { - if !atomic_load(&c.pending) { - return - } - - atomic_mutex_lock(&c.queue_mutex) - waiter := c.queue_head - if c.queue_head != nil { - c.queue_head = c.queue_head.next - } - atomic_store(&c.pending, c.queue_head != nil) - atomic_mutex_unlock(&c.queue_mutex) - - if waiter != nil { - queue_item_signal(waiter) - } + state := 1 + atomic_load(&c.prev) + atomic_store(&c.state, Futex(state)) + futex_signal(&c.state) } atomic_cond_broadcast :: proc(c: ^Atomic_Cond) { - if !atomic_load(&c.pending) { - return - } - - atomic_store(&c.pending, false) - - atomic_mutex_lock(&c.queue_mutex) - waiters := c.queue_head - c.queue_head = nil - atomic_mutex_unlock(&c.queue_mutex) - - for waiters != nil { - queue_item_signal(waiters) - waiters = waiters.next - } + state := 1 + atomic_load(&c.prev) + atomic_store(&c.state, Futex(state)) + futex_broadcast(&c.state) } // When waited upon, blocks until the internal count is greater than zero, then subtracts one. From 07d1a42768cd7082622fafc2bd01216e27bed54e Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 13:11:34 +0100 Subject: [PATCH 086/245] Simplify `Atomic_Sema` implementation --- core/sync/primitives_atomic.odin | 65 +++++++++++++++----------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/core/sync/primitives_atomic.odin b/core/sync/primitives_atomic.odin index bd32eb192..812e5ae97 100644 --- a/core/sync/primitives_atomic.odin +++ b/core/sync/primitives_atomic.odin @@ -325,30 +325,28 @@ atomic_cond_broadcast :: proc(c: ^Atomic_Cond) { // // An Atomic_Sema must not be copied after first use Atomic_Sema :: struct { - mutex: Atomic_Mutex, - cond: Atomic_Cond, - count: int, + count: Futex, } atomic_sema_post :: proc(s: ^Atomic_Sema, count := 1) { - atomic_mutex_lock(&s.mutex) - defer atomic_mutex_unlock(&s.mutex) - - s.count += count - atomic_cond_signal(&s.cond) + atomic_add_explicit(&s.count, Futex(count), .Release) + if count == 1 { + futex_signal(&s.count) + } else { + futex_broadcast(&s.count) + } } atomic_sema_wait :: proc(s: ^Atomic_Sema) { - atomic_mutex_lock(&s.mutex) - defer atomic_mutex_unlock(&s.mutex) - - for s.count == 0 { - atomic_cond_wait(&s.cond, &s.mutex) - } - - s.count -= 1 - if s.count > 0 { - atomic_cond_signal(&s.cond) + for { + original_count := atomic_load_explicit(&s.count, .Relaxed) + for original_count == 0 { + futex_wait(&s.count, u32(original_count)) + original_count = s.count + } + if original_count == atomic_compare_exchange_strong_explicit(&s.count, original_count, original_count-1, .Acquire, .Acquire) { + return + } } } @@ -356,25 +354,22 @@ atomic_sema_wait_with_timeout :: proc(s: ^Atomic_Sema, duration: time.Duration) if duration <= 0 { return false } - atomic_mutex_lock(&s.mutex) - defer atomic_mutex_unlock(&s.mutex) - - start := time.tick_now() + for { - for s.count == 0 { - remaining := duration - time.tick_since(start) - if remaining < 0 { - return false + original_count := atomic_load_explicit(&s.count, .Relaxed) + for start := time.tick_now(); original_count == 0; /**/ { + remaining := duration - time.tick_since(start) + if remaining < 0 { + return false + } + + if !futex_wait_with_timeout(&s.count, u32(original_count), remaining) { + return false + } + original_count = s.count } - - if !atomic_cond_wait_with_timeout(&s.cond, &s.mutex, remaining) { - return false + if original_count == atomic_compare_exchange_strong_explicit(&s.count, original_count, original_count-1, .Acquire, .Acquire) { + return true } } - - s.count -= 1 - if s.count > 0 { - atomic_cond_signal(&s.cond) - } - return true } From 5e11ad2e1e6d0e335f47197c63a5ffdd8f405dd7 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 26 Apr 2022 14:23:23 +0200 Subject: [PATCH 087/245] Update test paths. --- .github/workflows/ci.yml | 11 ++++++++--- core/crypto/util/util.odin | 1 + tests/core/Makefile | 28 ++++++++++++++-------------- tests/core/build.bat | 28 ++++++++++++++-------------- tests/issues/run.bat | 14 +++++++------- tests/issues/run.sh | 16 ++++++++-------- tests/vendor/Makefile | 2 +- tests/vendor/build.bat | 4 ++-- 8 files changed, 55 insertions(+), 49 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cc4283b0..d72775636 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,9 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: tests/issues/run.sh + run: | + cd tests/issues + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Linux i386 run: ./odin check examples/all -vet -strict-style -target:linux_i386 @@ -91,7 +93,9 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: tests/issues/run.sh + run: | + cd tests/issues + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Darwin arm64 run: ./odin check examples/all -vet -strict-style -target:darwin_arm64 @@ -163,7 +167,8 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat - call tests\issues\run.bat + cd tests\issues + call run.bat timeout-minutes: 10 - name: Odin check examples/all for Windows 32bits shell: cmd diff --git a/core/crypto/util/util.odin b/core/crypto/util/util.odin index 6273a232e..83b07e546 100644 --- a/core/crypto/util/util.odin +++ b/core/crypto/util/util.odin @@ -11,6 +11,7 @@ package util */ import "core:mem" +_ :: mem // @note(bp): this can replace the other two cast_slice :: #force_inline proc "contextless" ($D: typeid/[]$DE, src: $S/[]$SE) -> D { diff --git a/tests/core/Makefile b/tests/core/Makefile index 6a92b4efb..2c24fef75 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -8,39 +8,39 @@ download_test_assets: $(PYTHON) download_assets.py image_test: - $(ODIN) run image/test_core_image.odin -file + $(ODIN) run image/test_core_image.odin -file -out:test_core_image compress_test: - $(ODIN) run compress/test_core_compress.odin -file + $(ODIN) run compress/test_core_compress.odin -file -out:test_core_compress strings_test: - $(ODIN) run strings/test_core_strings.odin -file + $(ODIN) run strings/test_core_strings.odin -file -out:test_core_strings hash_test: - $(ODIN) run hash -out=test_hash -o:speed -no-bounds-check + $(ODIN) run hash -o:speed -no-bounds-check -out:test_hash crypto_test: - $(ODIN) run crypto -out=test_crypto_hash -o:speed -no-bounds-check + $(ODIN) run crypto -o:speed -no-bounds-check -out:test_crypto_hash noise_test: - $(ODIN) run math/noise -out=test_noise + $(ODIN) run math/noise -out:test_noise encoding_test: - $(ODIN) run encoding/hxa -out=test_hxa -collection:tests=.. - $(ODIN) run encoding/json -out=test_json - $(ODIN) run encoding/varint -out=test_varint + $(ODIN) run encoding/hxa -collection:tests=.. -out:test_hxa + $(ODIN) run encoding/json -out:test_json + $(ODIN) run encoding/varint -out:test_varint math_test: - $(ODIN) run math/test_core_math.odin -out=test_core_math -file -collection:tests=.. + $(ODIN) run math/test_core_math.odin -file -collection:tests=.. -out:test_core_math linalg_glsl_math_test: - $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=test_linalg_glsl_math -collection:tests=.. + $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -collection:tests=.. -out:test_linalg_glsl_math filepath_test: - $(ODIN) run path/filepath/test_core_filepath.odin -file -out=test_core_filepath -collection:tests=.. + $(ODIN) run path/filepath/test_core_filepath.odin -file -collection:tests=.. -out:test_core_filepath reflect_test: - $(ODIN) run reflect/test_core_reflect.odin -file -out=test_core_reflect -collection:tests=.. + $(ODIN) run reflect/test_core_reflect.odin -file -collection:tests=.. -out:test_core_reflect os_exit_test: - $(ODIN) run os/test_core_os_exit.odin -file -out=test_core_os_exit && exit 1 || exit 0 + $(ODIN) run os/test_core_os_exit.odin -file -out:test_core_os_exit && exit 1 || exit 0 \ No newline at end of file diff --git a/tests/core/build.bat b/tests/core/build.bat index 2f9ba672e..b03fef4bb 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -5,61 +5,61 @@ python3 download_assets.py echo --- echo Running core:image tests echo --- -%PATH_TO_ODIN% run image %COMMON% +%PATH_TO_ODIN% run image %COMMON% -out:test_core_image.exe echo --- echo Running core:compress tests echo --- -%PATH_TO_ODIN% run compress %COMMON% +%PATH_TO_ODIN% run compress %COMMON% -out:test_core_compress.exe echo --- echo Running core:strings tests echo --- -%PATH_TO_ODIN% run strings %COMMON% +%PATH_TO_ODIN% run strings %COMMON% -out:test_core_strings.exe echo --- echo Running core:hash tests echo --- -%PATH_TO_ODIN% run hash %COMMON% -o:size +%PATH_TO_ODIN% run hash %COMMON% -o:size -out:test_core_hash.exe echo --- echo Running core:odin tests echo --- -%PATH_TO_ODIN% run odin %COMMON% -o:size +%PATH_TO_ODIN% run odin %COMMON% -o:size -out:test_core_odin.exe echo --- echo Running core:crypto hash tests echo --- -%PATH_TO_ODIN% run crypto %COMMON% +%PATH_TO_ODIN% run crypto %COMMON% -out:test_crypto_hash.exe echo --- echo Running core:encoding tests echo --- -%PATH_TO_ODIN% run encoding/hxa %COMMON% -%PATH_TO_ODIN% run encoding/json %COMMON% -%PATH_TO_ODIN% run encoding/varint %COMMON% +%PATH_TO_ODIN% run encoding/hxa %COMMON% -out:test_hxa.exe +%PATH_TO_ODIN% run encoding/json %COMMON% -out:test_json.exe +%PATH_TO_ODIN% run encoding/varint %COMMON% -out:test_varint.exe echo --- echo Running core:math/noise tests echo --- -%PATH_TO_ODIN% run math/noise %COMMON% +%PATH_TO_ODIN% run math/noise %COMMON% -out:test_noise.exe echo --- echo Running core:math tests echo --- -%PATH_TO_ODIN% run math %COMMON% +%PATH_TO_ODIN% run math %COMMON% -out:test_core_math.exe echo --- echo Running core:math/linalg/glsl tests echo --- -%PATH_TO_ODIN% run math/linalg/glsl %COMMON% +%PATH_TO_ODIN% run math/linalg/glsl %COMMON% -out:test_linalg_glsl.exe echo --- echo Running core:path/filepath tests echo --- -%PATH_TO_ODIN% run path/filepath %COMMON% +%PATH_TO_ODIN% run path/filepath %COMMON% -out:test_core_filepath.exe echo --- echo Running core:reflect tests echo --- -%PATH_TO_ODIN% run reflect %COMMON% +%PATH_TO_ODIN% run reflect %COMMON% -out:test_core_reflect.exe \ No newline at end of file diff --git a/tests/issues/run.bat b/tests/issues/run.bat index a652d9694..a7078ae0f 100644 --- a/tests/issues/run.bat +++ b/tests/issues/run.bat @@ -1,17 +1,17 @@ @echo off -if not exist "tests\issues\build\" mkdir tests\issues\build +if not exist "build\" mkdir build -set COMMON=-collection:tests=tests -out:tests\issues\build\test_issue +set COMMON=-collection:tests=.. -out:build\test_issue.exe @echo on -.\odin build tests\issues\test_issue_829.odin %COMMON% -file -tests\issues\build\test_issue +..\..\odin build test_issue_829.odin %COMMON% -file +build\test_issue -.\odin build tests\issues\test_issue_1592.odin %COMMON% -file -tests\issues\build\test_issue +..\..\odin build test_issue_1592.odin %COMMON% -file +build\test_issue @echo off -rmdir /S /Q tests\issues\build +rmdir /S /Q build diff --git a/tests/issues/run.sh b/tests/issues/run.sh index 117a9a5f1..ec0804bac 100755 --- a/tests/issues/run.sh +++ b/tests/issues/run.sh @@ -1,18 +1,18 @@ #!/bin/bash set -eu -mkdir -p tests/issues/build - -COMMON="-collection:tests=tests -out:tests/issues/build/test_issue" +mkdir -p build +ODIN=../../odin +COMMON="-collection:tests=.. -out:build/test_issue" set -x -./odin build tests/issues/test_issue_829.odin $COMMON -file -tests/issues/build/test_issue +$ODIN build test_issue_829.odin $COMMON -file +./build/test_issue -./odin build tests/issues/test_issue_1592.odin $COMMON -file -tests/issues/build/test_issue +$ODIN build test_issue_1592.odin $COMMON -file +./build/test_issue set +x -rm -rf tests/issues/build +rm -rf build diff --git a/tests/vendor/Makefile b/tests/vendor/Makefile index 341067c6e..6c68d7908 100644 --- a/tests/vendor/Makefile +++ b/tests/vendor/Makefile @@ -10,4 +10,4 @@ endif all: botan_test botan_test: - $(ODIN) run botan -out=botan_hash -o:speed -no-bounds-check $(ODINFLAGS) + $(ODIN) run botan -o:speed -no-bounds-check $(ODINFLAGS) -out=vendor_botan diff --git a/tests/vendor/build.bat b/tests/vendor/build.bat index e70d9f1d5..d92a5eaea 100644 --- a/tests/vendor/build.bat +++ b/tests/vendor/build.bat @@ -5,9 +5,9 @@ set PATH_TO_ODIN==..\..\odin echo --- echo Running vendor:botan tests echo --- -%PATH_TO_ODIN% run botan %COMMON% +%PATH_TO_ODIN% run botan %COMMON% -out:vendor_botan.exe echo --- echo Running vendor:glfw tests echo --- -%PATH_TO_ODIN% run glfw %COMMON% \ No newline at end of file +%PATH_TO_ODIN% run glfw %COMMON% -out:vendor_glfw.exe \ No newline at end of file From 9cf7a31068bb8f9bf63c6e7e8f350125334ea406 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 13:44:32 +0100 Subject: [PATCH 088/245] Implement `_Sema` with `Atomic_Sema` --- core/sync/sema_internal.odin | 42 ++++-------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/core/sync/sema_internal.odin b/core/sync/sema_internal.odin index e4a3c0bfc..8188abe28 100644 --- a/core/sync/sema_internal.odin +++ b/core/sync/sema_internal.odin @@ -6,53 +6,19 @@ import "core:time" when #config(ODIN_SYNC_SEMA_USE_FUTEX, true) { _Sema :: struct { - count: Futex, + sema: Atomic_Sema, } _sema_post :: proc(s: ^Sema, count := 1) { - atomic_add_explicit(&s.impl.count, Futex(count), .Release) - if count == 1 { - futex_signal(&s.impl.count) - } else { - futex_broadcast(&s.impl.count) - } + atomic_sema_post(&s.impl.sema, count) } _sema_wait :: proc(s: ^Sema) { - for { - original_count := atomic_load_explicit(&s.impl.count, .Relaxed) - for original_count == 0 { - futex_wait(&s.impl.count, u32(original_count)) - original_count = s.impl.count - } - if original_count == atomic_compare_exchange_strong_explicit(&s.impl.count, original_count, original_count-1, .Acquire, .Acquire) { - return - } - } + atomic_sema_wait(&s.impl.sema) } _sema_wait_with_timeout :: proc(s: ^Sema, duration: time.Duration) -> bool { - if duration <= 0 { - return false - } - for { - - original_count := atomic_load_explicit(&s.impl.count, .Relaxed) - for start := time.tick_now(); original_count == 0; /**/ { - remaining := duration - time.tick_since(start) - if remaining < 0 { - return false - } - - if !futex_wait_with_timeout(&s.impl.count, u32(original_count), remaining) { - return false - } - original_count = s.impl.count - } - if original_count == atomic_compare_exchange_strong_explicit(&s.impl.count, original_count, original_count-1, .Acquire, .Acquire) { - return true - } - } + return atomic_sema_wait_with_timeout(&s.impl.sema, duration) } } else { _Sema :: struct { From ba5e33bc3518c327057102f56ac2c1cce55dc76f Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 26 Apr 2022 14:51:16 +0200 Subject: [PATCH 089/245] Update CI workflow. --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cc4283b0..a5a6eddb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,9 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: tests/issues/run.sh + run: | + cd tests/issues + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Linux i386 run: ./odin check examples/all -vet -strict-style -target:linux_i386 @@ -91,7 +93,8 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - run: tests/issues/run.sh + cd tests/issues + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Darwin arm64 run: ./odin check examples/all -vet -strict-style -target:darwin_arm64 @@ -163,7 +166,8 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat - call tests\issues\run.bat + cd tests\issues + call run.bat timeout-minutes: 10 - name: Odin check examples/all for Windows 32bits shell: cmd From 1c03e6805775c58044d417eea2504312b4e916ab Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 26 Apr 2022 14:56:28 +0200 Subject: [PATCH 090/245] Update CI. --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5a6eddb1..d72775636 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,8 +40,8 @@ jobs: timeout-minutes: 10 - name: Odin issues tests run: | - cd tests/issues - ./run.sh + cd tests/issues + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Linux i386 run: ./odin check examples/all -vet -strict-style -target:linux_i386 @@ -93,8 +93,9 @@ jobs: make timeout-minutes: 10 - name: Odin issues tests - cd tests/issues - ./run.sh + run: | + cd tests/issues + ./run.sh timeout-minutes: 10 - name: Odin check examples/all for Darwin arm64 run: ./odin check examples/all -vet -strict-style -target:darwin_arm64 From 40f0f5ad8dd56691ae42e9dd4b9a2f5e5395f3ee Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 26 Apr 2022 15:01:09 +0200 Subject: [PATCH 091/245] Update CI for math library. --- tests/core/math/big/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/core/math/big/build.bat b/tests/core/math/big/build.bat index 16bdbc8ca..ad199d775 100644 --- a/tests/core/math/big/build.bat +++ b/tests/core/math/big/build.bat @@ -4,7 +4,7 @@ set PATH_TO_ODIN==..\..\..\..\odin set TEST_ARGS=-fast-tests set TEST_ARGS=-no-random set TEST_ARGS= -set OUT_NAME=math_big_test_library +set OUT_NAME=math_big_test_library.dll set COMMON=-build-mode:shared -show-timings -no-bounds-check -define:MATH_BIG_EXE=false -vet -strict-style echo --- echo Running core:math/big tests From d262eda91c527880a95f70a3d6fa20346c1d20d6 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 26 Apr 2022 15:10:31 +0200 Subject: [PATCH 092/245] Update Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 82150c6a2..91010a620 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -all: debug demo +all: debug demo: - ./odin run examples/demo/demo.odin + ./odin run examples/demo/demo.odin -file report: ./odin report From a6cef2e50ea4867f02bac5442debfa1de0743681 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 26 Apr 2022 21:47:45 +0100 Subject: [PATCH 093/245] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 9ca94bcdf..9a87ab8da 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2021 Ginger Bill. All rights reserved. +Copyright (c) 2016-2022 Ginger Bill. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From 96924969895d78d93e8f39158a0409a6a2c214ab Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 12:27:53 +0100 Subject: [PATCH 094/245] Add `intrinsics.type_field_type` --- core/intrinsics/intrinsics.odin | 1 + src/check_builtin.cpp | 31 +++++++++++++++++++++++++++++++ src/checker_builtin_procs.hpp | 2 ++ 3 files changed, 34 insertions(+) diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index a25e9783d..c132d4095 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -153,6 +153,7 @@ type_is_specialization_of :: proc($T, $S: typeid) -> bool --- type_is_variant_of :: proc($U, $V: typeid) -> bool where type_is_union(U) --- type_has_field :: proc($T: typeid, $name: string) -> bool --- +type_field_type :: proc($T: typeid, $name: string) -> typeid --- type_proc_parameter_count :: proc($T: typeid) -> int where type_is_proc(T) --- type_proc_return_count :: proc($T: typeid) -> int where type_is_proc(T) --- diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index e055539c5..6c7972d45 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -3926,6 +3926,37 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 break; } break; + case BuiltinProc_type_field_type: + { + Operand op = {}; + Type *bt = check_type(c, ce->args[0]); + Type *type = base_type(bt); + if (type == nullptr || type == t_invalid) { + error(ce->args[0], "Expected a type for '%.*s'", LIT(builtin_name)); + return false; + } + Operand x = {}; + check_expr(c, &x, ce->args[1]); + + if (!is_type_string(x.type) || x.mode != Addressing_Constant || x.value.kind != ExactValue_String) { + error(ce->args[1], "Expected a const string for field argument"); + return false; + } + + String field_name = x.value.value_string; + + Selection sel = lookup_field(type, field_name, false); + if (sel.index.count == 0) { + gbString t = type_to_string(type); + error(ce->args[1], "'%.*s' is not a field of type %s", LIT(field_name), t); + gb_string_free(t); + return false; + } + operand->mode = Addressing_Type; + operand->type = sel.entity->type; + break; + } + break; case BuiltinProc_type_is_specialization_of: { diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index fe14ae372..0f72f01f7 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -179,6 +179,7 @@ BuiltinProc__type_simple_boolean_begin, BuiltinProc__type_simple_boolean_end, BuiltinProc_type_has_field, + BuiltinProc_type_field_type, BuiltinProc_type_is_specialization_of, @@ -395,6 +396,7 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT(""), 0, false, Expr_Stmt, BuiltinProcPkg_intrinsics}, {STR_LIT("type_has_field"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("type_field_type"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_is_specialization_of"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, From 9349dfba8fec53f52f77a0c8928e115ec93ff447 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 12:39:45 +0100 Subject: [PATCH 095/245] Add new builtin `container_of` --- core/runtime/core_builtin.odin | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/runtime/core_builtin.odin b/core/runtime/core_builtin.odin index 67b1bd37b..13e464a76 100644 --- a/core/runtime/core_builtin.odin +++ b/core/runtime/core_builtin.odin @@ -5,6 +5,16 @@ import "core:intrinsics" @builtin Maybe :: union($T: typeid) #maybe {T} + +@builtin +container_of :: #force_inline proc "contextless" (ptr: $P/^$Field_Type, $T: typeid, $field_name: string) -> ^T + where intrinsics.type_has_field(T, field_name), + intrinsics.type_field_type(T, field_name) == Field_Type { + offset :: offset_of_by_string(T, field_name) + return (^T)(uintptr(ptr) - offset) if ptr != nil else nil +} + + @thread_local global_default_temp_allocator_data: Default_Temp_Allocator @builtin From 3a9b0a22e728d1158efccb7f90e2c8aa05c486ef Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 14:27:33 +0100 Subject: [PATCH 096/245] Add `core:container/intrusive/list` --- .../intrusive/list/intrusive_list.odin | 173 ++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 core/container/intrusive/list/intrusive_list.odin diff --git a/core/container/intrusive/list/intrusive_list.odin b/core/container/intrusive/list/intrusive_list.odin new file mode 100644 index 000000000..88e21edc5 --- /dev/null +++ b/core/container/intrusive/list/intrusive_list.odin @@ -0,0 +1,173 @@ +package container_intrusive_list + +import "core:intrinsics" + +// An intrusive doubly-linked list +// +// As this is an intrusive container, a `Node` must be embedded in your own +// structure which is conventionally called a "link". The use of `push_front` +// and `push_back` take the address of this node. Retrieving the data +// associated with the node requires finding the relative offset of the node +// of the parent structure. The parent type and field name are given to +// `iterator_*` procedures, or to the built-in `container_of` procedure. +// +// This data structure is two-pointers in size: +// 8 bytes on 32-bit platforms and 16 bytes on 64-bit platforms +List :: struct { + head: ^Node, + tail: ^Node, +} + + +Node :: struct { + next, prev: ^Node, +} + +push_front :: proc(list: ^List, node: ^Node) { + if list.head != nil { + list.head.prev = node + node.prev, node.next = nil, list.head + list.head = node + } else { + list.head, list.tail = node, node + node.prev, node.next = nil, nil + } +} + +push_back :: proc(list: ^List, node: ^Node) { + if list.tail != nil { + list.tail.next = node + node.prev, node.next = list.tail, nil + list.tail = node + } else { + list.head, list.tail = node, node + node.prev, node.next = nil, nil + } +} + +remove :: proc(list: ^List, node: ^Node) { + if node != nil { + if node.next != nil { + node.next.prev = node.prev + } + if node.prev != nil { + node.prev.next = node.next + } + if list.head == node { + list.head = node.next + } + if list.tail == node { + list.tail = node.prev + } + } +} + +remove_by_proc :: proc(list: ^List, to_erase: proc(^Node) -> bool) { + for node := list.head; node != nil; { + next := node.next + if to_erase(node) { + if node.next != nil { + node.next.prev = node.prev + } + if node.prev != nil { + node.prev.next = node.next + } + if list.head == node { + list.head = node.next + } + if list.tail == node { + list.tail = node.prev + } + } + node = next + } +} + + +is_empty :: proc(list: ^List) -> bool { + return list.head == nil +} + +pop_front :: proc(list: ^List) -> ^Node { + link := list.head + if link == nil { + return nil + } + if link.next != nil { + link.next.prev = link.prev + } + if link.prev != nil { + link.prev.next = link.next + } + if link == list.head { + list.head = link.next + } + if link == list.tail { + list.tail = link.prev + } + return link + +} +pop_back :: proc(list: ^List) -> ^Node { + link := list.tail + if link == nil { + return nil + } + if link.next != nil { + link.next.prev = link.prev + } + if link.prev != nil { + link.prev.next = link.next + } + if link == list.head { + list.head = link.next + } + if link == list.tail { + list.tail = link.prev + } + return link +} + + +Iterator :: struct($T: typeid) { + curr: ^Node, + offset: uintptr, +} + +iterator_head :: proc(list: List, $T: typeid, $field_name: string) -> Iterator(T) + where intrinsics.type_has_field(T, field_name), + intrinsics.type_field_type(T, field_name) == Node { + return {list.head, offset_of_by_string(T, field_name)} +} + +iterator_tail :: proc(list: List, $T: typeid, $field_name: string) -> Iterator(T) + where intrinsics.type_has_field(T, field_name), + intrinsics.type_field_type(T, field_name) == Node { + return {list.tail, offset_of_by_string(T, field_name)} +} + +iterator_from_node :: proc(node: ^Node, $T: typeid, $field_name: string) -> Iterator(T) + where intrinsics.type_has_field(T, field_name), + intrinsics.type_field_type(T, field_name) == Node { + return {node, offset_of_by_string(T, field_name)} +} + +iterate_next :: proc(it: ^Iterator($T)) -> (ptr: ^T, ok: bool) { + node := it.curr + if node == nil { + return nil, false + } + it.curr = node.next + + return (^T)(uintptr(node) - it.offset), true +} + +iterate_prev :: proc(it: ^Iterator($T)) -> (ptr: ^T, ok: bool) { + node := it.curr + if node == nil { + return nil, false + } + it.curr = node.prev + + return (^T)(uintptr(node) - it.offset), true +} \ No newline at end of file From fbbb0d7610d2ace168df2aec65d76f51f35ec6a8 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 14:51:04 +0100 Subject: [PATCH 097/245] Update intrinsics.odin for documentation --- core/intrinsics/intrinsics.odin | 54 +++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index c132d4095..beb6f3f31 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -41,6 +41,10 @@ mem_copy_non_overlapping :: proc(dst, src: rawptr, len: int) --- mem_zero :: proc(ptr: rawptr, len: int) --- mem_zero_volatile :: proc(ptr: rawptr, len: int) --- +// prefer [^]T operations if possible +ptr_offset :: proc(ptr: ^$T, offset: int) -> ^T --- +ptr_sub :: proc(a, b: ^$T) -> int --- + unaligned_load :: proc(src: ^$T) -> T --- unaligned_store :: proc(dst: ^$T, val: T) -> T --- @@ -82,6 +86,7 @@ atomic_store_explicit :: proc(dst: ^$T, val: T, order: Atomic_Memory_Order) --- atomic_load :: proc(dst: ^$T) -> T --- atomic_load_explicit :: proc(dst: ^$T, order: Atomic_Memory_Order) -> T --- +// fetch then operator atomic_add :: proc(dst; ^$T, val: T) -> T --- atomic_add_explicit :: proc(dst; ^$T, val: T, order: Atomic_Memory_Order) -> T --- atomic_sub :: proc(dst; ^$T, val: T) -> T --- @@ -119,19 +124,20 @@ type_is_string :: proc($T: typeid) -> bool --- type_is_typeid :: proc($T: typeid) -> bool --- type_is_any :: proc($T: typeid) -> bool --- -type_is_endian_platform :: proc($T: typeid) -> bool --- -type_is_endian_little :: proc($T: typeid) -> bool --- -type_is_endian_big :: proc($T: typeid) -> bool --- -type_is_unsigned :: proc($T: typeid) -> bool --- -type_is_numeric :: proc($T: typeid) -> bool --- -type_is_ordered :: proc($T: typeid) -> bool --- -type_is_ordered_numeric :: proc($T: typeid) -> bool --- -type_is_indexable :: proc($T: typeid) -> bool --- -type_is_sliceable :: proc($T: typeid) -> bool --- -type_is_comparable :: proc($T: typeid) -> bool --- -type_is_simple_compare :: proc($T: typeid) -> bool --- // easily compared using memcmp (== and !=) -type_is_dereferenceable :: proc($T: typeid) -> bool --- -type_is_valid_map_key :: proc($T: typeid) -> bool --- +type_is_endian_platform :: proc($T: typeid) -> bool --- +type_is_endian_little :: proc($T: typeid) -> bool --- +type_is_endian_big :: proc($T: typeid) -> bool --- +type_is_unsigned :: proc($T: typeid) -> bool --- +type_is_numeric :: proc($T: typeid) -> bool --- +type_is_ordered :: proc($T: typeid) -> bool --- +type_is_ordered_numeric :: proc($T: typeid) -> bool --- +type_is_indexable :: proc($T: typeid) -> bool --- +type_is_sliceable :: proc($T: typeid) -> bool --- +type_is_comparable :: proc($T: typeid) -> bool --- +type_is_simple_compare :: proc($T: typeid) -> bool --- // easily compared using memcmp (== and !=) +type_is_dereferenceable :: proc($T: typeid) -> bool --- +type_is_valid_map_key :: proc($T: typeid) -> bool --- +type_is_valid_matrix_elements :: proc($T: typeid) -> bool --- type_is_named :: proc($T: typeid) -> bool --- type_is_pointer :: proc($T: typeid) -> bool --- @@ -146,6 +152,7 @@ type_is_enum :: proc($T: typeid) -> bool --- type_is_proc :: proc($T: typeid) -> bool --- type_is_bit_set :: proc($T: typeid) -> bool --- type_is_simd_vector :: proc($T: typeid) -> bool --- +type_is_matrix :: proc($T: typeid) -> bool --- type_has_nil :: proc($T: typeid) -> bool --- @@ -161,20 +168,41 @@ type_proc_return_count :: proc($T: typeid) -> int where type_is_proc(T) --- type_proc_parameter_type :: proc($T: typeid, index: int) -> typeid where type_is_proc(T) --- type_proc_return_type :: proc($T: typeid, index: int) -> typeid where type_is_proc(T) --- +type_struct_field_count :: proc($T: typeid) -> int where type_is_struct(T) --- + type_polymorphic_record_parameter_count :: proc($T: typeid) -> typeid --- type_polymorphic_record_parameter_value :: proc($T: typeid, index: int) -> $V --- +type_is_specialized_polymorphic_record :: proc($T: typeid) -> bool --- +type_is_unspecialized_polymorphic_record :: proc($T: typeid) -> bool --- + +type_is_subtype_of :: proc($T, $U: typeid) -> bool --- type_field_index_of :: proc($T: typeid, $name: string) -> uintptr --- type_equal_proc :: proc($T: typeid) -> (equal: proc "contextless" (rawptr, rawptr) -> bool) where type_is_comparable(T) --- type_hasher_proc :: proc($T: typeid) -> (hasher: proc "contextless" (data: rawptr, seed: uintptr) -> uintptr) where type_is_comparable(T) --- +constant_utf16_cstring :: proc($literal: string) -> [^]u16 --- // WASM targets only wasm_memory_grow :: proc(index, delta: uintptr) -> int --- wasm_memory_size :: proc(index: uintptr) -> int --- + +// Darwin targets only +objc_object :: struct{} +objc_selector :: struct{} +objc_class :: struct{} +objc_id :: ^objc_object +objc_SEL :: ^objc_selector +objc_Class :: ^objc_class + +objc_find_selector :: proc($name: string) -> objc_SEL --- +objc_register_selector :: proc($name: string) -> objc_SEL --- +objc_find_class :: proc($name: string) -> objc_Class --- +objc_register_class :: proc($name: string) -> objc_Class --- + // Internal compiler use only __entry_point :: proc() --- \ No newline at end of file From 904f0407f8e19a419dfe313181c2b47216121e11 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 14:53:26 +0100 Subject: [PATCH 098/245] Add `intrinsics.type_is_multi_pointer` --- src/check_builtin.cpp | 2 ++ src/checker_builtin_procs.hpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index 6c7972d45..9a5d1c554 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -29,6 +29,7 @@ BuiltinTypeIsProc *builtin_type_is_procs[BuiltinProc__type_simple_boolean_end - is_type_named, is_type_pointer, + is_type_multi_pointer, is_type_array, is_type_enumerated_array, is_type_slice, @@ -3866,6 +3867,7 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 case BuiltinProc_type_is_valid_matrix_elements: case BuiltinProc_type_is_named: case BuiltinProc_type_is_pointer: + case BuiltinProc_type_is_multi_pointer: case BuiltinProc_type_is_array: case BuiltinProc_type_is_enumerated_array: case BuiltinProc_type_is_slice: diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index 0f72f01f7..d301cae0c 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -158,6 +158,7 @@ BuiltinProc__type_simple_boolean_begin, BuiltinProc_type_is_named, BuiltinProc_type_is_pointer, + BuiltinProc_type_is_multi_pointer, BuiltinProc_type_is_array, BuiltinProc_type_is_enumerated_array, BuiltinProc_type_is_slice, @@ -376,6 +377,7 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT("type_is_named"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_is_pointer"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("type_is_multi_pointer"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_is_array"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_is_enumerated_array"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_is_slice"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, From da0f722aad98afc94de09903a74802f43e6f5961 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 27 Apr 2022 15:56:45 +0200 Subject: [PATCH 099/245] Move Odin CI test assets over to its own repository. --- tests/core/download_assets.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tests/core/download_assets.py b/tests/core/download_assets.py index d86f7f1e7..50137f563 100644 --- a/tests/core/download_assets.py +++ b/tests/core/download_assets.py @@ -5,8 +5,9 @@ import sys import os import zipfile +TEST_SUITES = ['PNG', 'XML'] DOWNLOAD_BASE_PATH = "assets/{}" -ASSETS_BASE_URL = "https://raw.githubusercontent.com/Kelimion/compress-odin/master/tests/assets/{}/{}" +ASSETS_BASE_URL = "https://raw.githubusercontent.com/odin-lang/test-assets/master/{}/{}" PNG_IMAGES = [ "basi0g01.png", "basi0g02.png", "basi0g04.png", "basi0g08.png", "basi0g16.png", "basi2c08.png", "basi2c16.png", "basi3p01.png", "basi3p02.png", "basi3p04.png", "basi3p08.png", "basi4a08.png", @@ -73,25 +74,27 @@ def try_download_and_unpack_zip(suite): print("Could not extract ZIP file") return 2 - def main(): - print("Downloading PNG assets") + for suite in TEST_SUITES: + print("Downloading {} assets".format(suite)) - # Make PNG assets path - try: - path = DOWNLOAD_BASE_PATH.format("PNG") - os.makedirs(path) - except FileExistsError: - pass + # Make assets path + try: + path = DOWNLOAD_BASE_PATH.format(suite) + os.makedirs(path) + except FileExistsError: + pass + + # Try downloading and unpacking the assets + r = try_download_and_unpack_zip(suite) + if r is not None: + return r + + # We could fall back on downloading the PNG files individually, but it's slow + print("Done downloading {} assets.".format(suite)) - # Try downloading and unpacking the PNG assets - r = try_download_and_unpack_zip("PNG") - if r is not None: - return r - # We could fall back on downloading the PNG files individually, but it's slow - print("Done downloading PNG assets") return 0 if __name__ == '__main__': From bd73b2845b2e7cadf38c441babeeb9765896b2be Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 15:03:48 +0100 Subject: [PATCH 100/245] Unify default `Sema` and `Atomic_Sema` behaviour --- core/sync/primitives_atomic.odin | 65 +++++++++++++++----------------- core/sync/sema_internal.odin | 42 ++------------------- 2 files changed, 34 insertions(+), 73 deletions(-) diff --git a/core/sync/primitives_atomic.odin b/core/sync/primitives_atomic.odin index 11fff4e60..22771443d 100644 --- a/core/sync/primitives_atomic.odin +++ b/core/sync/primitives_atomic.odin @@ -400,30 +400,28 @@ atomic_cond_broadcast :: proc(c: ^Atomic_Cond) { // // An Atomic_Sema must not be copied after first use Atomic_Sema :: struct { - mutex: Atomic_Mutex, - cond: Atomic_Cond, - count: int, + count: Futex, } atomic_sema_post :: proc(s: ^Atomic_Sema, count := 1) { - atomic_mutex_lock(&s.mutex) - defer atomic_mutex_unlock(&s.mutex) - - s.count += count - atomic_cond_signal(&s.cond) + atomic_add_explicit(&s.count, Futex(count), .Release) + if count == 1 { + futex_signal(&s.count) + } else { + futex_broadcast(&s.count) + } } atomic_sema_wait :: proc(s: ^Atomic_Sema) { - atomic_mutex_lock(&s.mutex) - defer atomic_mutex_unlock(&s.mutex) - - for s.count == 0 { - atomic_cond_wait(&s.cond, &s.mutex) - } - - s.count -= 1 - if s.count > 0 { - atomic_cond_signal(&s.cond) + for { + original_count := atomic_load_explicit(&s.count, .Relaxed) + for original_count == 0 { + futex_wait(&s.count, u32(original_count)) + original_count = s.count + } + if original_count == atomic_compare_exchange_strong_explicit(&s.count, original_count, original_count-1, .Acquire, .Acquire) { + return + } } } @@ -431,25 +429,22 @@ atomic_sema_wait_with_timeout :: proc(s: ^Atomic_Sema, duration: time.Duration) if duration <= 0 { return false } - atomic_mutex_lock(&s.mutex) - defer atomic_mutex_unlock(&s.mutex) - - start := time.tick_now() + for { - for s.count == 0 { - remaining := duration - time.tick_since(start) - if remaining < 0 { - return false + original_count := atomic_load_explicit(&s.count, .Relaxed) + for start := time.tick_now(); original_count == 0; /**/ { + remaining := duration - time.tick_since(start) + if remaining < 0 { + return false + } + + if !futex_wait_with_timeout(&s.count, u32(original_count), remaining) { + return false + } + original_count = s.count } - - if !atomic_cond_wait_with_timeout(&s.cond, &s.mutex, remaining) { - return false + if original_count == atomic_compare_exchange_strong_explicit(&s.count, original_count, original_count-1, .Acquire, .Acquire) { + return true } } - - s.count -= 1 - if s.count > 0 { - atomic_cond_signal(&s.cond) - } - return true } diff --git a/core/sync/sema_internal.odin b/core/sync/sema_internal.odin index e4a3c0bfc..5e2203c34 100644 --- a/core/sync/sema_internal.odin +++ b/core/sync/sema_internal.odin @@ -6,53 +6,19 @@ import "core:time" when #config(ODIN_SYNC_SEMA_USE_FUTEX, true) { _Sema :: struct { - count: Futex, + atomic: Atomic_Sema, } _sema_post :: proc(s: ^Sema, count := 1) { - atomic_add_explicit(&s.impl.count, Futex(count), .Release) - if count == 1 { - futex_signal(&s.impl.count) - } else { - futex_broadcast(&s.impl.count) - } + atomic_sema_post(&s.impl.atomic, count) } _sema_wait :: proc(s: ^Sema) { - for { - original_count := atomic_load_explicit(&s.impl.count, .Relaxed) - for original_count == 0 { - futex_wait(&s.impl.count, u32(original_count)) - original_count = s.impl.count - } - if original_count == atomic_compare_exchange_strong_explicit(&s.impl.count, original_count, original_count-1, .Acquire, .Acquire) { - return - } - } + atomic_sema_wait(&s.impl.atomic) } _sema_wait_with_timeout :: proc(s: ^Sema, duration: time.Duration) -> bool { - if duration <= 0 { - return false - } - for { - - original_count := atomic_load_explicit(&s.impl.count, .Relaxed) - for start := time.tick_now(); original_count == 0; /**/ { - remaining := duration - time.tick_since(start) - if remaining < 0 { - return false - } - - if !futex_wait_with_timeout(&s.impl.count, u32(original_count), remaining) { - return false - } - original_count = s.impl.count - } - if original_count == atomic_compare_exchange_strong_explicit(&s.impl.count, original_count, original_count-1, .Acquire, .Acquire) { - return true - } - } + return atomic_sema_wait_with_timeout(&s.impl.atomic, duration) } } else { _Sema :: struct { From 305510bea0cd8493ffab32a50516d8fde8611e4c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 15:25:56 +0100 Subject: [PATCH 101/245] Update intrinsics.odin --- core/intrinsics/intrinsics.odin | 1 + 1 file changed, 1 insertion(+) diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index beb6f3f31..7e75aecc4 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -141,6 +141,7 @@ type_is_valid_matrix_elements :: proc($T: typeid) -> bool --- type_is_named :: proc($T: typeid) -> bool --- type_is_pointer :: proc($T: typeid) -> bool --- +type_is_multi_pointer :: proc($T: typeid) -> bool --- type_is_array :: proc($T: typeid) -> bool --- type_is_enumerated_array :: proc($T: typeid) -> bool --- type_is_slice :: proc($T: typeid) -> bool --- From d6cfb6050613872c3ae70cbbe446276cec4ded12 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 15:29:21 +0100 Subject: [PATCH 102/245] Remove `prev` from `Atomic_Cond` --- core/sync/primitives_atomic.odin | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/sync/primitives_atomic.odin b/core/sync/primitives_atomic.odin index 812e5ae97..665b515ba 100644 --- a/core/sync/primitives_atomic.odin +++ b/core/sync/primitives_atomic.odin @@ -287,12 +287,10 @@ atomic_recursive_mutex_guard :: proc(m: ^Atomic_Recursive_Mutex) -> bool { // An Atomic_Cond must not be copied after first use Atomic_Cond :: struct { state: Futex, - prev: u32, } atomic_cond_wait :: proc(c: ^Atomic_Cond, m: ^Atomic_Mutex) { - state := u32(atomic_load(&c.state)) - atomic_store(&c.prev, state) + state := u32(atomic_load_explicit(&c.state, .Relaxed)) unlock(m) futex_wait(&c.state, state) lock(m) @@ -309,14 +307,12 @@ atomic_cond_wait_with_timeout :: proc(c: ^Atomic_Cond, m: ^Atomic_Mutex, duratio atomic_cond_signal :: proc(c: ^Atomic_Cond) { - state := 1 + atomic_load(&c.prev) - atomic_store(&c.state, Futex(state)) + atomic_add_explicit(&c.state, 1, .Relaxed) futex_signal(&c.state) } atomic_cond_broadcast :: proc(c: ^Atomic_Cond) { - state := 1 + atomic_load(&c.prev) - atomic_store(&c.state, Futex(state)) + atomic_add_explicit(&c.state, 1, .Relaxed) futex_broadcast(&c.state) } From 10cd294cf2b64ae6d5c7e8a470d074e2c48eb4cb Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 27 Apr 2022 15:57:47 +0100 Subject: [PATCH 103/245] Use Acquire semantics for the `futex_wait` load shortcut --- core/sync/primitives.odin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sync/primitives.odin b/core/sync/primitives.odin index 483f85343..bfbdc6f9b 100644 --- a/core/sync/primitives.odin +++ b/core/sync/primitives.odin @@ -195,7 +195,7 @@ sema_wait_with_timeout :: proc(s: ^Sema, duration: time.Duration) -> bool { Futex :: distinct u32 futex_wait :: proc(f: ^Futex, expected: u32) { - if u32(atomic_load(f)) != expected { + if u32(atomic_load_explicit(f, .Acquire)) != expected { return } @@ -204,7 +204,7 @@ futex_wait :: proc(f: ^Futex, expected: u32) { // returns true if the wait happened within the duration, false if it exceeded the time duration futex_wait_with_timeout :: proc(f: ^Futex, expected: u32, duration: time.Duration) -> bool { - if u32(atomic_load(f)) != expected { + if u32(atomic_load_explicit(f, .Acquire)) != expected { return true } if duration <= 0 { From cd13dedb36799d1b6e2f674d95fd820babff5e16 Mon Sep 17 00:00:00 2001 From: Karl Zylinski Date: Wed, 27 Apr 2022 20:06:43 +0200 Subject: [PATCH 104/245] D3D12 binding fixes: Added dxgi.IID versions of all the UUIDs in d3d12.odin so that the IIDs can be used to fetch interfaces properly. Also fixed an issue where GetDesc, GetCPUDescriptorHandleForHeapStart and GetGPUDescriptorHandleForHeapStart had the wrong signature due to an old D3D12 header bug, more info: https://stackoverflow.com/questions/34118929/getcpudescriptorhandleforheapstart-stack-corruption --- vendor/directx/d3d12/d3d12.odin | 184 +++++++++++++++++++++----------- 1 file changed, 120 insertions(+), 64 deletions(-) diff --git a/vendor/directx/d3d12/d3d12.odin b/vendor/directx/d3d12/d3d12.odin index f3885ed63..739606249 100644 --- a/vendor/directx/d3d12/d3d12.odin +++ b/vendor/directx/d3d12/d3d12.odin @@ -189,7 +189,8 @@ SRV_DIMENSION :: enum i32 { PFN_DESTRUCTION_CALLBACK :: #type proc "c" (a0: rawptr) -ID3DDestructionNotifier_UUID :: "a06eb39a-50da-425b-8c31-4eecd6c270f3" +ID3DDestructionNotifier_UUID_STRING :: "a06eb39a-50da-425b-8c31-4eecd6c270f3" +ID3DDestructionNotifier_UUID := &IID{0xa06eb39a, 0x50da, 0x425b, {0x8c, 0x31, 0x4e, 0xec, 0xd6, 0xc2, 0x70, 0xf3}} ID3DDestructionNotifier :: struct #raw_union { #subtype iunknown: IUnknown, using id3ddestructionnotifier_vtable: ^ID3DDestructionNotifier_VTable, @@ -658,7 +659,8 @@ RASTERIZER_DESC :: struct { } -IObject_UUID :: "c4fec28f-7966-4e95-9f94-f431cb56c3b8" +IObject_UUID_STRING :: "c4fec28f-7966-4e95-9f94-f431cb56c3b8" +IObject_UUID := &IID{0xc4fec28f, 0x7966, 0x4e95, {0x9f, 0x94, 0xf4, 0x31, 0xcb, 0x56, 0xc3, 0xb8}} IObject :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12object_vtable: ^IObject_VTable, @@ -672,7 +674,8 @@ IObject_VTable :: struct { } -IDeviceChild_UUID :: "905db94b-a00c-4140-9df5-2b64ca9ea357" +IDeviceChild_UUID_STRING :: "905db94b-a00c-4140-9df5-2b64ca9ea357" +IDeviceChild_UUID := &IID{0x905db94b, 0xa00c, 0x4140, {0x9d, 0xf5, 0x2b, 0x64, 0xca, 0x9e, 0xa3, 0x57}} IDeviceChild :: struct #raw_union { #subtype id3d12object: IObject, using id3d12devicechild_vtable: ^IDeviceChild_VTable, @@ -683,7 +686,8 @@ IDeviceChild_VTable :: struct { } -IRootSignature_UUID :: "c54a6b66-72df-4ee8-8be5-a946a1429214" +IRootSignature_UUID_STRING :: "c54a6b66-72df-4ee8-8be5-a946a1429214" +IRootSignature_UUID := &IID{0xc54a6b66, 0x72df, 0x4ee8, {0x8b, 0xe5, 0xa9, 0x46, 0xa1, 0x42, 0x92, 0x14}} IRootSignature :: struct { using id3d12devicechild: IDeviceChild, } @@ -2058,7 +2062,8 @@ VERSIONED_ROOT_SIGNATURE_DESC :: struct { } -IRootSignatureDeserializer_UUID :: "34AB647B-3CC8-46AC-841B-C0965645C046" +IRootSignatureDeserializer_UUID_STRING :: "34AB647B-3CC8-46AC-841B-C0965645C046" +IRootSignatureDeserializer_UUID := &IID{0x34AB647B, 0x3CC8, 0x46AC, {0x84, 0x1B, 0xC0, 0x96, 0x56, 0x45, 0xC0, 0x46}} IRootSignatureDeserializer :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12rootsignaturedeserializer_vtable: ^IRootSignatureDeserializer_VTable, @@ -2069,7 +2074,8 @@ IRootSignatureDeserializer_VTable :: struct { } -IVersionedRootSignatureDeserializer_UUID :: "7F91CE67-090C-4BB7-B78E-ED8FF2E31DA0" +IVersionedRootSignatureDeserializer_UUID_STRING :: "7F91CE67-090C-4BB7-B78E-ED8FF2E31DA0" +IVersionedRootSignatureDeserializer_UUID := &IID{0x7F91CE67, 0x090C, 0x4BB7, {0xB7, 0x8E, 0xED, 0x8F, 0xF2, 0xE3, 0x1D, 0xA0}} IVersionedRootSignatureDeserializer :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12versionedrootsignaturedeserializer_vtable: ^IVersionedRootSignatureDeserializer_VTable, @@ -2236,13 +2242,15 @@ COMMAND_SIGNATURE_DESC :: struct { } -IPageable_UUID :: "63ee58fb-1268-4835-86da-f008ce62f0d6" +IPageable_UUID_STRING :: "63ee58fb-1268-4835-86da-f008ce62f0d6" +IPageable_UUID := &IID{0x63ee58fb, 0x1268, 0x4835, {0x86, 0xda, 0xf0, 0x08, 0xce, 0x62, 0xf0, 0xd6}} IPageable :: struct { using id3d12devicechild: IDeviceChild, } -IHeap_UUID :: "6b3b2502-6e51-45b3-90ee-9884265e8df3" +IHeap_UUID_STRING :: "6b3b2502-6e51-45b3-90ee-9884265e8df3" +IHeap_UUID := &IID{0x6b3b2502, 0x6e51, 0x45b3, {0x90, 0xee, 0x98, 0x84, 0x26, 0x5e, 0x8d, 0xf3}} IHeap :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12heap_vtable: ^IHeap_VTable, @@ -2253,7 +2261,8 @@ IHeap_VTable :: struct { } -IResource_UUID :: "696442be-a72e-4059-bc79-5b5c98040fad" +IResource_UUID_STRING :: "696442be-a72e-4059-bc79-5b5c98040fad" +IResource_UUID := &IID{0x696442be, 0xa72e, 0x4059, {0xbc, 0x79, 0x5b, 0x5c, 0x98, 0x04, 0x0f, 0xad}} IResource :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12resource_vtable: ^IResource_VTable, @@ -2270,7 +2279,8 @@ IResource_VTable :: struct { } -ICommandAllocator_UUID :: "6102dee4-af59-4b09-b999-b44d73f09b24" +ICommandAllocator_UUID_STRING :: "6102dee4-af59-4b09-b999-b44d73f09b24" +ICommandAllocator_UUID := &IID{0x6102dee4, 0xaf59, 0x4b09, {0xb9, 0x99, 0xb4, 0x4d, 0x73, 0xf0, 0x9b, 0x24}} ICommandAllocator :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12commandallocator_vtable: ^ICommandAllocator_VTable, @@ -2281,7 +2291,8 @@ ICommandAllocator_VTable :: struct { } -IFence_UUID :: "0a753dcf-c4d8-4b91-adf6-be5a60d95a76" +IFence_UUID_STRING :: "0a753dcf-c4d8-4b91-adf6-be5a60d95a76" +IFence_UUID := &IID {0x0a753dcf, 0xc4d8, 0x4b91, {0xad, 0xf6, 0xbe, 0x5a, 0x60, 0xd9, 0x5a, 0x76}} IFence :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12fence_vtable: ^IFence_VTable, @@ -2294,7 +2305,8 @@ IFence_VTable :: struct { } -IFence1_UUID :: "433685fe-e22b-4ca0-a8db-b5b4f4dd0e4a" +IFence1_UUID_STRING :: "433685fe-e22b-4ca0-a8db-b5b4f4dd0e4a" +IFence1_UUID := &IID{0x433685fe, 0xe22b, 0x4ca0, {0xa8, 0xdb, 0xb5, 0xb4, 0xf4, 0xdd, 0x0e, 0x4a}} IFence1 :: struct #raw_union { #subtype id3d12fence: IFence, using id3d12fence1_vtable: ^IFence1_VTable, @@ -2305,7 +2317,8 @@ IFence1_VTable :: struct { } -IPipelineState_UUID :: "765a30f3-f624-4c6f-a828-ace948622445" +IPipelineState_UUID_STRING :: "765a30f3-f624-4c6f-a828-ace948622445" +IPipelineState_UUID := &IID{0x765a30f3, 0xf624, 0x4c6f, {0xa8, 0x28, 0xac, 0xe9, 0x48, 0x62, 0x24, 0x45}} IPipelineState :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12pipelinestate_vtable: ^IPipelineState_VTable, @@ -2316,32 +2329,35 @@ IPipelineState_VTable :: struct { } -IDescriptorHeap_UUID :: "8efb471d-616c-4f49-90f7-127bb763fa51" +IDescriptorHeap_UUID_STRING :: "8efb471d-616c-4f49-90f7-127bb763fa51" +IDescriptorHeap_UUID := &IID{0x8efb471d, 0x616c, 0x4f49, { 0x90, 0xf7, 0x12, 0x7b, 0xb7, 0x63, 0xfa, 0x51}} IDescriptorHeap :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12descriptorheap_vtable: ^IDescriptorHeap_VTable, } IDescriptorHeap_VTable :: struct { using id3d12devicechild_vtable: IDeviceChild_VTable, - GetDesc: proc "stdcall" (this: ^IDescriptorHeap) -> DESCRIPTOR_HEAP_DESC, - GetCPUDescriptorHandleForHeapStart: proc "stdcall" (this: ^IDescriptorHeap) -> CPU_DESCRIPTOR_HANDLE, - GetGPUDescriptorHandleForHeapStart: proc "stdcall" (this: ^IDescriptorHeap) -> GPU_DESCRIPTOR_HANDLE, -} + GetDesc: proc "stdcall" (this: ^IDescriptorHeap, desc: ^DESCRIPTOR_HEAP_DESC), + GetCPUDescriptorHandleForHeapStart: proc "stdcall" (this: ^IDescriptorHeap, handle: ^CPU_DESCRIPTOR_HANDLE), + GetGPUDescriptorHandleForHeapStart: proc "stdcall" (this: ^IDescriptorHeap, handle: ^GPU_DESCRIPTOR_HANDLE), +} - -IQueryHeap_UUID :: "0d9658ae-ed45-469e-a61d-970ec583cab4" +IQueryHeap_UUID_STRING :: "0d9658ae-ed45-469e-a61d-970ec583cab4" +IQueryHeap_UUID := &IID{0x0d9658ae, 0xed45, 0x469e, {0xa6, 0x1d, 0x97, 0x0e, 0xc5, 0x83, 0xca, 0xb4}} IQueryHeap :: struct { #subtype id3d12pageable: IPageable, } -ICommandSignature_UUID :: "c36a797c-ec80-4f0a-8985-a7b2475082d1" +ICommandSignature_UUID_STRING :: "c36a797c-ec80-4f0a-8985-a7b2475082d1" +ICommandSignature_UUID := &IID{0xc36a797c, 0xec80, 0x4f0a, {0x89, 0x85, 0xa7, 0xb2, 0x47, 0x50, 0x82, 0xd1}} ICommandSignature :: struct { #subtype id3d12pageable: IPageable, } -ICommandList_UUID :: "7116d91c-e7e4-47ce-b8c6-ec8168f437e5" +ICommandList_UUID_STRING :: "7116d91c-e7e4-47ce-b8c6-ec8168f437e5" +ICommandList_UUID := &IID {0x7116d91c, 0xe7e4, 0x47ce, {0xb8, 0xc6, 0xec, 0x81, 0x68, 0xf4, 0x37, 0xe5}} ICommandList :: struct #raw_union { #subtype id3d12devicechild: IDeviceChild, using id3d12commandlist_vtable: ^ICommandList_VTable, @@ -2352,7 +2368,8 @@ ICommandList_VTable :: struct { } -IGraphicsCommandList_UUID :: "5b160d0f-ac1b-4185-8ba8-b3ae42a5a455" +IGraphicsCommandList_UUID_STRING :: "5b160d0f-ac1b-4185-8ba8-b3ae42a5a455" +IGraphicsCommandList_UUID := &IID{0x5b160d0f, 0xac1b, 0x4185, {0x8b, 0xa8, 0xb3, 0xae, 0x42, 0xa5, 0xa4, 0x55}} IGraphicsCommandList :: struct #raw_union { #subtype id3d12commandlist: ICommandList, using id3d12graphicscommandlist_vtable: ^IGraphicsCommandList_VTable, @@ -2413,7 +2430,8 @@ IGraphicsCommandList_VTable :: struct { } -IGraphicsCommandList1_UUID :: "553103fb-1fe7-4557-bb38-946d7d0e7ca7" +IGraphicsCommandList1_UUID_STRING :: "553103fb-1fe7-4557-bb38-946d7d0e7ca7" +IGraphicsCommandList1_UUID := &IID{0x553103fb, 0x1fe7, 0x4557, {0xbb, 0x38, 0x94, 0x6d, 0x7d, 0x0e, 0x7c, 0xa7}} IGraphicsCommandList1 :: struct #raw_union { #subtype id3d12graphicscommandlist: IGraphicsCommandList, using id3d12graphicscommandlist1_vtable: ^IGraphicsCommandList1_VTable, @@ -2440,7 +2458,8 @@ WRITEBUFFERIMMEDIATE_MODE :: enum i32 { } -IGraphicsCommandList2_UUID :: "38C3E585-FF17-412C-9150-4FC6F9D72A28" +IGraphicsCommandList2_UUID_STRING :: "38C3E585-FF17-412C-9150-4FC6F9D72A28" +IGraphicsCommandList2_UUID := &IID{0x38C3E585, 0xFF17, 0x412C, {0x91, 0x50, 0x4F, 0xC6, 0xF9, 0xD7, 0x2A, 0x28}} IGraphicsCommandList2 :: struct #raw_union { #subtype id3d12graphicscommandlist1: IGraphicsCommandList1, using id3d12graphicscommandlist2_vtable: ^IGraphicsCommandList2_VTable, @@ -2451,7 +2470,8 @@ IGraphicsCommandList2_VTable :: struct { } -ICommandQueue_UUID :: "0ec870a6-5d7e-4c22-8cfc-5baae07616ed" +ICommandQueue_UUID_STRING :: "0ec870a6-5d7e-4c22-8cfc-5baae07616ed" +ICommandQueue_UUID := &IID{0x0ec870a6, 0x5d7e, 0x4c22, { 0x8c, 0xfc, 0x5b, 0xaa, 0xe0, 0x76, 0x16, 0xed}} ICommandQueue :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12commandqueue_vtable: ^ICommandQueue_VTable, @@ -2472,7 +2492,8 @@ ICommandQueue_VTable :: struct { } -IDevice_UUID :: "189819f1-1db6-4b57-be54-1821339b85f7" +IDevice_UUID_STRING :: "189819f1-1db6-4b57-be54-1821339b85f7" +IDevice_UUID := &IID{0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7}} IDevice :: struct #raw_union { #subtype id3d12object: IObject, using id3d12device_vtable: ^IDevice_VTable, @@ -2519,7 +2540,8 @@ IDevice_VTable :: struct { } -IPipelineLibrary_UUID :: "c64226a8-9201-46af-b4cc-53fb9ff7414f" +IPipelineLibrary_UUID_STRING :: "c64226a8-9201-46af-b4cc-53fb9ff7414f" +IPipelineLibrary_UUID := &IID{0xc64226a8, 0x9201, 0x46af, {0xb4, 0xcc, 0x53, 0xfb, 0x9f, 0xf7, 0x41, 0x4f}} IPipelineLibrary :: struct #raw_union { #subtype id3d12devicechild: IDeviceChild, using id3d12pipelinelibrary_vtable: ^IPipelineLibrary_VTable, @@ -2534,7 +2556,8 @@ IPipelineLibrary_VTable :: struct { } -IPipelineLibrary1_UUID :: "80eabf42-2568-4e5e-bd82-c37f86961dc3" +IPipelineLibrary1_UUID_STRING :: "80eabf42-2568-4e5e-bd82-c37f86961dc3" +IPipelineLibrary1_UUID := &IID{0x80eabf42, 0x2568, 0x4e5e, {0xbd, 0x82, 0xc3, 0x7f, 0x86, 0x96, 0x1d, 0xc3}} IPipelineLibrary1 :: struct #raw_union { #subtype id3d12pipelinelibrary: IPipelineLibrary, using id3d12pipelinelibrary1_vtable: ^IPipelineLibrary1_VTable, @@ -2559,7 +2582,8 @@ RESIDENCY_PRIORITY :: enum i32 { } -IDevice1_UUID :: "77acce80-638e-4e65-8895-c1f23386863e" +IDevice1_UUID_STRING :: "77acce80-638e-4e65-8895-c1f23386863e" +IDevice1_UUID := &IID{0x77acce80, 0x638e, 0x4e65, {0x88, 0x95, 0xc1, 0xf2, 0x33, 0x86, 0x86, 0x3e}} IDevice1 :: struct #raw_union { #subtype id3d12device: IDevice, using id3d12device1_vtable: ^IDevice1_VTable, @@ -2572,7 +2596,8 @@ IDevice1_VTable :: struct { } -IDevice2_UUID :: "30baa41e-b15b-475c-a0bb-1af5c5b64328" +IDevice2_UUID_STRING :: "30baa41e-b15b-475c-a0bb-1af5c5b64328" +IDevice2_UUID := &IID{0x30baa41e, 0xb15b, 0x475c, {0xa0, 0xbb, 0x1a, 0xf5, 0xc5, 0xb6, 0x43, 0x28}} IDevice2 :: struct #raw_union { #subtype id3d12device1: IDevice1, using id3d12device2_vtable: ^IDevice2_VTable, @@ -2588,7 +2613,8 @@ RESIDENCY_FLAGS :: enum u32 { // TODO: make bit_set } -IDevice3_UUID :: "81dadc15-2bad-4392-93c5-101345c4aa98" +IDevice3_UUID_STRING :: "81dadc15-2bad-4392-93c5-101345c4aa98" +IDevice3_UUID := &IID{0x81dadc15, 0x2bad, 0x4392, {0x93, 0xc5, 0x10, 0x13, 0x45, 0xc4, 0xaa, 0x98}} IDevice3 :: struct #raw_union { #subtype id3d12device2: IDevice2, using id3d12device3_vtable: ^IDevice3_VTable, @@ -2618,7 +2644,8 @@ PROTECTED_SESSION_STATUS :: enum i32 { } -IProtectedSession_UUID :: "A1533D18-0AC1-4084-85B9-89A96116806B" +IProtectedSession_UUID_STRING :: "A1533D18-0AC1-4084-85B9-89A96116806B" +IProtectedSession_UUID := &IID{0xA1533D18, 0x0AC1, 0x4084, {0x85, 0xB9, 0x89, 0xA9, 0x61, 0x16, 0x80, 0x6B}} IProtectedSession :: struct #raw_union { #subtype id3d12devicechild: IDeviceChild, using id3d12protectedsession_vtable: ^IProtectedSession_VTable, @@ -2649,7 +2676,8 @@ PROTECTED_RESOURCE_SESSION_DESC :: struct { } -IProtectedResourceSession_UUID :: "6CD696F4-F289-40CC-8091-5A6C0A099C3D" +IProtectedResourceSession_UUID_STRING :: "6CD696F4-F289-40CC-8091-5A6C0A099C3D" +IProtectedResourceSession_UUID := &IID{0x6CD696F4, 0xF289, 0x40CC, {0x80, 0x91, 0x5A, 0x6C, 0x0A, 0x09, 0x9C, 0x3D}} IProtectedResourceSession :: struct #raw_union { #subtype id3d12protectedsession: IProtectedSession, using id3d12protectedresourcesession_vtable: ^IProtectedResourceSession_VTable, @@ -2660,7 +2688,8 @@ IProtectedResourceSession_VTable :: struct { } -IDevice4_UUID :: "e865df17-a9ee-46f9-a463-3098315aa2e5" +IDevice4_UUID_STRING :: "e865df17-a9ee-46f9-a463-3098315aa2e5" +IDevice4_UUID := &IID{0xe865df17, 0xa9ee, 0x46f9, {0xa4, 0x63, 0x30, 0x98, 0x31, 0x5a, 0xa2, 0xe5}} IDevice4 :: struct #raw_union { #subtype id3d12device3: IDevice3, using id3d12device4_vtable: ^IDevice4_VTable, @@ -2681,7 +2710,8 @@ LIFETIME_STATE :: enum i32 { } -ILifetimeOwner_UUID :: "e667af9f-cd56-4f46-83ce-032e595d70a8" +ILifetimeOwner_UUID_STRING :: "e667af9f-cd56-4f46-83ce-032e595d70a8" +ILifetimeOwner_UUID := &IID{0xe667af9f, 0xcd56, 0x4f46, {0x83, 0xce, 0x03, 0x2e, 0x59, 0x5d, 0x70, 0xa8}} ILifetimeOwner :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12lifetimeowner_vtable: ^ILifetimeOwner_VTable, @@ -2692,7 +2722,8 @@ ILifetimeOwner_VTable :: struct { } -ISwapChainAssistant_UUID :: "f1df64b6-57fd-49cd-8807-c0eb88b45c8f" +ISwapChainAssistant_UUID_STRING :: "f1df64b6-57fd-49cd-8807-c0eb88b45c8f" +ISwapChainAssistant_UUID := &IID{0xf1df64b6, 0x57fd, 0x49cd, {0x88, 0x07, 0xc0, 0xeb, 0x88, 0xb4, 0x5c, 0x8f}} ISwapChainAssistant :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12swapchainassistant_vtable: ^ISwapChainAssistant_VTable, @@ -2706,7 +2737,8 @@ ISwapChainAssistant_VTable :: struct { } -ILifetimeTracker_UUID :: "3fd03d36-4eb1-424a-a582-494ecb8ba813" +ILifetimeTracker_UUID_STRING :: "3fd03d36-4eb1-424a-a582-494ecb8ba813" +ILifetimeTracker_UUID := &IID{0x3fd03d36, 0x4eb1, 0x424a, {0xa5, 0x82, 0x49, 0x4e, 0xcb, 0x8b, 0xa8, 0x13}} ILifetimeTracker :: struct #raw_union { #subtype id3d12devicechild: IDeviceChild, using id3d12lifetimetracker_vtable: ^ILifetimeTracker_VTable, @@ -2772,13 +2804,15 @@ META_COMMAND_DESC :: struct { } -IStateObject_UUID :: "47016943-fca8-4594-93ea-af258b55346d" +IStateObject_UUID_STRING :: "47016943-fca8-4594-93ea-af258b55346d" +IStateObject_UUID := &IID{0x47016943, 0xfca8, 0x4594, {0x93, 0xea, 0xaf, 0x25, 0x8b, 0x55, 0x34, 0x6d}} IStateObject :: struct #raw_union { #subtype id3d12pageable: IPageable, } -IStateObjectProperties_UUID :: "de5fa827-9bf9-4f26-89ff-d7f56fde3860" +IStateObjectProperties_UUID_STRING :: "de5fa827-9bf9-4f26-89ff-d7f56fde3860" +IStateObjectProperties_IID := &IID{0xde5fa827, 0x9bf9, 0x4f26, {0x89, 0xff, 0xd7, 0xf5, 0x6f, 0xde, 0x38, 0x60}} IStateObjectProperties :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12stateobjectproperties_vtable: ^IStateObjectProperties_VTable, @@ -3119,7 +3153,8 @@ HIT_KIND :: enum i32 { } -IDevice5_UUID :: "8b4f173b-2fea-4b80-8f58-4307191ab95d" +IDevice5_UUID_STRING :: "8b4f173b-2fea-4b80-8f58-4307191ab95d" +IDevice5_UUID := &IID{0x8b4f173b, 0x2fea, 0x4b80, {0x8f, 0x58, 0x43, 0x07, 0x19, 0x1a, 0xb9, 0x5d}} IDevice5 :: struct #raw_union { #subtype id3d12device4: IDevice4, using id3d12device5_vtable: ^IDevice5_VTable, @@ -3325,7 +3360,8 @@ VERSIONED_DEVICE_REMOVED_EXTENDED_DATA :: struct { } -IDeviceRemovedExtendedDataSettings_UUID :: "82BC481C-6B9B-4030-AEDB-7EE3D1DF1E63" +IDeviceRemovedExtendedDataSettings_UUID_SRING :: "82BC481C-6B9B-4030-AEDB-7EE3D1DF1E63" +IDeviceRemovedExtendedDataSettings_UUID := &IID{0x82BC481C, 0x6B9B, 0x4030, {0xAE, 0xDB, 0x7E, 0xE3, 0xD1, 0xDF, 0x1E, 0x63}} IDeviceRemovedExtendedDataSettings :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12deviceremovedextendeddatasettings_vtable: ^IDeviceRemovedExtendedDataSettings_VTable, @@ -3338,7 +3374,8 @@ IDeviceRemovedExtendedDataSettings_VTable :: struct { } -IDeviceRemovedExtendedDataSettings1_UUID :: "DBD5AE51-3317-4F0A-ADF9-1D7CEDCAAE0B" +IDeviceRemovedExtendedDataSettings1_UUID_STRING :: "DBD5AE51-3317-4F0A-ADF9-1D7CEDCAAE0B" +IDeviceRemovedExtendedDataSettings1_UUID := &IID{0xDBD5AE51, 0x3317, 0x4F0A, {0xAD, 0xF9, 0x1D, 0x7C, 0xED, 0xCA, 0xAE, 0x0B}} IDeviceRemovedExtendedDataSettings1 :: struct #raw_union { #subtype id3d12deviceremovedextendeddatasettings: IDeviceRemovedExtendedDataSettings, using id3d12deviceremovedextendeddatasettings1_vtable: ^IDeviceRemovedExtendedDataSettings1_VTable, @@ -3349,7 +3386,8 @@ IDeviceRemovedExtendedDataSettings1_VTable :: struct { } -IDeviceRemovedExtendedData_UUID :: "98931D33-5AE8-4791-AA3C-1A73A2934E71" +IDeviceRemovedExtendedData_UUID_STRING :: "98931D33-5AE8-4791-AA3C-1A73A2934E71" +IDeviceRemovedExtendedData_UUID := &IID{0x98931D33, 0x5AE8, 0x4791, {0xAA, 0x3C, 0x1A, 0x73, 0xA2, 0x93, 0x4E, 0x71}} IDeviceRemovedExtendedData :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12deviceremovedextendeddata_vtable: ^IDeviceRemovedExtendedData_VTable, @@ -3361,7 +3399,8 @@ IDeviceRemovedExtendedData_VTable :: struct { } -IDeviceRemovedExtendedData1_UUID :: "9727A022-CF1D-4DDA-9EBA-EFFA653FC506" +IDeviceRemovedExtendedData1_UUID_STRING :: "9727A022-CF1D-4DDA-9EBA-EFFA653FC506" +IDeviceRemovedExtendedData1_UUID := &IID{0x9727A022, 0xCF1D, 0x4DDA, {0x9E, 0xBA, 0xEF, 0xFA, 0x65, 0x3F, 0xC5, 0x06}} IDeviceRemovedExtendedData1 :: struct #raw_union { #subtype id3d12deviceremovedextendeddata: IDeviceRemovedExtendedData, using id3d12deviceremovedextendeddata1_vtable: ^IDeviceRemovedExtendedData1_VTable, @@ -3387,7 +3426,8 @@ MEASUREMENTS_ACTION :: enum i32 { } -IDevice6_UUID :: "c70b221b-40e4-4a17-89af-025a0727a6dc" +IDevice6_UUID_STRING :: "c70b221b-40e4-4a17-89af-025a0727a6dc" +IDevice6_UUID := &IID{0xc70b221b, 0x40e4, 0x4a17, {0x89, 0xaf, 0x02, 0x5a, 0x07, 0x27, 0xa6, 0xdc}} IDevice6 :: struct #raw_union { #subtype id3d12device5: IDevice5, using id3d12device6_vtable: ^IDevice6_VTable, @@ -3415,7 +3455,8 @@ PROTECTED_RESOURCE_SESSION_DESC1 :: struct { } -IProtectedResourceSession1_UUID :: "D6F12DD6-76FB-406E-8961-4296EEFC0409" +IProtectedResourceSession1_UUID_STRING :: "D6F12DD6-76FB-406E-8961-4296EEFC0409" +IProtectedResourceSession1_UUID := &IID{0xD6F12DD6, 0x76FB, 0x406E, {0x89, 0x61, 0x42, 0x96, 0xEE, 0xFC, 0x04, 0x09}} IProtectedResourceSession1 :: struct #raw_union { #subtype id3d12protectedresourcesession: IProtectedResourceSession, using id3d12protectedresourcesession1_vtable: ^IProtectedResourceSession1_VTable, @@ -3426,7 +3467,8 @@ IProtectedResourceSession1_VTable :: struct { } -IDevice7_UUID :: "5c014b53-68a1-4b9b-8bd1-dd6046b9358b" +IDevice7_UUID_STRING :: "5c014b53-68a1-4b9b-8bd1-dd6046b9358b" +IDevice7_UUID := &IID{0x5c014b53, 0x68a1, 0x4b9b, {0x8b, 0xd1, 0xdd, 0x60, 0x46, 0xb9, 0x35, 0x8b}} IDevice7 :: struct #raw_union { #subtype id3d12device6: IDevice6, using id3d12device7_vtable: ^IDevice7_VTable, @@ -3438,7 +3480,8 @@ IDevice7_VTable :: struct { } -IDevice8_UUID :: "9218E6BB-F944-4F7E-A75C-B1B2C7B701F3" +IDevice8_UUID_STRING :: "9218E6BB-F944-4F7E-A75C-B1B2C7B701F3" +IDevice8_UUID := &IID{0x9218E6BB, 0xF944, 0x4F7E, {0xA7, 0x5C, 0xB1, 0xB2, 0xC7, 0xB7, 0x01, 0xF3}} IDevice8 :: struct #raw_union { #subtype id3d12device7: IDevice7, using id3d12device8_vtable: ^IDevice8_VTable, @@ -3453,7 +3496,8 @@ IDevice8_VTable :: struct { } -IResource1_UUID :: "9D5E227A-4430-4161-88B3-3ECA6BB16E19" +IResource1_UUID_STRING :: "9D5E227A-4430-4161-88B3-3ECA6BB16E19" +IResource1_UUID := &IID{0x9D5E227A, 0x4430, 0x4161, {0x88, 0xB3, 0x3E, 0xCA, 0x6B, 0xB1, 0x6E, 0x19}} IResource1 :: struct #raw_union { #subtype id3d12resource: IResource, using id3d12resource1_vtable: ^IResource1_VTable, @@ -3464,7 +3508,8 @@ IResource1_VTable :: struct { } -IResource2_UUID :: "BE36EC3B-EA85-4AEB-A45A-E9D76404A495" +IResource2_UUID_STRING :: "BE36EC3B-EA85-4AEB-A45A-E9D76404A495" +IResource2_UUID := &IID{0xBE36EC3B, 0xEA85, 0x4AEB, {0xA4, 0x5A, 0xE9, 0xD7, 0x64, 0x04, 0xA4, 0x95}} IResource2 :: struct #raw_union { #subtype id3d12resource1: IResource1, using id3d12resource2_vtable: ^IResource2_VTable, @@ -3475,7 +3520,8 @@ IResource2_VTable :: struct { } -IHeap1_UUID :: "572F7389-2168-49E3-9693-D6DF5871BF6D" +IHeap1_UUID_STRING :: "572F7389-2168-49E3-9693-D6DF5871BF6D" +IHeap1_UUID := &IID{0x572F7389, 0x2168, 0x49E3, {0x96, 0x93, 0xD6, 0xDF, 0x58, 0x71, 0xBF, 0x6D}} IHeap1 :: struct #raw_union { #subtype id3d12heap: IHeap, using id3d12heap1_vtable: ^IHeap1_VTable, @@ -3486,7 +3532,8 @@ IHeap1_VTable :: struct { } -IGraphicsCommandList3_UUID :: "6FDA83A7-B84C-4E38-9AC8-C7BD22016B3D" +IGraphicsCommandList3_UUID_STRING :: "6FDA83A7-B84C-4E38-9AC8-C7BD22016B3D" +IGraphicsCommandList3_UUID := &IID{0x6FDA83A7, 0xB84C, 0x4E38, {0x9A, 0xC8, 0xC7, 0xBD, 0x22, 0x01, 0x6B, 0x3D}} IGraphicsCommandList3 :: struct #raw_union { #subtype id3d12graphicscommandlist2: IGraphicsCommandList2, using id3d12graphicscommandlist3_vtable: ^IGraphicsCommandList3_VTable, @@ -3568,7 +3615,8 @@ RENDER_PASS_FLAGS :: enum u32 { // TODO: make bit_set } -IMetaCommand_UUID :: "DBB84C27-36CE-4FC9-B801-F048C46AC570" +IMetaCommand_UUID_STRING :: "DBB84C27-36CE-4FC9-B801-F048C46AC570" +IMetaCommand_UUID := &IID{0xDBB84C27, 0x36CE, 0x4FC9, {0xB8, 0x01, 0xF0, 0x48, 0xC4, 0x6A, 0xC5, 0x70}} IMetaCommand :: struct #raw_union { #subtype id3d12pageable: IPageable, using id3d12metacommand_vtable: ^IMetaCommand_VTable, @@ -3589,7 +3637,8 @@ DISPATCH_RAYS_DESC :: struct { } -IGraphicsCommandList4_UUID :: "8754318e-d3a9-4541-98cf-645b50dc4874" +IGraphicsCommandList4_UUID_STRING :: "8754318e-d3a9-4541-98cf-645b50dc4874" +IGraphicsCommandList4_UUID := &IID{0x8754318e, 0xd3a9, 0x4541, {0x98, 0xcf, 0x64, 0x5b, 0x50, 0xdc, 0x48, 0x74}} IGraphicsCommandList4 :: struct #raw_union { #subtype id3d12graphicscommandlist3: IGraphicsCommandList3, using id3d12graphicscommandlist4_vtable: ^IGraphicsCommandList4_VTable, @@ -3608,7 +3657,8 @@ IGraphicsCommandList4_VTable :: struct { } -ITools_UUID :: "7071e1f0-e84b-4b33-974f-12fa49de65c5" +ITools_UUID_STRING :: "7071e1f0-e84b-4b33-974f-12fa49de65c5" +ITools_UUID := &IID{0x7071e1f0, 0xe84b, 0x4b33, {0x97, 0x4f, 0x12, 0xfa, 0x49, 0xde, 0x65, 0xc5}} ITools :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12tools_vtable: ^ITools_VTable, @@ -3632,7 +3682,8 @@ MEMCPY_DEST :: struct { } -IDebug_UUID :: "344488b7-6846-474b-b989-f027448245e0" +IDebug_UUID_STRING :: "344488b7-6846-474b-b989-f027448245e0" +IDebug_UUID := &IID{0x344488b7, 0x6846, 0x474b, {0xb9, 0x89, 0xf0, 0x27, 0x44, 0x82, 0x45, 0xe0}} IDebug :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12debug_vtable: ^IDebug_VTable, @@ -3648,7 +3699,8 @@ GPU_BASED_VALIDATION_FLAGS :: enum u32 { // TODO: make bit_set } -IDebug1_UUID :: "affaa4ca-63fe-4d8e-b8ad-159000af4304" +IDebug1_UUID_STRING :: "affaa4ca-63fe-4d8e-b8ad-159000af4304" +IDebug1_UUID := &IID{0xaffaa4ca, 0x63fe, 0x4d8e, {0xb8, 0xad, 0x15, 0x90, 0x00, 0xaf, 0x43, 0x04}} IDebug1 :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12debug1_vtable: ^IDebug1_VTable, @@ -3672,7 +3724,8 @@ IDebug2_VTable :: struct { } -IDebug3_UUID :: "5cf4e58f-f671-4ff1-a542-3686e3d153d1" +IDebug3_UUID_STRING :: "5cf4e58f-f671-4ff1-a542-3686e3d153d1" +IDebug3_UUID := &IID{0x5cf4e58f, 0xf671, 0x4ff1, {0xa5, 0x42, 0x36, 0x86, 0xe3, 0xd1, 0x53, 0xd1}} IDebug3 :: struct #raw_union { #subtype id3d12debug: IDebug, using id3d12debug3_vtable: ^IDebug3_VTable, @@ -3732,7 +3785,8 @@ DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR :: struct { } -IDebugDevice1_UUID :: "a9b71770-d099-4a65-a698-3dee10020f88" +IDebugDevice1_UUID_STRING :: "a9b71770-d099-4a65-a698-3dee10020f88" +IDebugDevice1_UUID := &IID{0xa9b71770, 0xd099, 0x4a65, {0xa6, 0x98, 0x3d, 0xee, 0x10, 0x02, 0x0f, 0x88}} IDebugDevice1 :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12debugdevice1_vtable: ^IDebugDevice1_VTable, @@ -3745,7 +3799,8 @@ IDebugDevice1_VTable :: struct { } -IDebugDevice_UUID :: "3febd6dd-4973-4787-8194-e45f9e28923e" +IDebugDevice_UUID_STRING :: "3febd6dd-4973-4787-8194-e45f9e28923e" +IDebugDevice_UUID := &IID{0x3febd6dd, 0x4973, 0x4787, {0x81, 0x94, 0xe4, 0x5f, 0x9e, 0x28, 0x92, 0x3e}} IDebugDevice :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12debugdevice_vtable: ^IDebugDevice_VTable, @@ -3758,7 +3813,8 @@ IDebugDevice_VTable :: struct { } -IDebugDevice2_UUID :: "60eccbc1-378d-4df1-894c-f8ac5ce4d7dd" +IDebugDevice2_UUID_STRING :: "60eccbc1-378d-4df1-894c-f8ac5ce4d7dd" +IDebugDevice2_UUID := &IID{0x60eccbc1, 0x378d, 0x4df1, {0x89, 0x4c, 0xf8, 0xac, 0x5c, 0xe4, 0xd7, 0xdd}} IDebugDevice2 :: struct #raw_union { #subtype id3d12debugdevice: IDebugDevice, using id3d12debugdevice2_vtable: ^IDebugDevice2_VTable, @@ -3770,8 +3826,8 @@ IDebugDevice2_VTable :: struct { } - -IDebugCommandQueue_UUID :: "09e0bf36-54ac-484f-8847-4baeeab6053a" +IDebugCommandQueue_UUID_STRING :: "09e0bf36-54ac-484f-8847-4baeeab6053a" +IDebugCommandQueue_UUID := &IID{0x09e0bf36, 0x54ac, 0x484f, {0x88, 0x47, 0x4b, 0xae, 0xea, 0xb6, 0x05, 0x3a}} IDebugCommandQueue :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12debugcommandqueue_vtable: ^IDebugCommandQueue_VTable, From 67689ecb21bc1735871b36fdf1411fbffb02e8fb Mon Sep 17 00:00:00 2001 From: Karl Zylinski Date: Wed, 27 Apr 2022 20:47:05 +0200 Subject: [PATCH 105/245] Typo fix in d3d12.odin --- vendor/directx/d3d12/d3d12.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/directx/d3d12/d3d12.odin b/vendor/directx/d3d12/d3d12.odin index 739606249..9b3ebbe78 100644 --- a/vendor/directx/d3d12/d3d12.odin +++ b/vendor/directx/d3d12/d3d12.odin @@ -3360,7 +3360,7 @@ VERSIONED_DEVICE_REMOVED_EXTENDED_DATA :: struct { } -IDeviceRemovedExtendedDataSettings_UUID_SRING :: "82BC481C-6B9B-4030-AEDB-7EE3D1DF1E63" +IDeviceRemovedExtendedDataSettings_UUID_STRING :: "82BC481C-6B9B-4030-AEDB-7EE3D1DF1E63" IDeviceRemovedExtendedDataSettings_UUID := &IID{0x82BC481C, 0x6B9B, 0x4030, {0xAE, 0xDB, 0x7E, 0xE3, 0xD1, 0xDF, 0x1E, 0x63}} IDeviceRemovedExtendedDataSettings :: struct #raw_union { #subtype iunknown: IUnknown, From 03c921260091d7dd8b7834163ed3fbdaa4cd46e2 Mon Sep 17 00:00:00 2001 From: Karl Zylinski Date: Wed, 27 Apr 2022 22:30:28 +0200 Subject: [PATCH 106/245] Added some additional IID versions of Direct3D 12 UUIDs that I missed during my first pass. All are accounted for now. --- vendor/directx/d3d12/d3d12.odin | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/vendor/directx/d3d12/d3d12.odin b/vendor/directx/d3d12/d3d12.odin index 9b3ebbe78..c61b6cfb5 100644 --- a/vendor/directx/d3d12/d3d12.odin +++ b/vendor/directx/d3d12/d3d12.odin @@ -3846,7 +3846,8 @@ DEBUG_COMMAND_LIST_GPU_BASED_VALIDATION_SETTINGS :: struct { } -IDebugCommandList1_UUID :: "102ca951-311b-4b01-b11f-ecb83e061b37" +IDebugCommandList1_UUID_STRING :: "102ca951-311b-4b01-b11f-ecb83e061b37" +IDebugCommandList1_UUID := &IID{0x102ca951, 0x311b, 0x4b01, {0xb1, 0x1f, 0xec, 0xb8, 0x3e, 0x06, 0x1b, 0x37}} IDebugCommandList1 :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12debugcommandlist1_vtable: ^IDebugCommandList1_VTable, @@ -3859,7 +3860,8 @@ IDebugCommandList1_VTable :: struct { } -IDebugCommandList_UUID :: "09e0bf36-54ac-484f-8847-4baeeab6053f" +IDebugCommandList_UUID_STRING :: "09e0bf36-54ac-484f-8847-4baeeab6053f" +IDebugCommandList_UUID := &IID{0x09e0bf36, 0x54ac, 0x484f, {0x88, 0x47, 0x4b, 0xae, 0xea, 0xb6, 0x05, 0x3f}} IDebugCommandList :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12debugcommandlist_vtable: ^IDebugCommandList_VTable, @@ -3872,7 +3874,8 @@ IDebugCommandList_VTable :: struct { } -IDebugCommandList2_UUID :: "aeb575cf-4e06-48be-ba3b-c450fc96652e" +IDebugCommandList2_UUID_STRING :: "aeb575cf-4e06-48be-ba3b-c450fc96652e" +IDebugCommandList2_UUID := &IID{0xaeb575cf, 0x4e06, 0x48be, {0xba, 0x3b, 0xc4, 0x50, 0xfc, 0x96, 0x65, 0x2e}} IDebugCommandList2 :: struct #raw_union { #subtype id3d12debugcommandlist: IDebugCommandList, using id3d12debugcommandlist2_vtable: ^IDebugCommandList2_VTable, @@ -3884,7 +3887,8 @@ IDebugCommandList2_VTable :: struct { } -ISharingContract_UUID :: "0adf7d52-929c-4e61-addb-ffed30de66ef" +ISharingContract_UUID_STRING :: "0adf7d52-929c-4e61-addb-ffed30de66ef" +ISharingContract_UUID := &IID{0x0adf7d52, 0x929c, 0x4e61, {0xad, 0xdb, 0xff, 0xed, 0x30, 0xde, 0x66, 0xef}} ISharingContract :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12sharingcontract_vtable: ^ISharingContract_VTable, @@ -4789,7 +4793,8 @@ INFO_QUEUE_FILTER :: struct { } -IInfoQueue_UUID :: "0742a90b-c387-483f-b946-30a7e4e61458" +IInfoQueue_UUID_STRING :: "0742a90b-c387-483f-b946-30a7e4e61458" +IInfoQueue_UUID := &IID{0x0742a90b, 0xc387, 0x483f, {0xb9, 0x46, 0x30, 0xa7, 0xe4, 0xe6, 0x14, 0x58}} IInfoQueue :: struct #raw_union { #subtype iunknown: IUnknown, using id3d12infoqueue_vtable: ^IInfoQueue_VTable, @@ -4861,7 +4866,8 @@ SHADING_RATE_COMBINER :: enum i32 { } -IGraphicsCommandList5_UUID :: "55050859-4024-474c-87f5-6472eaee44ea" +IGraphicsCommandList5_UUID_STRING :: "55050859-4024-474c-87f5-6472eaee44ea" +IGraphicsCommandList5_UUID := &IID{0x55050859, 0x4024, 0x474c, {0x87, 0xf5, 0x64, 0x72, 0xea, 0xee, 0x44, 0xea}} IGraphicsCommandList5 :: struct #raw_union { #subtype id3d12graphicscommandlist4: IGraphicsCommandList4, using id3d12graphicscommandlist5_vtable: ^IGraphicsCommandList5_VTable, @@ -4879,7 +4885,8 @@ DISPATCH_MESH_ARGUMENTS :: struct { } -IGraphicsCommandList6_UUID :: "c3827890-e548-4cfa-96cf-5689a9370f80" +IGraphicsCommandList6_UUID_STRING :: "c3827890-e548-4cfa-96cf-5689a9370f80" +IGraphicsCommandList6_UUID := &IID{0xc3827890, 0xe548, 0x4cfa, {0x96, 0xcf, 0x56, 0x89, 0xa9, 0x37, 0x0f, 0x80}} IGraphicsCommandList6 :: struct #raw_union { #subtype id3d12graphicscommandlist5: IGraphicsCommandList5, using id3d12graphicscommandlist6_vtable: ^IGraphicsCommandList6_VTable, From 80878264b63cd8476def629526b294b8e129791a Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 28 Apr 2022 15:29:00 +0200 Subject: [PATCH 107/245] [xml] Speedup. --- core/encoding/xml/debug_print.odin | 18 +- core/encoding/xml/example/xml_example.odin | 77 ++++-- core/encoding/xml/helpers.odin | 28 +-- core/encoding/xml/tokenizer.odin | 11 + core/encoding/xml/xml_reader.odin | 278 +++++++++++---------- tests/core/encoding/xml/test_core_xml.odin | 17 +- 6 files changed, 246 insertions(+), 183 deletions(-) diff --git a/core/encoding/xml/debug_print.odin b/core/encoding/xml/debug_print.odin index e6a8c9433..7c20ac123 100644 --- a/core/encoding/xml/debug_print.odin +++ b/core/encoding/xml/debug_print.odin @@ -1,8 +1,7 @@ -package xml /* An XML 1.0 / 1.1 parser - Copyright 2021 Jeroen van Rijn . + Copyright 2021-2022 Jeroen van Rijn . Made available under Odin's BSD-3 license. A from-scratch XML implementation, loosely modeled on the [spec](https://www.w3.org/TR/2006/REC-xml11-20060816). @@ -10,6 +9,8 @@ package xml List of contributors: Jeroen van Rijn: Initial implementation. */ +package xml + import "core:io" import "core:fmt" @@ -40,17 +41,16 @@ print :: proc(writer: io.Writer, doc: ^Document) -> (written: int, err: io.Error written += wprintf(writer, "[Pre-root comment] %v\n", comment) } - if doc.root != nil { + if len(doc.elements) > 0 { + wprintln(writer, " --- ") + print_element(writer, doc, 0) wprintln(writer, " --- ") - print_element(writer, doc.root) - wprintln(writer, " --- ") } return written, .None } -print_element :: proc(writer: io.Writer, element: ^Element, indent := 0) -> (written: int, err: io.Error) { - if element == nil { return } +print_element :: proc(writer: io.Writer, doc: ^Document, element_id: Element_ID, indent := 0) -> (written: int, err: io.Error) { using fmt tab :: proc(writer: io.Writer, indent: int) { @@ -61,6 +61,8 @@ print_element :: proc(writer: io.Writer, element: ^Element, indent := 0) -> (wri tab(writer, indent) + element := doc.elements[element_id] + if element.kind == .Element { wprintf(writer, "<%v>\n", element.ident) if len(element.value) > 0 { @@ -74,7 +76,7 @@ print_element :: proc(writer: io.Writer, element: ^Element, indent := 0) -> (wri } for child in element.children { - print_element(writer, child, indent + 1) + print_element(writer, doc, child, indent + 1) } } else if element.kind == .Comment { wprintf(writer, "[COMMENT] %v\n", element.value) diff --git a/core/encoding/xml/example/xml_example.odin b/core/encoding/xml/example/xml_example.odin index daa3c5dab..cadfcfb43 100644 --- a/core/encoding/xml/example/xml_example.odin +++ b/core/encoding/xml/example/xml_example.odin @@ -1,52 +1,85 @@ package xml_example import "core:encoding/xml" -import "core:os" import "core:mem" import "core:fmt" import "core:time" import "core:strings" import "core:hash" +N :: 1 + example :: proc() { using fmt - doc: ^xml.Document - err: xml.Error + docs: [N]^xml.Document + errs: [N]xml.Error + times: [N]time.Duration + + defer for round in 0..` tag.") - os.exit(1) + eprintln("Could not locate top-level `` tag.") + return } - printf("Found `` with %v children.\n", len(charlist.children)) + printf("Found `` with %v children, %v elements total\n", len(docs[0].elements[charlist].children), docs[0].element_count) - crc32 := doc_hash(doc) + crc32 := doc_hash(docs[0]) printf("[%v] CRC32: 0x%08x\n", "🎉" if crc32 == 0xcaa042b9 else "🤬", crc32) + + for round in 0.. (crc32: u32) { diff --git a/core/encoding/xml/helpers.odin b/core/encoding/xml/helpers.odin index 14597ddbd..48f058334 100644 --- a/core/encoding/xml/helpers.odin +++ b/core/encoding/xml/helpers.odin @@ -1,22 +1,20 @@ -package xml /* An XML 1.0 / 1.1 parser - Copyright 2021 Jeroen van Rijn . + Copyright 2021-2022 Jeroen van Rijn . Made available under Odin's BSD-3 license. This file contains helper functions. */ +package xml - -/* - Find `tag`'s nth child with a given ident. -*/ -find_child_by_ident :: proc(tag: ^Element, ident: string, nth := 0) -> (res: ^Element, found: bool) { - if tag == nil { return nil, false } +// Find parent's nth child with a given ident. +find_child_by_ident :: proc(doc: ^Document, parent_id: Element_ID, ident: string, nth := 0) -> (res: Element_ID, found: bool) { + tag := doc.elements[parent_id] count := 0 - for child in tag.children { + for child_id in tag.children { + child := doc.elements[child_id] /* Skip commments. They have no name. */ @@ -26,18 +24,16 @@ find_child_by_ident :: proc(tag: ^Element, ident: string, nth := 0) -> (res: ^El If the ident matches and it's the nth such child, return it. */ if child.ident == ident { - if count == nth { return child, true } + if count == nth { return child_id, true } count += 1 } } - return nil, false + return 0, false } -/* - Find an attribute by key. -*/ -find_attribute_val_by_key :: proc(tag: ^Element, key: string) -> (val: string, found: bool) { - if tag == nil { return "", false } +// Find an attribute by key. +find_attribute_val_by_key :: proc(doc: ^Document, parent_id: Element_ID, key: string) -> (val: string, found: bool) { + tag := doc.elements[parent_id] for attr in tag.attribs { /* diff --git a/core/encoding/xml/tokenizer.odin b/core/encoding/xml/tokenizer.odin index 2da3b7683..c3fece76e 100644 --- a/core/encoding/xml/tokenizer.odin +++ b/core/encoding/xml/tokenizer.odin @@ -1,3 +1,14 @@ +/* + An XML 1.0 / 1.1 parser + + Copyright 2021-2022 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + A from-scratch XML implementation, loosely modeled on the [spec](https://www.w3.org/TR/2006/REC-xml11-20060816). + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ package xml import "core:fmt" diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 0315b0e05..636dd0ae4 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -1,8 +1,7 @@ -package xml /* An XML 1.0 / 1.1 parser - Copyright 2021 Jeroen van Rijn . + Copyright 2021-2022 Jeroen van Rijn . Made available under Odin's BSD-3 license. A from-scratch XML implementation, loosely modelled on the [spec](https://www.w3.org/TR/2006/REC-xml11-20060816). @@ -25,12 +24,17 @@ package xml List of contributors: Jeroen van Rijn: Initial implementation. */ +package xml +// An XML 1.0 / 1.1 parser import "core:bytes" -import "core:strings" import "core:encoding/entity" +import "core:intrinsics" import "core:mem" import "core:os" +import "core:strings" + +likely :: intrinsics.expect DEFAULT_Options :: Options{ flags = { @@ -88,7 +92,9 @@ Option_Flag :: enum { Option_Flags :: bit_set[Option_Flag; u16] Document :: struct { - root: ^Element, + elements: [dynamic]Element, + element_count: Element_ID, + prolog: Attributes, encoding: Encoding, @@ -129,8 +135,8 @@ Element :: struct { Comment, }, - parent: ^Element, - children: [dynamic]^Element, + parent: Element_ID, + children: [dynamic]Element_ID, } Attr :: struct { @@ -185,7 +191,7 @@ Error :: enum { No_DocType, Too_Many_DocTypes, - DocType_Must_Proceed_Elements, + DocType_Must_Preceed_Elements, /* If a DOCTYPE is present _or_ the caller @@ -237,12 +243,16 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err doc.tokenizer = t doc.input = data + doc.elements = make([dynamic]Element, 1024, 1024, allocator) + // strings.intern_init(&doc.intern, allocator, allocator) err = .Unexpected_Token - element, parent: ^Element + element, parent: Element_ID - tag_is_open := false + tag_is_open := false + first_element := true + open: Token /* If a DOCTYPE is present, the root tag has to match. @@ -252,6 +262,7 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err loop: for { skip_whitespace(t) + // NOTE(Jeroen): This is faster as a switch. switch t.ch { case '<': /* @@ -259,35 +270,85 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err */ advance_rune(t) - open := scan(t) - #partial switch open.kind { - - case .Question: + open = scan(t) + // NOTE(Jeroen): We're not using a switch because this if-else chain ordered by likelihood is 2.5% faster at -o:size and -o:speed. + if likely(open.kind, Token_Kind.Ident) == .Ident { /* - 0 { - /* - We've already seen a prolog. - */ - return doc, .Too_Many_Prologs - } else { - /* - Could be ` 0 && expected_doctype != open.text { + error(t, t.offset, "Root Tag doesn't match DOCTYPE. Expected: %v, got: %v\n", expected_doctype, open.text) + return doc, .Invalid_DocType } + } + + /* + One of these should follow: + - `>`, which means we've just opened this tag and expect a later element to close it. + - `/>`, which means this is an 'empty' or self-closing tag. + */ + end_token := scan(t) + #partial switch end_token.kind { + case .Gt: + /* + We're now the new parent. + */ + parent = element + + case .Slash: + /* + Empty tag. Close it. + */ + expect(t, .Gt) or_return + parent = doc.elements[element].parent + element = parent + tag_is_open = false + case: - error(t, t.offset, "Expected \" 0 { return doc, .Too_Many_DocTypes } - if doc.root != nil { - return doc, .DocType_Must_Proceed_Elements + if doc.element_count > 0 { + return doc, .DocType_Must_Preceed_Elements } parse_doctype(doc) or_return @@ -327,14 +388,14 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err comment := scan_comment(t) or_return if .Intern_Comments in opts.flags { - if doc.root == nil { + if len(doc.elements) == 0 { append(&doc.comments, comment) } else { - el := new(Element) - el.parent = element - el.kind = .Comment - el.value = comment - append(&element.children, el) + el := new_element(doc) + doc.elements[el].parent = element + doc.elements[el].kind = .Comment + doc.elements[el].value = comment + append(&doc.elements[element].children, el) } } @@ -343,83 +404,32 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err return } - case .Ident: + } else if open.kind == .Question { /* - e.g. 0 && expected_doctype != open.text { - error(t, t.offset, "Root Tag doesn't match DOCTYPE. Expected: %v, got: %v\n", expected_doctype, open.text) - return doc, .Invalid_DocType + next := scan(t) + #partial switch next.kind { + case .Ident: + if len(next.text) == 3 && strings.to_lower(next.text, context.temp_allocator) == "xml" { + parse_prolog(doc) or_return + } else if len(doc.prolog) > 0 { + /* + We've already seen a prolog. + */ + return doc, .Too_Many_Prologs + } else { + /* + Could be ``, which means we've just opened this tag and expect a later element to close it. - - `/>`, which means this is an 'empty' or self-closing tag. - */ - end_token := scan(t) - #partial switch end_token.kind { - case .Gt: - /* - We're now the new parent. - */ - parent = element - - case .Slash: - /* - Empty tag. Close it. - */ - expect(t, .Gt) or_return - parent = element.parent - element = parent - tag_is_open = false - case: - error(t, t.offset, "Expected close tag, got: %#v\n", end_token) + error(t, t.offset, "Expected \" (err: Error) { */ doc.doctype.rest = string(t.src[offset : t.offset - 1]) return .None +} + +Element_ID :: u32 + +new_element :: proc(doc: ^Document) -> (id: Element_ID) { + element_space := len(doc.elements) + + // Need to resize + if int(doc.element_count) + 1 > element_space { + if element_space < 65536 { + element_space *= 2 + } else { + element_space += 65536 + } + resize(&doc.elements, element_space) + } + + cur := doc.element_count + doc.element_count += 1 + + return cur } \ No newline at end of file diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index 7669afe97..82386b2bb 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -224,7 +224,7 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) { written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident) if len(doc.doctype.rest) > 0 { - wprintf(writer, "\t%v\n", doc.doctype.rest) + wprintf(writer, "\t%v\n", doc.doctype.rest) } } @@ -232,17 +232,16 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) { written += wprintf(writer, "[Pre-root comment] %v\n", comment) } - if doc.root != nil { - wprintln(writer, " --- ") - print_element(writer, doc.root) - wprintln(writer, " --- ") + if doc.element_count > 0 { + wprintln(writer, " --- ") + print_element(writer, doc, 0) + wprintln(writer, " --- ") } return written, .None } - print_element :: proc(writer: io.Writer, element: ^xml.Element, indent := 0) -> (written: int, err: io.Error) { - if element == nil { return } + print_element :: proc(writer: io.Writer, doc: ^xml.Document, element_id: xml.Element_ID, indent := 0) -> (written: int, err: io.Error) { using fmt tab :: proc(writer: io.Writer, indent: int) { @@ -253,6 +252,8 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) { tab(writer, indent) + element := doc.elements[element_id] + if element.kind == .Element { wprintf(writer, "<%v>\n", element.ident) if len(element.value) > 0 { @@ -266,7 +267,7 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) { } for child in element.children { - print_element(writer, child, indent + 1) + print_element(writer, doc, child, indent + 1) } } else if element.kind == .Comment { wprintf(writer, "[COMMENT] %v\n", element.value) From 127b0ba65e473ae54fe514ea3e695959cefc3b68 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 28 Apr 2022 15:46:36 +0200 Subject: [PATCH 108/245] [xml] Enable tests. --- tests/core/build.bat | 16 +++++++++------- tests/core/encoding/xml/test_core_xml.odin | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/tests/core/build.bat b/tests/core/build.bat index b03fef4bb..8e4ba1d15 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -1,5 +1,6 @@ @echo off -set COMMON=-show-timings -no-bounds-check -vet -strict-style -collection:tests=.. +set COMMON=-no-bounds-check -vet -strict-style +set COLLECTION=-collection:tests=.. set PATH_TO_ODIN==..\..\odin python3 download_assets.py echo --- @@ -35,9 +36,10 @@ echo --- echo --- echo Running core:encoding tests echo --- -%PATH_TO_ODIN% run encoding/hxa %COMMON% -out:test_hxa.exe -%PATH_TO_ODIN% run encoding/json %COMMON% -out:test_json.exe +%PATH_TO_ODIN% run encoding/hxa %COMMON% %COLLECTION% -out:test_hxa.exe +%PATH_TO_ODIN% run encoding/json %COMMON% -out:test_json.exe %PATH_TO_ODIN% run encoding/varint %COMMON% -out:test_varint.exe +%PATH_TO_ODIN% run encoding/xml %COMMON% -out:test_xml.exe echo --- echo Running core:math/noise tests @@ -47,19 +49,19 @@ echo --- echo --- echo Running core:math tests echo --- -%PATH_TO_ODIN% run math %COMMON% -out:test_core_math.exe +%PATH_TO_ODIN% run math %COMMON% %COLLECTION% -out:test_core_math.exe echo --- echo Running core:math/linalg/glsl tests echo --- -%PATH_TO_ODIN% run math/linalg/glsl %COMMON% -out:test_linalg_glsl.exe +%PATH_TO_ODIN% run math/linalg/glsl %COMMON% %COLLECTION% -out:test_linalg_glsl.exe echo --- echo Running core:path/filepath tests echo --- -%PATH_TO_ODIN% run path/filepath %COMMON% -out:test_core_filepath.exe +%PATH_TO_ODIN% run path/filepath %COMMON% %COLLECTION% -out:test_core_filepath.exe echo --- echo Running core:reflect tests echo --- -%PATH_TO_ODIN% run reflect %COMMON% -out:test_core_reflect.exe \ No newline at end of file +%PATH_TO_ODIN% run reflect %COMMON% %COLLECTION% -out:test_core_reflect.exe \ No newline at end of file diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index 82386b2bb..a79c939c8 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -168,6 +168,21 @@ TESTS :: []TEST{ err = .Invalid_DocType, crc32 = 0x49b83d0a, }, + + /* + Parse the 8.2 MiB unicode.xml for good measure. + */ + { + filename = "unicode.xml", + options = { + flags = { + .Ignore_Unsupported, + }, + expected_doctype = "", + }, + err = .None, + crc32 = 0xcaa042b9, + }, } when ODIN_TEST { From a1002e69606cf1d60a5936ddd8ab9d069b5d499b Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 28 Apr 2022 17:46:36 +0200 Subject: [PATCH 109/245] Fix -error-pos-style:unix --- src/main.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 7b0364149..c9e908f11 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -630,6 +630,7 @@ enum BuildFlagKind { BuildFlag_IgnoreWarnings, BuildFlag_WarningsAsErrors, BuildFlag_VerboseErrors, + BuildFlag_ErrorPosStyle, // internal use only BuildFlag_InternalIgnoreLazy, @@ -793,6 +794,7 @@ bool parse_build_flags(Array args) { add_flag(&build_flags, BuildFlag_IgnoreWarnings, str_lit("ignore-warnings"), BuildFlagParam_None, Command_all); add_flag(&build_flags, BuildFlag_WarningsAsErrors, str_lit("warnings-as-errors"), BuildFlagParam_None, Command_all); add_flag(&build_flags, BuildFlag_VerboseErrors, str_lit("verbose-errors"), BuildFlagParam_None, Command_all); + add_flag(&build_flags, BuildFlag_ErrorPosStyle, str_lit("error-pos-style"), BuildFlagParam_String, Command_all); add_flag(&build_flags, BuildFlag_InternalIgnoreLazy, str_lit("internal-ignore-lazy"), BuildFlagParam_None, Command_all); @@ -1472,6 +1474,15 @@ bool parse_build_flags(Array args) { case BuildFlag_VerboseErrors: build_context.show_error_line = true; break; + + case BuildFlag_ErrorPosStyle: + GB_ASSERT(value.kind == ExactValue_String); + build_context.ODIN_ERROR_POS_STYLE = ErrorPosStyle_Default; + if (value.value_string == "unix" || value.value_string == "UNIX") { + build_context.ODIN_ERROR_POS_STYLE = ErrorPosStyle_Unix; + } + break; + case BuildFlag_InternalIgnoreLazy: build_context.ignore_lazy = true; break; From 1ed84a064bd0d64ba4deba56d5a2704350866d1f Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 28 Apr 2022 18:12:55 +0200 Subject: [PATCH 110/245] Make -error-pos-style case-insensitive. --- src/main.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c9e908f11..ff7bb9f67 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1477,9 +1477,14 @@ bool parse_build_flags(Array args) { case BuildFlag_ErrorPosStyle: GB_ASSERT(value.kind == ExactValue_String); - build_context.ODIN_ERROR_POS_STYLE = ErrorPosStyle_Default; - if (value.value_string == "unix" || value.value_string == "UNIX") { + + if (str_eq_ignore_case(value.value_string, str_lit("odin"))) { + build_context.ODIN_ERROR_POS_STYLE = ErrorPosStyle_Default; + } else if (str_eq_ignore_case(value.value_string, str_lit("unix"))) { build_context.ODIN_ERROR_POS_STYLE = ErrorPosStyle_Unix; + } else { + gb_printf_err("-error-pos-style options are 'unix' and 'odin'\n"); + bad_flags = true; } break; From e53ba3b11612db5c52ecf9b523e4d0ed87f7b1ad Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 28 Apr 2022 18:18:25 +0200 Subject: [PATCH 111/245] Allow -error-pos-style:default as an alias for odin --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index ff7bb9f67..818a783e1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1478,12 +1478,12 @@ bool parse_build_flags(Array args) { case BuildFlag_ErrorPosStyle: GB_ASSERT(value.kind == ExactValue_String); - if (str_eq_ignore_case(value.value_string, str_lit("odin"))) { + if (str_eq_ignore_case(value.value_string, str_lit("odin")) || str_eq_ignore_case(value.value_string, str_lit("default"))) { build_context.ODIN_ERROR_POS_STYLE = ErrorPosStyle_Default; } else if (str_eq_ignore_case(value.value_string, str_lit("unix"))) { build_context.ODIN_ERROR_POS_STYLE = ErrorPosStyle_Unix; } else { - gb_printf_err("-error-pos-style options are 'unix' and 'odin'\n"); + gb_printf_err("-error-pos-style options are 'unix', 'odin' and 'default' (odin)\n"); bad_flags = true; } break; From 2fae6eda2321881ccf8d942e2c27e6a7c29aebfd Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 28 Apr 2022 18:58:49 +0200 Subject: [PATCH 112/245] [i18n] Initial i18n support. - Add initial GetText .MO parser - Add translation struct and helpers - Pluralized lookup TODO: - Support for more translation catalog file formats. --- core/i18n/example/i18n_example.odin | 64 +++++++++++ core/i18n/example/messages.pot | 30 +++++ core/i18n/example/nl_NL.mo | Bin 0 -> 672 bytes core/i18n/example/nl_NL.po | 33 ++++++ core/i18n/gettext.odin | 163 ++++++++++++++++++++++++++++ core/i18n/i18n.odin | 116 ++++++++++++++++++++ 6 files changed, 406 insertions(+) create mode 100644 core/i18n/example/i18n_example.odin create mode 100644 core/i18n/example/messages.pot create mode 100644 core/i18n/example/nl_NL.mo create mode 100644 core/i18n/example/nl_NL.po create mode 100644 core/i18n/gettext.odin create mode 100644 core/i18n/i18n.odin diff --git a/core/i18n/example/i18n_example.odin b/core/i18n/example/i18n_example.odin new file mode 100644 index 000000000..f9fb2a353 --- /dev/null +++ b/core/i18n/example/i18n_example.odin @@ -0,0 +1,64 @@ +package i18n_example + +import "core:mem" +import "core:fmt" +import "core:i18n" + +LOC :: i18n.get + +_main :: proc() { + using fmt + + err: i18n.Error + + /* + Parse MO file and set it as the active translation so we can omit `get`'s "catalog" parameter. + */ + i18n.ACTIVE, err = i18n.parse_mo(#load("nl_NL.mo")) + defer i18n.destroy() + + if err != .None { return } + + /* + These are in the .MO catalog. + */ + println("-----") + println(LOC("")) + println("-----") + println(LOC("There are 69,105 leaves here.")) + println("-----") + println(LOC("Hellope, World!")) + + /* + For ease of use, pluralized lookup can use both singular and plural form as key for the same translation. + */ + println("-----") + printf(LOC("There is %d leaf.\n", 1), 1) + printf(LOC("There is %d leaf.\n", 42), 42) + + printf(LOC("There are %d leaves.\n", 1), 1) + printf(LOC("There are %d leaves.\n", 42), 42) + + /* + This isn't. + */ + println("-----") + println(LOC("Come visit us on Discord!")) +} + +main :: proc() { + using fmt + + track: mem.Tracking_Allocator + mem.tracking_allocator_init(&track, context.allocator) + context.allocator = mem.tracking_allocator(&track) + + _main() + + if len(track.allocation_map) > 0 { + println() + for _, v in track.allocation_map { + printf("%v Leaked %v bytes.\n", v.location, v.size) + } + } +} \ No newline at end of file diff --git a/core/i18n/example/messages.pot b/core/i18n/example/messages.pot new file mode 100644 index 000000000..53d521b6b --- /dev/null +++ b/core/i18n/example/messages.pot @@ -0,0 +1,30 @@ +# Odin i18n Example +# Copyright (C) 2021 Jeroen van Rijn +# This file is distributed under the same license as the PACKAGE package. +# Jeroen van Rijn , 2021. +# +#, fuzzy +msgid "" +msgstr "Project-Id-Version: Example 0.0.1\n" + "Report-Msgid-Bugs-To: Jeroen van Rijn \n" + "POT-Creation-Date: 2021-11-27 19:23+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME \n" + "Language: en-GB\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +#: i18n_example.odin:28 +msgid "There are 69,105 leaves here." +msgstr "Er zijn hier 69.105 bladeren." + +#: i18n_example.odin:30 +msgid "Hellope, World!" +msgstr "Hallo, Wereld!" + +#: i18n_example.odin:36 +msgid "There is %d leaf.\n" +msgid_plural "There are %d leaves.\n" +msgstr[0] "Er is %d blad.\n" +msgstr[1] "Er zijn %d bladeren.\n" \ No newline at end of file diff --git a/core/i18n/example/nl_NL.mo b/core/i18n/example/nl_NL.mo new file mode 100644 index 0000000000000000000000000000000000000000..0b1a668f4d225e8695e479d6135779288870ac39 GIT binary patch literal 672 zcmZ9J&u$Yj5XKiM7au_44AS&asfgO_2DJ*Crb0kU3ki*)<+lpj3*#GPkbdF5#NYS;wSO_ zR+9Xp^&T;~-RZ})ZqWIHR+5uDL<~A!zL6ZD*0#Yd_+*_f*OOw24nYz-&$qI48#Kxl zdWdQ9S5+Q1$|#%&_D@5XqhiWVojt`x;D;suh|Vi(au}V-y3q)!NJYkG*jN|%#8;~1 zFWbuV!shT6okasHX<(*K4eY){t!iq2(R#W^80)an=b}f6x^+_Xed}tUgJ~|0e%Kp8w;gU8SRX?6cyK)hmFX|<$1FLJ r#*sB9{CC6VbdO literal 0 HcmV?d00001 diff --git a/core/i18n/example/nl_NL.po b/core/i18n/example/nl_NL.po new file mode 100644 index 000000000..1b8acbcc1 --- /dev/null +++ b/core/i18n/example/nl_NL.po @@ -0,0 +1,33 @@ +# Odin i18n Example +# Copyright (C) 2021 Jeroen van Rijn +# This file is distributed under the same license as the PACKAGE package. +# Jeroen van Rijn , 2021. +# +msgid "" +msgstr "" +"Project-Id-Version: Example 0.0.1\n" +"Report-Msgid-Bugs-To: Jeroen van Rijn \n" +"POT-Creation-Date: 2021-11-27 19:23+0100\n" +"PO-Revision-Date: 2021-11-28 02:56+0100\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language-Team: Odin Language Team\n" +"X-Generator: Poedit 3.0\n" +"Last-Translator: Jeroen van Rijn\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: nl_NL\n" + +#: i18n_example.odin:28 +msgid "There are 69,105 leaves here." +msgstr "Er zijn hier 69.105 bladeren." + +#: i18n_example.odin:30 +msgid "Hellope, World!" +msgstr "Hallo, Wereld!" + +#: i18n_example.odin:36 +msgid "There is %d leaf.\n" +msgid_plural "There are %d leaves.\n" +msgstr[0] "Er is %d blad.\n" +msgstr[1] "Er zijn %d bladeren.\n" diff --git a/core/i18n/gettext.odin b/core/i18n/gettext.odin new file mode 100644 index 000000000..7918e217e --- /dev/null +++ b/core/i18n/gettext.odin @@ -0,0 +1,163 @@ +package i18n +/* + A parser for GNU GetText .MO files. + + Copyright 2021 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + A from-scratch implementation based after the specification found here: + https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ +import "core:os" +import "core:strings" +import "core:bytes" + +parse_mo_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { + context.allocator = allocator + /* + An MO file should have at least a 4-byte magic, 2 x 2 byte version info, + a 4-byte number of strings value, and 2 x 4-byte offsets. + */ + if len(data) < 20 { + return {}, .MO_File_Invalid + } + + /* + Check magic. Should be 0x950412de in native Endianness. + */ + native := true + magic := read_u32(data, native) or_return + + if magic != 0x950412de { + native = false + magic = read_u32(data, native) or_return + + if magic != 0x950412de { return {}, .MO_File_Invalid_Signature } + } + + /* + We can ignore version_minor at offset 6. + */ + version_major := read_u16(data[4:]) or_return + if version_major > 1 { return {}, .MO_File_Unsupported_Version } + + count := read_u32(data[ 8:]) or_return + original_offset := read_u32(data[12:]) or_return + translated_offset := read_u32(data[16:]) or_return + + if count == 0 { return {}, .Empty_Translation_Catalog } + + /* + Initalize Translation, interner and optional pluralizer. + */ + translation = new(Translation) + translation.pluralize = pluralizer + strings.intern_init(&translation.intern, allocator, allocator) + + for n := u32(0); n < count; n += 1 { + /* + Grab string's original length and offset. + */ + offset := original_offset + 8 * n + if len(data) < int(offset + 8) { return translation, .MO_File_Invalid } + + o_length := read_u32(data[offset :], native) or_return + o_offset := read_u32(data[offset + 4:], native) or_return + + offset = translated_offset + 8 * n + if len(data) < int(offset + 8) { return translation, .MO_File_Invalid } + + t_length := read_u32(data[offset :], native) or_return + t_offset := read_u32(data[offset + 4:], native) or_return + + max_offset := int(max(o_offset + o_length + 1, t_offset + t_length + 1)) + if len(data) < max_offset { return translation, .Premature_EOF } + + key := data[o_offset:][:o_length] + val := data[t_offset:][:t_length] + + /* + Could be a pluralized string. + */ + zero := []byte{0} + + keys := bytes.split(key, zero) + vals := bytes.split(val, zero) + + if len(keys) != len(vals) || max(len(keys), len(vals)) > MAX_PLURALS { + return translation, .MO_File_Incorrect_Plural_Count + } + + for k in keys { + interned_key := strings.intern_get(&translation.intern, string(k)) + + interned_vals: [MAX_PLURALS]string = {} + last_val: string + + i := 0 + for v in vals { + interned_vals[i] = strings.intern_get(&translation.intern, string(v)) + last_val = interned_vals[i] + i += 1 + } + for ; i < MAX_PLURALS; i += 1 { + interned_vals[i] = last_val + } + translation.k_v[interned_key] = interned_vals + } + delete(vals) + delete(keys) + } + return +} + +parse_mo_file :: proc(filename: string, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { + context.allocator = allocator + + data, data_ok := os.read_entire_file(filename) + defer delete(data) + + if !data_ok { return {}, .File_Error } + + return parse_mo_from_slice(data, pluralizer) +} + +parse_mo :: proc { parse_mo_file, parse_mo_from_slice } + +/* + Helpers. +*/ +read_u32 :: proc(data: []u8, native_endian := true) -> (res: u32, err: Error) { + if len(data) < size_of(u32) { return 0, .Premature_EOF } + + val := (^u32)(raw_data(data))^ + + if native_endian { + return val, .None + } else { + when ODIN_ENDIAN == .Little { + return u32(transmute(u32be)val), .None + } else { + return u32(transmute(u32le)val), .None + } + } +} + +read_u16 :: proc(data: []u8, native_endian := true) -> (res: u16, err: Error) { + if len(data) < size_of(u16) { return 0, .Premature_EOF } + + val := (^u16)(raw_data(data))^ + + if native_endian { + return val, .None + } else { + when ODIN_ENDIAN == .Little { + return u16(transmute(u16be)val), .None + } else { + return u16(transmute(u16le)val), .None + } + } +} \ No newline at end of file diff --git a/core/i18n/i18n.odin b/core/i18n/i18n.odin new file mode 100644 index 000000000..7c72f9858 --- /dev/null +++ b/core/i18n/i18n.odin @@ -0,0 +1,116 @@ +package i18n +/* + Internationalization helpers. + + Copyright 2021 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ +import "core:strings" + +/* + TODO: + - Support for more translation catalog file formats. +*/ + +MAX_PLURALS :: 10 + +/* + Currently active catalog. +*/ +ACTIVE: ^Translation + +/* + The main data structure. This can be generated from various different file formats, as long as we have a parser for them. +*/ +Translation :: struct { + k_v: map[string][MAX_PLURALS]string, + intern: strings.Intern, + + pluralize: proc(number: int) -> int, +} + +Error :: enum { + /* + General return values. + */ + None = 0, + Empty_Translation_Catalog, + + /* + Couldn't find, open or read file. + */ + File_Error, + + /* + File too short. + */ + Premature_EOF, + + /* + GNU Gettext *.MO file errors. + */ + MO_File_Invalid_Signature, + MO_File_Unsupported_Version, + MO_File_Invalid, + MO_File_Incorrect_Plural_Count, +} + +/* + Several ways to use: + - get(key), which defaults to the singular form and i18n.ACTIVE catalog, or + - get(key, number), which returns the appropriate plural from the active catalog, or + - get(key, number, catalog) to grab text from a specific one. +*/ +get :: proc(key: string, number := 0, catalog: ^Translation = ACTIVE) -> (value: string) { + /* + A lot of languages use singular for 1 item and plural for 0 or more than 1 items. This is our default pluralize rule. + */ + plural := 1 if number != 1 else 0 + + if catalog.pluralize != nil { + plural = catalog.pluralize(number) + } + return get_by_slot(key, plural, catalog) +} + +/* + Several ways to use: + - get_by_slot(key), which defaults to the singular form and i18n.ACTIVE catalog, or + - get_by_slot(key, slot), which returns the requested plural from the active catalog, or + - get_by_slot(key, slot, catalog) to grab text from a specific one. + + If a file format parser doesn't (yet) support plural slots, each of the slots will point at the same string. +*/ +get_by_slot :: proc(key: string, slot := 0, catalog: ^Translation = ACTIVE) -> (value: string) { + if catalog == nil { + /* + Return the key if the catalog catalog hasn't been initialized yet. + */ + return key + } + + /* + Return the translation from the requested slot if this key is known, else return the key. + */ + if translations, ok := catalog.k_v[key]; ok { + plural := min(max(0, slot), MAX_PLURALS - 1) + return translations[plural] + } + return key +} + +/* + Same for destroy: + - destroy(), to clean up the currently active catalog catalog i18n.ACTIVE + - destroy(catalog), to clean up a specific catalog. +*/ +destroy :: proc(catalog: ^Translation = ACTIVE) { + if catalog != nil { + strings.intern_destroy(&catalog.intern) + delete(catalog.k_v) + free(catalog) + } +} \ No newline at end of file From ba23bfb7b9eb32eb9bcf22b0364a25b6ae32203e Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Thu, 28 Apr 2022 20:12:32 +0200 Subject: [PATCH 113/245] [i18n] Allow multiple sections. --- core/i18n/gettext.odin | 11 ++++---- core/i18n/i18n.odin | 57 +++++++++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/core/i18n/gettext.odin b/core/i18n/gettext.odin index 7918e217e..70c922cfb 100644 --- a/core/i18n/gettext.odin +++ b/core/i18n/gettext.odin @@ -57,6 +57,10 @@ parse_mo_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allo translation.pluralize = pluralizer strings.intern_init(&translation.intern, allocator, allocator) + // Gettext MO files only have one section. + translation.k_v[""] = {} + section := &translation.k_v[""] + for n := u32(0); n < count; n += 1 { /* Grab string's original length and offset. @@ -94,7 +98,7 @@ parse_mo_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allo for k in keys { interned_key := strings.intern_get(&translation.intern, string(k)) - interned_vals: [MAX_PLURALS]string = {} + interned_vals := make([]string, len(keys)) last_val: string i := 0 @@ -103,10 +107,7 @@ parse_mo_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allo last_val = interned_vals[i] i += 1 } - for ; i < MAX_PLURALS; i += 1 { - interned_vals[i] = last_val - } - translation.k_v[interned_key] = interned_vals + section[interned_key] = interned_vals } delete(vals) delete(keys) diff --git a/core/i18n/i18n.odin b/core/i18n/i18n.odin index 7c72f9858..1ee19c2b4 100644 --- a/core/i18n/i18n.odin +++ b/core/i18n/i18n.odin @@ -15,18 +15,19 @@ import "core:strings" - Support for more translation catalog file formats. */ -MAX_PLURALS :: 10 - /* Currently active catalog. */ ACTIVE: ^Translation +// Allow between 1 and 255 plural forms. Default: 10. +MAX_PLURALS :: min(max(#config(ODIN_i18N_MAX_PLURAL_FORMS, 10), 1), 255) + /* The main data structure. This can be generated from various different file formats, as long as we have a parser for them. */ Translation :: struct { - k_v: map[string][MAX_PLURALS]string, + k_v: map[string]map[string][]string, intern: strings.Intern, pluralize: proc(number: int) -> int, @@ -64,7 +65,7 @@ Error :: enum { - get(key, number), which returns the appropriate plural from the active catalog, or - get(key, number, catalog) to grab text from a specific one. */ -get :: proc(key: string, number := 0, catalog: ^Translation = ACTIVE) -> (value: string) { +get_single_section :: proc(key: string, number := 0, catalog: ^Translation = ACTIVE) -> (value: string) { /* A lot of languages use singular for 1 item and plural for 0 or more than 1 items. This is our default pluralize rule. */ @@ -76,6 +77,25 @@ get :: proc(key: string, number := 0, catalog: ^Translation = ACTIVE) -> (value: return get_by_slot(key, plural, catalog) } +/* + Several ways to use: + - get(section, key), which defaults to the singular form and i18n.ACTIVE catalog, or + - get(section, key, number), which returns the appropriate plural from the active catalog, or + - get(section, key, number, catalog) to grab text from a specific one. +*/ +get_by_section :: proc(section, key: string, number := 0, catalog: ^Translation = ACTIVE) -> (value: string) { + /* + A lot of languages use singular for 1 item and plural for 0 or more than 1 items. This is our default pluralize rule. + */ + plural := 1 if number != 1 else 0 + + if catalog.pluralize != nil { + plural = catalog.pluralize(number) + } + return get_by_slot(key, plural, catalog) +} +get :: proc{get_single_section, get_by_section} + /* Several ways to use: - get_by_slot(key), which defaults to the singular form and i18n.ACTIVE catalog, or @@ -84,10 +104,22 @@ get :: proc(key: string, number := 0, catalog: ^Translation = ACTIVE) -> (value: If a file format parser doesn't (yet) support plural slots, each of the slots will point at the same string. */ -get_by_slot :: proc(key: string, slot := 0, catalog: ^Translation = ACTIVE) -> (value: string) { - if catalog == nil { +get_by_slot_single_section :: proc(key: string, slot := 0, catalog: ^Translation = ACTIVE) -> (value: string) { + return get_by_slot_by_section("", key, slot, catalog) +} + +/* + Several ways to use: + - get_by_slot(key), which defaults to the singular form and i18n.ACTIVE catalog, or + - get_by_slot(key, slot), which returns the requested plural from the active catalog, or + - get_by_slot(key, slot, catalog) to grab text from a specific one. + + If a file format parser doesn't (yet) support plural slots, each of the slots will point at the same string. +*/ +get_by_slot_by_section :: proc(section, key: string, slot := 0, catalog: ^Translation = ACTIVE) -> (value: string) { + if catalog == nil || section not_in catalog.k_v { /* - Return the key if the catalog catalog hasn't been initialized yet. + Return the key if the catalog catalog hasn't been initialized yet, or the section is not present. */ return key } @@ -95,12 +127,13 @@ get_by_slot :: proc(key: string, slot := 0, catalog: ^Translation = ACTIVE) -> ( /* Return the translation from the requested slot if this key is known, else return the key. */ - if translations, ok := catalog.k_v[key]; ok { - plural := min(max(0, slot), MAX_PLURALS - 1) + if translations, ok := catalog.k_v[section][key]; ok { + plural := min(max(0, slot), len(catalog.k_v[section][key]) - 1) return translations[plural] } return key } +get_by_slot :: proc{get_by_slot_single_section, get_by_slot_by_section} /* Same for destroy: @@ -110,6 +143,12 @@ get_by_slot :: proc(key: string, slot := 0, catalog: ^Translation = ACTIVE) -> ( destroy :: proc(catalog: ^Translation = ACTIVE) { if catalog != nil { strings.intern_destroy(&catalog.intern) + for section in &catalog.k_v { + for key in &catalog.k_v[section] { + delete(catalog.k_v[section][key]) + } + delete(catalog.k_v[section]) + } delete(catalog.k_v) free(catalog) } From 1289c96e2cf9fdcdb9c4fb4988f73c0e319fb329 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 00:29:55 +0200 Subject: [PATCH 114/245] [i18n] QT Linguist TS reader. --- core/encoding/xml/xml_reader.odin | 1 - core/i18n/example/i18n_example.odin | 56 ++++++++-- core/i18n/gettext.odin | 2 +- core/i18n/i18n.odin | 21 +++- core/i18n/qt_linguist.odin | 153 +++++++++++++++++++++++++++ tests/core/assets/XML/nl_NL-qt-ts.ts | 52 ++++----- 6 files changed, 243 insertions(+), 42 deletions(-) create mode 100644 core/i18n/qt_linguist.odin diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 636dd0ae4..6d0d4e1aa 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -87,7 +87,6 @@ Option_Flag :: enum { If a tag body has a comment, it will be stripped unless this option is given. */ Keep_Tag_Body_Comments, - } Option_Flags :: bit_set[Option_Flag; u16] diff --git a/core/i18n/example/i18n_example.odin b/core/i18n/example/i18n_example.odin index f9fb2a353..8c173ee4a 100644 --- a/core/i18n/example/i18n_example.odin +++ b/core/i18n/example/i18n_example.odin @@ -4,9 +4,9 @@ import "core:mem" import "core:fmt" import "core:i18n" -LOC :: i18n.get +_T :: i18n.get -_main :: proc() { +mo :: proc() { using fmt err: i18n.Error @@ -23,27 +23,60 @@ _main :: proc() { These are in the .MO catalog. */ println("-----") - println(LOC("")) + println(_T("")) println("-----") - println(LOC("There are 69,105 leaves here.")) + println(_T("There are 69,105 leaves here.")) println("-----") - println(LOC("Hellope, World!")) + println(_T("Hellope, World!")) /* For ease of use, pluralized lookup can use both singular and plural form as key for the same translation. */ println("-----") - printf(LOC("There is %d leaf.\n", 1), 1) - printf(LOC("There is %d leaf.\n", 42), 42) + printf(_T("There is %d leaf.\n", 1), 1) + printf(_T("There is %d leaf.\n", 42), 42) - printf(LOC("There are %d leaves.\n", 1), 1) - printf(LOC("There are %d leaves.\n", 42), 42) + printf(_T("There are %d leaves.\n", 1), 1) + printf(_T("There are %d leaves.\n", 42), 42) /* This isn't. */ println("-----") - println(LOC("Come visit us on Discord!")) + println(_T("Come visit us on Discord!")) +} + +qt :: proc() { + using fmt + + err: i18n.Error + + /* + Parse QT file and set it as the active translation so we can omit `get`'s "catalog" parameter. + */ + i18n.ACTIVE, err = i18n.parse_qt(#load("../../../tests/core/assets/XML/nl_NL-qt-ts.ts")) + defer i18n.destroy() + + fmt.printf("parse_qt returned %v\n", err) + if err != .None { + return + } + + /* + These are in the .TS catalog. + */ + println("--- Page section ---") + println("Page:Text for translation =", _T("Page", "Text for translation")) + println("-----") + println("Page:Also text to translate =", _T("Page", "Also text to translate")) + println("-----") + println("--- installscript section ---") + println("installscript:99 bottles of beer on the wall =", _T("installscript", "99 bottles of beer on the wall")) + println("-----") + println("--- apple_count section ---") + println("apple_count:%d apple(s) =") + println("\t 1 =", _T("apple_count", "%d apple(s)", 1)) + println("\t 42 =", _T("apple_count", "%d apple(s)", 42)) } main :: proc() { @@ -53,7 +86,8 @@ main :: proc() { mem.tracking_allocator_init(&track, context.allocator) context.allocator = mem.tracking_allocator(&track) - _main() + // mo() + qt() if len(track.allocation_map) > 0 { println() diff --git a/core/i18n/gettext.odin b/core/i18n/gettext.odin index 70c922cfb..54c5a1111 100644 --- a/core/i18n/gettext.odin +++ b/core/i18n/gettext.odin @@ -2,7 +2,7 @@ package i18n /* A parser for GNU GetText .MO files. - Copyright 2021 Jeroen van Rijn . + Copyright 2021-2022 Jeroen van Rijn . Made available under Odin's BSD-3 license. A from-scratch implementation based after the specification found here: diff --git a/core/i18n/i18n.odin b/core/i18n/i18n.odin index 1ee19c2b4..36204efd9 100644 --- a/core/i18n/i18n.odin +++ b/core/i18n/i18n.odin @@ -2,7 +2,7 @@ package i18n /* Internationalization helpers. - Copyright 2021 Jeroen van Rijn . + Copyright 2021-2022 Jeroen van Rijn . Made available under Odin's BSD-3 license. List of contributors: @@ -26,8 +26,11 @@ MAX_PLURALS :: min(max(#config(ODIN_i18N_MAX_PLURAL_FORMS, 10), 1), 255) /* The main data structure. This can be generated from various different file formats, as long as we have a parser for them. */ + +Section :: map[string][]string + Translation :: struct { - k_v: map[string]map[string][]string, + k_v: map[string]Section, // k_v[section][key][plural_form] = ... intern: strings.Intern, pluralize: proc(number: int) -> int, @@ -39,6 +42,7 @@ Error :: enum { */ None = 0, Empty_Translation_Catalog, + Duplicate_Key, /* Couldn't find, open or read file. @@ -57,6 +61,17 @@ Error :: enum { MO_File_Unsupported_Version, MO_File_Invalid, MO_File_Incorrect_Plural_Count, + + /* + Qt Linguist *.TS file errors. + */ + TS_File_Parse_Error, + TS_File_Expected_Context, + TS_File_Expected_Context_Name, + TS_File_Expected_Source, + TS_File_Expected_Translation, + TS_File_Expected_NumerusForm, + } /* @@ -92,7 +107,7 @@ get_by_section :: proc(section, key: string, number := 0, catalog: ^Translation if catalog.pluralize != nil { plural = catalog.pluralize(number) } - return get_by_slot(key, plural, catalog) + return get_by_slot(section, key, plural, catalog) } get :: proc{get_single_section, get_by_section} diff --git a/core/i18n/qt_linguist.odin b/core/i18n/qt_linguist.odin new file mode 100644 index 000000000..65d51444e --- /dev/null +++ b/core/i18n/qt_linguist.odin @@ -0,0 +1,153 @@ +package i18n +/* + A parser for Qt Linguist TS files. + + Copyright 2022 Jeroen van Rijn . + Made available under Odin's BSD-3 license. + + A from-scratch implementation based after the specification found here: + https://doc.qt.io/qt-5/linguist-ts-file-format.html + + List of contributors: + Jeroen van Rijn: Initial implementation. +*/ +import "core:os" +import "core:encoding/xml" +import "core:strings" + +TS_XML_Options := xml.Options{ + flags = { + .Input_May_Be_Modified, + .Must_Have_Prolog, + .Must_Have_DocType, + .Ignore_Unsupported, + .Unbox_CDATA, + .Decode_SGML_Entities, + }, + expected_doctype = "TS", +} + +parse_qt_linguist_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { + context.allocator = allocator + + ts, xml_err := xml.parse(data, TS_XML_Options) + defer xml.destroy(ts) + + if xml_err != .None || ts.element_count < 1 || ts.elements[0].ident != "TS" || len(ts.elements[0].children) == 0 { + return nil, .TS_File_Parse_Error + } + + /* + Initalize Translation, interner and optional pluralizer. + */ + translation = new(Translation) + translation.pluralize = pluralizer + strings.intern_init(&translation.intern, allocator, allocator) + + section: ^Section + + for child_id in ts.elements[0].children { + // These should be s. + child := ts.elements[child_id] + if child.ident != "context" { + return translation, .TS_File_Expected_Context + } + + // Find section name. + section_name_id, section_name_found := xml.find_child_by_ident(ts, child_id, "name") + if !section_name_found { + return translation, .TS_File_Expected_Context_Name, + } + + section_name := ts.elements[section_name_id].value + + if section_name not_in translation.k_v { + translation.k_v[section_name] = {} + } + section = &translation.k_v[section_name] + + // Find messages in section. + nth: int + for { + message_id, message_found := xml.find_child_by_ident(ts, child_id, "message", nth) + if !message_found { + break + } + + numerus_tag, _ := xml.find_attribute_val_by_key(ts, message_id, "numerus") + has_plurals := numerus_tag == "yes" + + // We must have a = key + source_id, source_found := xml.find_child_by_ident(ts, message_id, "source") + if !source_found { + return translation, .TS_File_Expected_Source + } + + // We must have a + translation_id, translation_found := xml.find_child_by_ident(ts, message_id, "translation") + if !translation_found { + return translation, .TS_File_Expected_Translation + } + + source := ts.elements[source_id] + xlat := ts.elements[translation_id] + + if source.value in section { + return translation, .Duplicate_Key + } + + if has_plurals { + if xlat.value != "" { + return translation, .TS_File_Expected_NumerusForm + } + + num_plurals: int + for { + numerus_id, numerus_found := xml.find_child_by_ident(ts, translation_id, "numerusform", num_plurals) + if !numerus_found { + break + } + num_plurals += 1 + } + + if num_plurals < 2 { + return translation, .TS_File_Expected_NumerusForm + } + section[source.value] = make([]string, num_plurals) + + num_plurals = 0 + for { + numerus_id, numerus_found := xml.find_child_by_ident(ts, translation_id, "numerusform", num_plurals) + if !numerus_found { + break + } + numerus := ts.elements[numerus_id] + section[source.value][num_plurals] = strings.intern_get(&translation.intern, numerus.value) + + num_plurals += 1 + } + } else { + // Single translation + section[source.value] = make([]string, 1) + section[source.value][0] = strings.intern_get(&translation.intern, xlat.value) + } + + nth += 1 + } + } + + return +} + +parse_qt_linguist_file :: proc(filename: string, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { + context.allocator = allocator + + data, data_ok := os.read_entire_file(filename) + defer delete(data) + + if !data_ok { return {}, .File_Error } + + return parse_qt_linguist_from_slice(data, pluralizer) +} + +parse_qt :: proc { parse_qt_linguist_file, parse_qt_linguist_from_slice } \ No newline at end of file diff --git a/tests/core/assets/XML/nl_NL-qt-ts.ts b/tests/core/assets/XML/nl_NL-qt-ts.ts index 6ec3f2f47..36c95ce2e 100644 --- a/tests/core/assets/XML/nl_NL-qt-ts.ts +++ b/tests/core/assets/XML/nl_NL-qt-ts.ts @@ -2,34 +2,34 @@ - Page - - Text for translation - commenting - Tekst om te vertalen - - - Also text to translate - some text - Ook tekst om te vertalen - + Page + + Text for translation + commenting + Tekst om te vertalen + + + Also text to translate + some text + Ook tekst om te vertalen + - installscript - - 99 bottles of beer on the wall - some new comments here - 99 flessen bier op de muur - + installscript + + 99 bottles of beer on the wall + some new comments here + 99 flessen bier op de muur + - apple_count - - %d apple(s) - - %d appel - %d appels - - - + apple_count + + %d apple(s) + + %d appel + %d appels + + + From 9ce64916e6f6db558d53b9a852e2169b937317f8 Mon Sep 17 00:00:00 2001 From: sduman Date: Thu, 28 Apr 2022 17:08:48 -0600 Subject: [PATCH 115/245] Add missing result parameter names This adds some missing result parameters names back to pop_front_safe. Currently it the procedure won't compile since it's referencing missing variable names. --- core/container/small_array/small_array.odin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/container/small_array/small_array.odin b/core/container/small_array/small_array.odin index 5cd421c84..4dd16f30c 100644 --- a/core/container/small_array/small_array.odin +++ b/core/container/small_array/small_array.odin @@ -86,7 +86,7 @@ pop_back_safe :: proc(a: ^$A/Small_Array($N, $T)) -> (item: T, ok: bool) { return } -pop_front_safe :: proc(a: ^$A/Small_Array($N, $T)) -> (T, bool) { +pop_front_safe :: proc(a: ^$A/Small_Array($N, $T)) -> (item: T, ok: bool) { if N > 0 && a.len > 0 { item = a.data[0] s := slice(a) @@ -114,4 +114,4 @@ push_back_elems :: proc(a: ^$A/Small_Array($N, $T), items: ..T) { append_elem :: push_back append_elems :: push_back_elems push :: proc{push_back, push_back_elems} -append :: proc{push_back, push_back_elems} \ No newline at end of file +append :: proc{push_back, push_back_elems} From 789ab99c4d2052f555721683ea0df8304508c9d1 Mon Sep 17 00:00:00 2001 From: awwdev Date: Fri, 29 Apr 2022 11:21:23 +0200 Subject: [PATCH 116/245] replaced a few [^]u8 with cstring --- vendor/OpenGL/impl.odin | 6 +++--- vendor/OpenGL/wrappers.odin | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/vendor/OpenGL/impl.odin b/vendor/OpenGL/impl.odin index 966f8467d..4c5ff57a3 100644 --- a/vendor/OpenGL/impl.odin +++ b/vendor/OpenGL/impl.odin @@ -1250,14 +1250,14 @@ impl_VertexAttribLFormat: proc "c" (attribindex: u32, size: i32, typ impl_VertexAttribBinding: proc "c" (attribindex: u32, bindingindex: u32) impl_VertexBindingDivisor: proc "c" (bindingindex: u32, divisor: u32) impl_DebugMessageControl: proc "c" (source: u32, type: u32, severity: u32, count: i32, ids: [^]u32, enabled: bool) -impl_DebugMessageInsert: proc "c" (source: u32, type: u32, id: u32, severity: u32, length: i32, buf: [^]u8) +impl_DebugMessageInsert: proc "c" (source: u32, type: u32, id: u32, severity: u32, length: i32, message: cstring) impl_DebugMessageCallback: proc "c" (callback: debug_proc_t, userParam: rawptr) impl_GetDebugMessageLog: proc "c" (count: u32, bufSize: i32, sources: [^]u32, types: [^]u32, ids: [^]u32, severities: [^]u32, lengths: [^]i32, messageLog: [^]u8) -> u32 impl_PushDebugGroup: proc "c" (source: u32, id: u32, length: i32, message: cstring) impl_PopDebugGroup: proc "c" () -impl_ObjectLabel: proc "c" (identifier: u32, name: u32, length: i32, label: [^]u8) +impl_ObjectLabel: proc "c" (identifier: u32, name: u32, length: i32, label: cstring) impl_GetObjectLabel: proc "c" (identifier: u32, name: u32, bufSize: i32, length: ^i32, label: [^]u8) -impl_ObjectPtrLabel: proc "c" (ptr: rawptr, length: i32, label: [^]u8) +impl_ObjectPtrLabel: proc "c" (ptr: rawptr, length: i32, label: cstring) impl_GetObjectPtrLabel: proc "c" (ptr: rawptr, bufSize: i32, length: ^i32, label: [^]u8) load_4_3 :: proc(set_proc_address: Set_Proc_Address_Type) { diff --git a/vendor/OpenGL/wrappers.odin b/vendor/OpenGL/wrappers.odin index 10a601eec..6113cf998 100644 --- a/vendor/OpenGL/wrappers.odin +++ b/vendor/OpenGL/wrappers.odin @@ -589,14 +589,14 @@ when !ODIN_DEBUG { VertexAttribBinding :: proc "c" (attribindex: u32, bindingindex: u32) { impl_VertexAttribBinding(attribindex, bindingindex) } VertexBindingDivisor :: proc "c" (bindingindex: u32, divisor: u32) { impl_VertexBindingDivisor(bindingindex, divisor) } DebugMessageControl :: proc "c" (source: u32, type: u32, severity: u32, count: i32, ids: [^]u32, enabled: bool) { impl_DebugMessageControl(source, type, severity, count, ids, enabled) } - DebugMessageInsert :: proc "c" (source: u32, type: u32, id: u32, severity: u32, length: i32, buf: ^u8) { impl_DebugMessageInsert(source, type, id, severity, length, buf) } + DebugMessageInsert :: proc "c" (source: u32, type: u32, id: u32, severity: u32, length: i32, message: cstring) { impl_DebugMessageInsert(source, type, id, severity, length, message) } DebugMessageCallback :: proc "c" (callback: debug_proc_t, userParam: rawptr) { impl_DebugMessageCallback(callback, userParam) } GetDebugMessageLog :: proc "c" (count: u32, bufSize: i32, sources: [^]u32, types: [^]u32, ids: [^]u32, severities: [^]u32, lengths: [^]i32, messageLog: [^]u8) -> u32 { ret := impl_GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog); return ret } PushDebugGroup :: proc "c" (source: u32, id: u32, length: i32, message: cstring) { impl_PushDebugGroup(source, id, length, message) } PopDebugGroup :: proc "c" () { impl_PopDebugGroup() } - ObjectLabel :: proc "c" (identifier: u32, name: u32, length: i32, label: [^]u8) { impl_ObjectLabel(identifier, name, length, label) } + ObjectLabel :: proc "c" (identifier: u32, name: u32, length: i32, label: cstring) { impl_ObjectLabel(identifier, name, length, label) } GetObjectLabel :: proc "c" (identifier: u32, name: u32, bufSize: i32, length: ^i32, label: [^]u8) { impl_GetObjectLabel(identifier, name, bufSize, length, label) } - ObjectPtrLabel :: proc "c" (ptr: rawptr, length: i32, label: [^]u8) { impl_ObjectPtrLabel(ptr, length, label) } + ObjectPtrLabel :: proc "c" (ptr: rawptr, length: i32, label: cstring) { impl_ObjectPtrLabel(ptr, length, label) } GetObjectPtrLabel :: proc "c" (ptr: rawptr, bufSize: i32, length: ^i32, label: [^]u8) { impl_GetObjectPtrLabel(ptr, bufSize, length, label) } // VERSION_4_4 @@ -1389,14 +1389,14 @@ when !ODIN_DEBUG { VertexAttribBinding :: proc "c" (attribindex: u32, bindingindex: u32, loc := #caller_location) { impl_VertexAttribBinding(attribindex, bindingindex); debug_helper(loc, 0, attribindex, bindingindex) } VertexBindingDivisor :: proc "c" (bindingindex: u32, divisor: u32, loc := #caller_location) { impl_VertexBindingDivisor(bindingindex, divisor); debug_helper(loc, 0, bindingindex, divisor) } DebugMessageControl :: proc "c" (source: u32, type: u32, severity: u32, count: i32, ids: [^]u32, enabled: bool, loc := #caller_location) { impl_DebugMessageControl(source, type, severity, count, ids, enabled); debug_helper(loc, 0, source, type, severity, count, ids, enabled) } - DebugMessageInsert :: proc "c" (source: u32, type: u32, id: u32, severity: u32, length: i32, buf: ^u8, loc := #caller_location) { impl_DebugMessageInsert(source, type, id, severity, length, buf); debug_helper(loc, 0, source, type, id, severity, length, buf) } + DebugMessageInsert :: proc "c" (source: u32, type: u32, id: u32, severity: u32, length: i32, message: cstring, loc := #caller_location) { impl_DebugMessageInsert(source, type, id, severity, length, message); debug_helper(loc, 0, source, type, id, severity, length, message) } DebugMessageCallback :: proc "c" (callback: debug_proc_t, userParam: rawptr, loc := #caller_location) { impl_DebugMessageCallback(callback, userParam); debug_helper(loc, 0, callback, userParam) } GetDebugMessageLog :: proc "c" (count: u32, bufSize: i32, sources: [^]u32, types: [^]u32, ids: [^]u32, severities: [^]u32, lengths: [^]i32, messageLog: [^]u8, loc := #caller_location) -> u32 { ret := impl_GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog); debug_helper(loc, 1, ret, count, bufSize, sources, types, ids, severities, lengths, messageLog); return ret } PushDebugGroup :: proc "c" (source: u32, id: u32, length: i32, message: cstring, loc := #caller_location) { impl_PushDebugGroup(source, id, length, message); debug_helper(loc, 0, source, id, length, message) } PopDebugGroup :: proc "c" (loc := #caller_location) { impl_PopDebugGroup(); debug_helper(loc, 0) } - ObjectLabel :: proc "c" (identifier: u32, name: u32, length: i32, label: [^]u8, loc := #caller_location) { impl_ObjectLabel(identifier, name, length, label); debug_helper(loc, 0, identifier, name, length, label) } + ObjectLabel :: proc "c" (identifier: u32, name: u32, length: i32, label: cstring, loc := #caller_location) { impl_ObjectLabel(identifier, name, length, label); debug_helper(loc, 0, identifier, name, length, label) } GetObjectLabel :: proc "c" (identifier: u32, name: u32, bufSize: i32, length: ^i32, label: [^]u8, loc := #caller_location) { impl_GetObjectLabel(identifier, name, bufSize, length, label); debug_helper(loc, 0, identifier, name, bufSize, length, label) } - ObjectPtrLabel :: proc "c" (ptr: rawptr, length: i32, label: [^]u8, loc := #caller_location) { impl_ObjectPtrLabel(ptr, length, label); debug_helper(loc, 0, ptr, length, label) } + ObjectPtrLabel :: proc "c" (ptr: rawptr, length: i32, label: cstring, loc := #caller_location) { impl_ObjectPtrLabel(ptr, length, label); debug_helper(loc, 0, ptr, length, label) } GetObjectPtrLabel :: proc "c" (ptr: rawptr, bufSize: i32, length: ^i32, label: [^]u8, loc := #caller_location) { impl_GetObjectPtrLabel(ptr, bufSize, length, label); debug_helper(loc, 0, ptr, bufSize, length, label) } // VERSION_4_4 From e9cfcf9eccb5af63ce0aa6a71894322f16beedc5 Mon Sep 17 00:00:00 2001 From: awwdev Date: Fri, 29 Apr 2022 11:26:57 +0200 Subject: [PATCH 117/245] fix typo in TexImage3D --- vendor/OpenGL/impl.odin | 2 +- vendor/OpenGL/wrappers.odin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/OpenGL/impl.odin b/vendor/OpenGL/impl.odin index 4c5ff57a3..530865cb0 100644 --- a/vendor/OpenGL/impl.odin +++ b/vendor/OpenGL/impl.odin @@ -199,7 +199,7 @@ load_1_1 :: proc(set_proc_address: Set_Proc_Address_Type) { // VERSION_1_2 impl_DrawRangeElements: proc "c" (mode: u32, start: u32, end: u32, count: i32, type: u32, indices: rawptr) -impl_TexImage3D: proc "c" (target: u32, level: i32, internalformat: i32, width: i32, height: i32, depth: i32, border: i32, format: u32, type: u32, pixels: rawptr) +impl_TexImage3D: proc "c" (target: u32, level: i32, internalformat: i32, width: i32, height: i32, depth: i32, border: i32, format: u32, type: u32, data: rawptr) impl_TexSubImage3D: proc "c" (target: u32, level: i32, xoffset: i32, yoffset: i32, zoffset: i32, width: i32, height: i32, depth: i32, format: u32, type: u32, pixels: rawptr) impl_CopyTexSubImage3D: proc "c" (target: u32, level: i32, xoffset: i32, yoffset: i32, zoffset: i32, x: i32, y: i32, width: i32, height: i32) diff --git a/vendor/OpenGL/wrappers.odin b/vendor/OpenGL/wrappers.odin index 6113cf998..c0b5304b0 100644 --- a/vendor/OpenGL/wrappers.odin +++ b/vendor/OpenGL/wrappers.odin @@ -70,7 +70,7 @@ when !ODIN_DEBUG { // VERSION_1_2 DrawRangeElements :: proc "c" (mode, start, end: u32, count: i32, type: u32, indices: rawptr) { impl_DrawRangeElements(mode, start, end, count, type, indices) } - TexImage3D :: proc "c" (target: u32, level, internalformat, width, height, depth, border: i32, format, type: u32, pixels: rawptr) { impl_TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels) } + TexImage3D :: proc "c" (target: u32, level, internalformat, width, height, depth, border: i32, format, type: u32, data: rawptr) { impl_TexImage3D(target, level, internalformat, width, height, depth, border, format, type, data) } TexSubImage3D :: proc "c" (target: u32, level, xoffset, yoffset, zoffset, width, height, depth: i32, format, type: u32, pixels: rawptr) { impl_TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels) } CopyTexSubImage3D :: proc "c" (target: u32, level, xoffset, yoffset, zoffset, x, y, width, height: i32) { impl_CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height) } From 2e11a8da5b3d0031f99a7534b029f08dc0fe5a36 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 13:02:40 +0200 Subject: [PATCH 118/245] [i18n] Move to `core:text/i18n`. --- core/{ => text}/i18n/example/i18n_example.odin | 5 +++-- core/{ => text}/i18n/example/messages.pot | 0 core/{ => text}/i18n/example/nl_NL.mo | Bin core/{ => text}/i18n/example/nl_NL.po | 0 core/{ => text}/i18n/gettext.odin | 0 core/{ => text}/i18n/i18n.odin | 0 core/{ => text}/i18n/qt_linguist.odin | 0 7 files changed, 3 insertions(+), 2 deletions(-) rename core/{ => text}/i18n/example/i18n_example.odin (91%) rename core/{ => text}/i18n/example/messages.pot (100%) rename core/{ => text}/i18n/example/nl_NL.mo (100%) rename core/{ => text}/i18n/example/nl_NL.po (100%) rename core/{ => text}/i18n/gettext.odin (100%) rename core/{ => text}/i18n/i18n.odin (100%) rename core/{ => text}/i18n/qt_linguist.odin (100%) diff --git a/core/i18n/example/i18n_example.odin b/core/text/i18n/example/i18n_example.odin similarity index 91% rename from core/i18n/example/i18n_example.odin rename to core/text/i18n/example/i18n_example.odin index 8c173ee4a..32eb38a7d 100644 --- a/core/i18n/example/i18n_example.odin +++ b/core/text/i18n/example/i18n_example.odin @@ -2,7 +2,7 @@ package i18n_example import "core:mem" import "core:fmt" -import "core:i18n" +import "core:text/i18n" _T :: i18n.get @@ -31,6 +31,7 @@ mo :: proc() { /* For ease of use, pluralized lookup can use both singular and plural form as key for the same translation. + This is a quirk of the GetText format which has separate keys for their different plurals. */ println("-----") printf(_T("There is %d leaf.\n", 1), 1) @@ -54,7 +55,7 @@ qt :: proc() { /* Parse QT file and set it as the active translation so we can omit `get`'s "catalog" parameter. */ - i18n.ACTIVE, err = i18n.parse_qt(#load("../../../tests/core/assets/XML/nl_NL-qt-ts.ts")) + i18n.ACTIVE, err = i18n.parse_qt(#load("../../../../tests/core/assets/XML/nl_NL-qt-ts.ts")) defer i18n.destroy() fmt.printf("parse_qt returned %v\n", err) diff --git a/core/i18n/example/messages.pot b/core/text/i18n/example/messages.pot similarity index 100% rename from core/i18n/example/messages.pot rename to core/text/i18n/example/messages.pot diff --git a/core/i18n/example/nl_NL.mo b/core/text/i18n/example/nl_NL.mo similarity index 100% rename from core/i18n/example/nl_NL.mo rename to core/text/i18n/example/nl_NL.mo diff --git a/core/i18n/example/nl_NL.po b/core/text/i18n/example/nl_NL.po similarity index 100% rename from core/i18n/example/nl_NL.po rename to core/text/i18n/example/nl_NL.po diff --git a/core/i18n/gettext.odin b/core/text/i18n/gettext.odin similarity index 100% rename from core/i18n/gettext.odin rename to core/text/i18n/gettext.odin diff --git a/core/i18n/i18n.odin b/core/text/i18n/i18n.odin similarity index 100% rename from core/i18n/i18n.odin rename to core/text/i18n/i18n.odin diff --git a/core/i18n/qt_linguist.odin b/core/text/i18n/qt_linguist.odin similarity index 100% rename from core/i18n/qt_linguist.odin rename to core/text/i18n/qt_linguist.odin From 957ef8e8fe885fed32b62d532e642be5e756ea67 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 13:16:30 +0200 Subject: [PATCH 119/245] [i18n/xml] Move I18N XML files to their own assets directory. --- .../core/assets/I18N}/messages.pot | 0 .../core/assets/{XML => I18N}/nl_NL-qt-ts.ts | 0 .../{XML => I18N}/nl_NL-xliff-1.2.xliff | 0 .../{XML => I18N}/nl_NL-xliff-2.0.xliff | 0 .../core/assets/I18N}/nl_NL.mo | Bin .../core/assets/I18N}/nl_NL.po | 0 tests/core/encoding/xml/test_core_xml.odin | 33 ++++++------------ 7 files changed, 11 insertions(+), 22 deletions(-) rename {core/text/i18n/example => tests/core/assets/I18N}/messages.pot (100%) rename tests/core/assets/{XML => I18N}/nl_NL-qt-ts.ts (100%) rename tests/core/assets/{XML => I18N}/nl_NL-xliff-1.2.xliff (100%) rename tests/core/assets/{XML => I18N}/nl_NL-xliff-2.0.xliff (100%) rename {core/text/i18n/example => tests/core/assets/I18N}/nl_NL.mo (100%) rename {core/text/i18n/example => tests/core/assets/I18N}/nl_NL.po (100%) diff --git a/core/text/i18n/example/messages.pot b/tests/core/assets/I18N/messages.pot similarity index 100% rename from core/text/i18n/example/messages.pot rename to tests/core/assets/I18N/messages.pot diff --git a/tests/core/assets/XML/nl_NL-qt-ts.ts b/tests/core/assets/I18N/nl_NL-qt-ts.ts similarity index 100% rename from tests/core/assets/XML/nl_NL-qt-ts.ts rename to tests/core/assets/I18N/nl_NL-qt-ts.ts diff --git a/tests/core/assets/XML/nl_NL-xliff-1.2.xliff b/tests/core/assets/I18N/nl_NL-xliff-1.2.xliff similarity index 100% rename from tests/core/assets/XML/nl_NL-xliff-1.2.xliff rename to tests/core/assets/I18N/nl_NL-xliff-1.2.xliff diff --git a/tests/core/assets/XML/nl_NL-xliff-2.0.xliff b/tests/core/assets/I18N/nl_NL-xliff-2.0.xliff similarity index 100% rename from tests/core/assets/XML/nl_NL-xliff-2.0.xliff rename to tests/core/assets/I18N/nl_NL-xliff-2.0.xliff diff --git a/core/text/i18n/example/nl_NL.mo b/tests/core/assets/I18N/nl_NL.mo similarity index 100% rename from core/text/i18n/example/nl_NL.mo rename to tests/core/assets/I18N/nl_NL.mo diff --git a/core/text/i18n/example/nl_NL.po b/tests/core/assets/I18N/nl_NL.po similarity index 100% rename from core/text/i18n/example/nl_NL.po rename to tests/core/assets/I18N/nl_NL.po diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index a79c939c8..07cbc1779 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -27,7 +27,7 @@ TEST :: struct { /* Relative to ODIN_ROOT */ -TEST_FILE_PATH_PREFIX :: "tests/core/assets/XML" +TEST_FILE_PATH_PREFIX :: "tests/core/assets" TESTS :: []TEST{ /* @@ -35,23 +35,12 @@ TESTS :: []TEST{ */ { - /* - - - <恥ずべきフクロウ 올빼미_id="Foozle Hello, world!"]]>Barzle"> - <부끄러운:barzle> - ရှက်စရာ ဇီးကွက် - Owl of Shame - More CDATA Hello, world! Nonsense. - - */ - /* Tests UTF-8 idents and values. Test namespaced ident. Tests that nested partial CDATA start doesn't trip up parser. */ - filename = "utf8.xml", + filename = "XML/utf8.xml", options = { flags = { .Ignore_Unsupported, .Intern_Comments, @@ -66,7 +55,7 @@ TESTS :: []TEST{ Same as above. Unbox CDATA in data tag. */ - filename = "utf8.xml", + filename = "XML/utf8.xml", options = { flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, @@ -81,7 +70,7 @@ TESTS :: []TEST{ Simple Qt TS translation file. `core:i18n` requires it to be parsed properly. */ - filename = "nl_NL-qt-ts.ts", + filename = "I18N/nl_NL-qt-ts.ts", options = { flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, @@ -96,7 +85,7 @@ TESTS :: []TEST{ Simple XLiff 1.2 file. `core:i18n` requires it to be parsed properly. */ - filename = "nl_NL-xliff-1.2.xliff", + filename = "I18N/nl_NL-xliff-1.2.xliff", options = { flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, @@ -111,7 +100,7 @@ TESTS :: []TEST{ Simple XLiff 2.0 file. `core:i18n` requires it to be parsed properly. */ - filename = "nl_NL-xliff-2.0.xliff", + filename = "I18N/nl_NL-xliff-2.0.xliff", options = { flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, @@ -122,7 +111,7 @@ TESTS :: []TEST{ }, { - filename = "entities.html", + filename = "XML/entities.html", options = { flags = { .Ignore_Unsupported, .Intern_Comments, @@ -133,7 +122,7 @@ TESTS :: []TEST{ }, { - filename = "entities.html", + filename = "XML/entities.html", options = { flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, @@ -144,7 +133,7 @@ TESTS :: []TEST{ }, { - filename = "entities.html", + filename = "XML/entities.html", options = { flags = { .Ignore_Unsupported, .Intern_Comments, .Unbox_CDATA, .Decode_SGML_Entities, @@ -158,7 +147,7 @@ TESTS :: []TEST{ Then we test that certain errors are returned as expected. */ { - filename = "utf8.xml", + filename = "XML/utf8.xml", options = { flags = { .Ignore_Unsupported, .Intern_Comments, @@ -173,7 +162,7 @@ TESTS :: []TEST{ Parse the 8.2 MiB unicode.xml for good measure. */ { - filename = "unicode.xml", + filename = "XML/unicode.xml", options = { flags = { .Ignore_Unsupported, From 09e1c0fa27a262d7fbfaa5b3e305054304847e75 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 16:19:13 +0200 Subject: [PATCH 120/245] [i18n] Add tests. --- core/text/i18n/doc.odin | 111 ++++++++++++ core/text/i18n/example/i18n_example.odin | 99 ----------- core/text/i18n/gettext.odin | 9 +- core/text/i18n/i18n.odin | 8 + core/text/i18n/qt_linguist.odin | 8 +- examples/all/all_main.odin | 4 + tests/core/Makefile | 5 +- tests/core/assets/I18N/duplicate-key.ts | 22 +++ tests/core/build.bat | 7 +- tests/core/text/i18n/test_core_text_i18n.odin | 165 ++++++++++++++++++ 10 files changed, 329 insertions(+), 109 deletions(-) create mode 100644 core/text/i18n/doc.odin delete mode 100644 core/text/i18n/example/i18n_example.odin create mode 100644 tests/core/assets/I18N/duplicate-key.ts create mode 100644 tests/core/text/i18n/test_core_text_i18n.odin diff --git a/core/text/i18n/doc.odin b/core/text/i18n/doc.odin new file mode 100644 index 000000000..cff1ce11f --- /dev/null +++ b/core/text/i18n/doc.odin @@ -0,0 +1,111 @@ +//+ignore +package i18n + +/* + The i18n package is flexible and easy to use. + + It has one call to get a translation: `get`, which the user can alias into something like `T`. + + `get`, referred to as `T` here, has a few different signatures. + All of them will return the key if the entry can't be found in the active translation catalog. + + - `T(key)` returns the translation of `key`. + - `T(key, n)` returns a pluralized translation of `key` according to value `n`. + + - `T(section, key)` returns the translation of `key` in `section`. + - `T(section, key, n)` returns a pluralized translation of `key` in `section` according to value `n`. + + By default lookup take place in the global `i18n.ACTIVE` catalog for ease of use. + If you want to override which translation to use, for example in a language preview dialog, you can use the following: + + - `T(key, n, catalog)` returns the pluralized version of `key` from explictly supplied catalog. + - `T(section, key, n, catalog)` returns the pluralized version of `key` in `section` from explictly supplied catalog. + + If a catalog has translation contexts or sections, then ommitting it in the above calls looks up in section "". + + The default pluralization rule is n != 1, which is to say that passing n == 1 (or not passing n) returns the singular form. + Passing n != 1 returns plural form 1. + + Should a language not conform to this rule, you can pass a pluralizer procedure to the catalog parser. + This is a procedure that maps an integer to an integer, taking a value and returning which plural slot should be used. + + You can also assign it to a loaded catalog after parsing, of course. + + Some code examples follow. +*/ + +/* +```cpp +import "core:fmt" +import "core:text/i18n" + +T :: i18n.get + +mo :: proc() { + using fmt + + err: i18n.Error + + /* + Parse MO file and set it as the active translation so we can omit `get`'s "catalog" parameter. + */ + i18n.ACTIVE, err = i18n.parse_mo(#load("translations/nl_NL.mo")) + defer i18n.destroy() + + if err != .None { return } + + /* + These are in the .MO catalog. + */ + println("-----") + println(T("")) + println("-----") + println(T("There are 69,105 leaves here.")) + println("-----") + println(T("Hellope, World!")) + println("-----") + // We pass 1 into `T` to get the singular format string, then 1 again into printf. + printf(T("There is %d leaf.\n", 1), 1) + // We pass 42 into `T` to get the plural format string, then 42 again into printf. + printf(T("There is %d leaf.\n", 42), 42) + + /* + This isn't in the translation catalog, so the key is passed back untranslated. + */ + println("-----") + println(T("Come visit us on Discord!")) +} + +qt :: proc() { + using fmt + + err: i18n.Error + + /* + Parse QT file and set it as the active translation so we can omit `get`'s "catalog" parameter. + */ + i18n.ACTIVE, err = i18n.parse_qt(#load("translations/nl_NL-qt-ts.ts")) + defer i18n.destroy() + + if err != .None { + return + } + + /* + These are in the .TS catalog. As you can see they have sections. + */ + println("--- Page section ---") + println("Page:Text for translation =", T("Page", "Text for translation")) + println("-----") + println("Page:Also text to translate =", T("Page", "Also text to translate")) + println("-----") + println("--- installscript section ---") + println("installscript:99 bottles of beer on the wall =", T("installscript", "99 bottles of beer on the wall")) + println("-----") + println("--- apple_count section ---") + println("apple_count:%d apple(s) =") + println("\t 1 =", T("apple_count", "%d apple(s)", 1)) + println("\t 42 =", T("apple_count", "%d apple(s)", 42)) +} +``` +*/ \ No newline at end of file diff --git a/core/text/i18n/example/i18n_example.odin b/core/text/i18n/example/i18n_example.odin deleted file mode 100644 index 32eb38a7d..000000000 --- a/core/text/i18n/example/i18n_example.odin +++ /dev/null @@ -1,99 +0,0 @@ -package i18n_example - -import "core:mem" -import "core:fmt" -import "core:text/i18n" - -_T :: i18n.get - -mo :: proc() { - using fmt - - err: i18n.Error - - /* - Parse MO file and set it as the active translation so we can omit `get`'s "catalog" parameter. - */ - i18n.ACTIVE, err = i18n.parse_mo(#load("nl_NL.mo")) - defer i18n.destroy() - - if err != .None { return } - - /* - These are in the .MO catalog. - */ - println("-----") - println(_T("")) - println("-----") - println(_T("There are 69,105 leaves here.")) - println("-----") - println(_T("Hellope, World!")) - - /* - For ease of use, pluralized lookup can use both singular and plural form as key for the same translation. - This is a quirk of the GetText format which has separate keys for their different plurals. - */ - println("-----") - printf(_T("There is %d leaf.\n", 1), 1) - printf(_T("There is %d leaf.\n", 42), 42) - - printf(_T("There are %d leaves.\n", 1), 1) - printf(_T("There are %d leaves.\n", 42), 42) - - /* - This isn't. - */ - println("-----") - println(_T("Come visit us on Discord!")) -} - -qt :: proc() { - using fmt - - err: i18n.Error - - /* - Parse QT file and set it as the active translation so we can omit `get`'s "catalog" parameter. - */ - i18n.ACTIVE, err = i18n.parse_qt(#load("../../../../tests/core/assets/XML/nl_NL-qt-ts.ts")) - defer i18n.destroy() - - fmt.printf("parse_qt returned %v\n", err) - if err != .None { - return - } - - /* - These are in the .TS catalog. - */ - println("--- Page section ---") - println("Page:Text for translation =", _T("Page", "Text for translation")) - println("-----") - println("Page:Also text to translate =", _T("Page", "Also text to translate")) - println("-----") - println("--- installscript section ---") - println("installscript:99 bottles of beer on the wall =", _T("installscript", "99 bottles of beer on the wall")) - println("-----") - println("--- apple_count section ---") - println("apple_count:%d apple(s) =") - println("\t 1 =", _T("apple_count", "%d apple(s)", 1)) - println("\t 42 =", _T("apple_count", "%d apple(s)", 42)) -} - -main :: proc() { - using fmt - - track: mem.Tracking_Allocator - mem.tracking_allocator_init(&track, context.allocator) - context.allocator = mem.tracking_allocator(&track) - - // mo() - qt() - - if len(track.allocation_map) > 0 { - println() - for _, v in track.allocation_map { - printf("%v Leaked %v bytes.\n", v.location, v.size) - } - } -} \ No newline at end of file diff --git a/core/text/i18n/gettext.odin b/core/text/i18n/gettext.odin index 54c5a1111..eed73855b 100644 --- a/core/text/i18n/gettext.odin +++ b/core/text/i18n/gettext.odin @@ -8,6 +8,9 @@ package i18n A from-scratch implementation based after the specification found here: https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html + Options are ignored as they're not applicable to this format. + They're part of the signature for consistency with other catalog formats. + List of contributors: Jeroen van Rijn: Initial implementation. */ @@ -15,7 +18,7 @@ import "core:os" import "core:strings" import "core:bytes" -parse_mo_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { +parse_mo_from_slice :: proc(data: []u8, options := DEFAULT_PARSE_OPTIONS, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { context.allocator = allocator /* An MO file should have at least a 4-byte magic, 2 x 2 byte version info, @@ -115,7 +118,7 @@ parse_mo_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allo return } -parse_mo_file :: proc(filename: string, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { +parse_mo_file :: proc(filename: string, options := DEFAULT_PARSE_OPTIONS, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { context.allocator = allocator data, data_ok := os.read_entire_file(filename) @@ -123,7 +126,7 @@ parse_mo_file :: proc(filename: string, pluralizer: proc(int) -> int = nil, allo if !data_ok { return {}, .File_Error } - return parse_mo_from_slice(data, pluralizer) + return parse_mo_from_slice(data, options, pluralizer, allocator) } parse_mo :: proc { parse_mo_file, parse_mo_from_slice } diff --git a/core/text/i18n/i18n.odin b/core/text/i18n/i18n.odin index 36204efd9..e007401af 100644 --- a/core/text/i18n/i18n.odin +++ b/core/text/i18n/i18n.odin @@ -74,6 +74,14 @@ Error :: enum { } +Parse_Options :: struct { + merge_sections: bool, +} + +DEFAULT_PARSE_OPTIONS :: Parse_Options{ + merge_sections = false, +} + /* Several ways to use: - get(key), which defaults to the singular form and i18n.ACTIVE catalog, or diff --git a/core/text/i18n/qt_linguist.odin b/core/text/i18n/qt_linguist.odin index 65d51444e..0a241c1aa 100644 --- a/core/text/i18n/qt_linguist.odin +++ b/core/text/i18n/qt_linguist.odin @@ -27,7 +27,7 @@ TS_XML_Options := xml.Options{ expected_doctype = "TS", } -parse_qt_linguist_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { +parse_qt_linguist_from_slice :: proc(data: []u8, options := DEFAULT_PARSE_OPTIONS, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { context.allocator = allocator ts, xml_err := xml.parse(data, TS_XML_Options) @@ -59,7 +59,7 @@ parse_qt_linguist_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = return translation, .TS_File_Expected_Context_Name, } - section_name := ts.elements[section_name_id].value + section_name := "" if options.merge_sections else ts.elements[section_name_id].value if section_name not_in translation.k_v { translation.k_v[section_name] = {} @@ -139,7 +139,7 @@ parse_qt_linguist_from_slice :: proc(data: []u8, pluralizer: proc(int) -> int = return } -parse_qt_linguist_file :: proc(filename: string, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { +parse_qt_linguist_file :: proc(filename: string, options := DEFAULT_PARSE_OPTIONS, pluralizer: proc(int) -> int = nil, allocator := context.allocator) -> (translation: ^Translation, err: Error) { context.allocator = allocator data, data_ok := os.read_entire_file(filename) @@ -147,7 +147,7 @@ parse_qt_linguist_file :: proc(filename: string, pluralizer: proc(int) -> int = if !data_ok { return {}, .File_Error } - return parse_qt_linguist_from_slice(data, pluralizer) + return parse_qt_linguist_from_slice(data, options, pluralizer, allocator) } parse_qt :: proc { parse_qt_linguist_file, parse_qt_linguist_from_slice } \ No newline at end of file diff --git a/examples/all/all_main.odin b/examples/all/all_main.odin index 27f199062..36acf7714 100644 --- a/examples/all/all_main.odin +++ b/examples/all/all_main.odin @@ -56,6 +56,7 @@ import csv "core:encoding/csv" import hxa "core:encoding/hxa" import json "core:encoding/json" import varint "core:encoding/varint" +import xml "core:encoding/xml" import fmt "core:fmt" import hash "core:hash" @@ -100,6 +101,7 @@ import strings "core:strings" import sync "core:sync" import testing "core:testing" import scanner "core:text/scanner" +import i18n "core:text/i18n" import thread "core:thread" import time "core:time" @@ -158,6 +160,7 @@ _ :: csv _ :: hxa _ :: json _ :: varint +_ :: xml _ :: fmt _ :: hash _ :: image @@ -192,6 +195,7 @@ _ :: strings _ :: sync _ :: testing _ :: scanner +_ :: i18n _ :: thread _ :: time _ :: unicode diff --git a/tests/core/Makefile b/tests/core/Makefile index 2c24fef75..1405ae5c6 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -26,9 +26,10 @@ noise_test: $(ODIN) run math/noise -out:test_noise encoding_test: - $(ODIN) run encoding/hxa -collection:tests=.. -out:test_hxa - $(ODIN) run encoding/json -out:test_json + $(ODIN) run encoding/hxa -out:test_hxa -collection:tests=.. + $(ODIN) run encoding/json -out:test_json $(ODIN) run encoding/varint -out:test_varint + $(ODIN) run encoding/xml -out:test_xml math_test: $(ODIN) run math/test_core_math.odin -file -collection:tests=.. -out:test_core_math diff --git a/tests/core/assets/I18N/duplicate-key.ts b/tests/core/assets/I18N/duplicate-key.ts new file mode 100644 index 000000000..a38824d01 --- /dev/null +++ b/tests/core/assets/I18N/duplicate-key.ts @@ -0,0 +1,22 @@ + + + + + Page + + %d apple(s) + commenting + Tekst om te vertalen + + + + apple_count + + %d apple(s) + + %d appel + %d appels + + + + diff --git a/tests/core/build.bat b/tests/core/build.bat index 8e4ba1d15..77ff38038 100644 --- a/tests/core/build.bat +++ b/tests/core/build.bat @@ -64,4 +64,9 @@ echo --- echo --- echo Running core:reflect tests echo --- -%PATH_TO_ODIN% run reflect %COMMON% %COLLECTION% -out:test_core_reflect.exe \ No newline at end of file +%PATH_TO_ODIN% run reflect %COMMON% %COLLECTION% -out:test_core_reflect.exe + +echo --- +echo Running core:text/i18n tests +echo --- +%PATH_TO_ODIN% run text\i18n %COMMON% -out:test_core_i18n.exe \ No newline at end of file diff --git a/tests/core/text/i18n/test_core_text_i18n.odin b/tests/core/text/i18n/test_core_text_i18n.odin new file mode 100644 index 000000000..ba668c4fd --- /dev/null +++ b/tests/core/text/i18n/test_core_text_i18n.odin @@ -0,0 +1,165 @@ +package test_core_text_i18n + +import "core:mem" +import "core:fmt" +import "core:os" +import "core:testing" +import "core:text/i18n" + +TEST_count := 0 +TEST_fail := 0 + +when ODIN_TEST { + expect :: testing.expect + log :: testing.log +} else { + expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { + TEST_count += 1 + if !condition { + TEST_fail += 1 + fmt.printf("[%v] %v\n", loc, message) + return + } + } + log :: proc(t: ^testing.T, v: any, loc := #caller_location) { + fmt.printf("[%v] ", loc) + fmt.printf("log: %v\n", v) + } +} +T :: i18n.get + +Test :: struct { + section: string, + key: string, + val: string, + n: int, +} + +Test_Suite :: struct { + file: string, + loader: proc(string, i18n.Parse_Options, proc(int) -> int, mem.Allocator) -> (^i18n.Translation, i18n.Error), + err: i18n.Error, + options: i18n.Parse_Options, + tests: []Test, +} + +TESTS := []Test_Suite{ + { + file = "assets/I18N/nl_NL.mo", + loader = i18n.parse_mo_file, + tests = { + // These are in the catalog. + { "", "There are 69,105 leaves here.", "Er zijn hier 69.105 bladeren.", 1 }, + { "", "Hellope, World!", "Hallo, Wereld!", 1 }, + { "", "There is %d leaf.\n", "Er is %d blad.\n", 1 }, + { "", "There are %d leaves.\n", "Er is %d blad.\n", 1 }, + { "", "There is %d leaf.\n", "Er zijn %d bladeren.\n", 42 }, + { "", "There are %d leaves.\n", "Er zijn %d bladeren.\n", 42 }, + + // This isn't in the catalog, so should ruturn the key. + { "", "Come visit us on Discord!", "Come visit us on Discord!", 1 }, + }, + }, + + // QT Linguist with default loader options. + { + file = "assets/I18N/nl_NL-qt-ts.ts", + loader = i18n.parse_qt_linguist_file, + tests = { + // These are in the catalog. + { "Page", "Text for translation", "Tekst om te vertalen", 1}, + { "Page", "Also text to translate", "Ook tekst om te vertalen", 1}, + { "installscript", "99 bottles of beer on the wall", "99 flessen bier op de muur", 1}, + { "apple_count", "%d apple(s)", "%d appel", 1}, + { "apple_count", "%d apple(s)", "%d appels", 42}, + + // These aren't in the catalog, so should ruturn the key. + { "", "Come visit us on Discord!", "Come visit us on Discord!", 1 }, + { "Fake_Section", "Come visit us on Discord!", "Come visit us on Discord!", 1 }, + }, + }, + + // QT Linguist, merging sections. + { + file = "assets/I18N/nl_NL-qt-ts.ts", + loader = i18n.parse_qt_linguist_file, + options = {merge_sections = true}, + tests = { + // All of them are now in section "", lookup with original section should return the key. + { "", "Text for translation", "Tekst om te vertalen", 1}, + { "", "Also text to translate", "Ook tekst om te vertalen", 1}, + { "", "99 bottles of beer on the wall", "99 flessen bier op de muur", 1}, + { "", "%d apple(s)", "%d appel", 1}, + { "", "%d apple(s)", "%d appels", 42}, + + // All of them are now in section "", lookup with original section should return the key. + { "Page", "Text for translation", "Text for translation", 1}, + { "Page", "Also text to translate", "Also text to translate", 1}, + { "installscript", "99 bottles of beer on the wall", "99 bottles of beer on the wall", 1}, + { "apple_count", "%d apple(s)", "%d apple(s)", 1}, + { "apple_count", "%d apple(s)", "%d apple(s)", 42}, + }, + }, + + // QT Linguist, merging sections. Expecting .Duplicate_Key error because same key exists in more than 1 section. + { + file = "assets/I18N/duplicate-key.ts", + loader = i18n.parse_qt_linguist_file, + options = {merge_sections = true}, + err = .Duplicate_Key, + }, + + // QT Linguist, not merging sections. Shouldn't return error despite same key existing in more than 1 section. + { + file = "assets/I18N/duplicate-key.ts", + loader = i18n.parse_qt_linguist_file, + }, +} + +@test +tests :: proc(t: ^testing.T) { + using fmt + + cat: ^i18n.Translation + err: i18n.Error + + for suite in TESTS { + cat, err = suite.loader(suite.file, suite.options, nil, context.allocator) + + msg := fmt.tprintf("Expected loading %v to return %v, got %v", suite.file, suite.err, err) + expect(t, err == suite.err, msg) + + if err == .None { + for test in suite.tests { + val := T(test.section, test.key, test.n, cat) + + msg = fmt.tprintf("Expected key `%v` from section `%v`'s form for value `%v` to equal `%v`, got `%v`", test.key, test.section, test.n, test.val, val) + expect(t, val == test.val, msg) + } + } + i18n.destroy(cat) + } +} + +main :: proc() { + using fmt + + track: mem.Tracking_Allocator + mem.tracking_allocator_init(&track, context.allocator) + context.allocator = mem.tracking_allocator(&track) + + t := testing.T{} + tests(&t) + + fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) + if TEST_fail > 0 { + os.exit(1) + } + + if len(track.allocation_map) > 0 { + println() + for _, v in track.allocation_map { + printf("%v Leaked %v bytes.\n", v.location, v.size) + } + } +} \ No newline at end of file From ff0f0c447fb52b5836edb603e1fb8c3ae4ed4b50 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 18:10:13 +0200 Subject: [PATCH 121/245] [i18n] Fix segfault on destroy on Linux Forgot to intern the section string in QT TS loader. --- core/text/i18n/i18n.odin | 26 ++++++++++++++----------- core/text/i18n/qt_linguist.odin | 5 ++++- tests/core/assets/I18N/duplicate-key.ts | 18 ++++++++--------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/core/text/i18n/i18n.odin b/core/text/i18n/i18n.odin index e007401af..9d030db16 100644 --- a/core/text/i18n/i18n.odin +++ b/core/text/i18n/i18n.odin @@ -163,16 +163,20 @@ get_by_slot :: proc{get_by_slot_single_section, get_by_slot_by_section} - destroy(), to clean up the currently active catalog catalog i18n.ACTIVE - destroy(catalog), to clean up a specific catalog. */ -destroy :: proc(catalog: ^Translation = ACTIVE) { - if catalog != nil { - strings.intern_destroy(&catalog.intern) - for section in &catalog.k_v { - for key in &catalog.k_v[section] { - delete(catalog.k_v[section][key]) - } - delete(catalog.k_v[section]) - } - delete(catalog.k_v) - free(catalog) +destroy :: proc(catalog: ^Translation = ACTIVE, allocator := context.allocator) { + context.allocator = allocator + + if catalog == nil { + return } + + for section in &catalog.k_v { + for key in &catalog.k_v[section] { + delete(catalog.k_v[section][key]) + } + delete(catalog.k_v[section]) + } + delete(catalog.k_v) + strings.intern_destroy(&catalog.intern) + free(catalog) } \ No newline at end of file diff --git a/core/text/i18n/qt_linguist.odin b/core/text/i18n/qt_linguist.odin index 0a241c1aa..e23e9aef4 100644 --- a/core/text/i18n/qt_linguist.odin +++ b/core/text/i18n/qt_linguist.odin @@ -59,7 +59,10 @@ parse_qt_linguist_from_slice :: proc(data: []u8, options := DEFAULT_PARSE_OPTION return translation, .TS_File_Expected_Context_Name, } - section_name := "" if options.merge_sections else ts.elements[section_name_id].value + section_name := strings.intern_get(&translation.intern, "") + if !options.merge_sections { + section_name = strings.intern_get(&translation.intern, ts.elements[section_name_id].value) + } if section_name not_in translation.k_v { translation.k_v[section_name] = {} diff --git a/tests/core/assets/I18N/duplicate-key.ts b/tests/core/assets/I18N/duplicate-key.ts index a38824d01..44c09d91d 100644 --- a/tests/core/assets/I18N/duplicate-key.ts +++ b/tests/core/assets/I18N/duplicate-key.ts @@ -10,13 +10,13 @@ - apple_count - - %d apple(s) - - %d appel - %d appels - - - + apple_count + + %d apple(s) + + %d appel + %d appels + + + From 36263399a0159d9ca3a109b50542638264e5642b Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 18:13:46 +0200 Subject: [PATCH 122/245] [i18n] Enable i18n test on Linux. --- tests/core/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/core/Makefile b/tests/core/Makefile index 1405ae5c6..5c2918e30 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -2,7 +2,7 @@ ODIN=../../odin PYTHON=$(shell which python3) all: download_test_assets image_test compress_test strings_test hash_test crypto_test noise_test encoding_test \ - math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test + math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test i18n_test download_test_assets: $(PYTHON) download_assets.py @@ -44,4 +44,7 @@ reflect_test: $(ODIN) run reflect/test_core_reflect.odin -file -collection:tests=.. -out:test_core_reflect os_exit_test: - $(ODIN) run os/test_core_os_exit.odin -file -out:test_core_os_exit && exit 1 || exit 0 \ No newline at end of file + $(ODIN) run os/test_core_os_exit.odin -file -out:test_core_os_exit && exit 1 || exit 0 + +i18n_test: + $(ODIN) run text/i18n -out:test_core_i18n \ No newline at end of file From 819345caa6dccb983e496682a78829074f777011 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 18:28:42 +0200 Subject: [PATCH 123/245] Disable i18n test for *nix for now. --- tests/core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/core/Makefile b/tests/core/Makefile index 5c2918e30..2e1e4f78d 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -2,7 +2,7 @@ ODIN=../../odin PYTHON=$(shell which python3) all: download_test_assets image_test compress_test strings_test hash_test crypto_test noise_test encoding_test \ - math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test i18n_test + math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test download_test_assets: $(PYTHON) download_assets.py From 9c9c2b483c93be2f6e78911d997229a4b543c66d Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 29 Apr 2022 18:41:21 +0200 Subject: [PATCH 124/245] [i18n] Enable *nix tests again. --- core/text/i18n/qt_linguist.odin | 18 +++++++++--------- tests/core/Makefile | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/text/i18n/qt_linguist.odin b/core/text/i18n/qt_linguist.odin index e23e9aef4..15a88a42f 100644 --- a/core/text/i18n/qt_linguist.odin +++ b/core/text/i18n/qt_linguist.odin @@ -92,15 +92,15 @@ parse_qt_linguist_from_slice :: proc(data: []u8, options := DEFAULT_PARSE_OPTION return translation, .TS_File_Expected_Translation } - source := ts.elements[source_id] - xlat := ts.elements[translation_id] + source := strings.intern_get(&translation.intern, ts.elements[source_id].value) + xlat := strings.intern_get(&translation.intern, ts.elements[translation_id].value) - if source.value in section { + if source in section { return translation, .Duplicate_Key } if has_plurals { - if xlat.value != "" { + if xlat != "" { return translation, .TS_File_Expected_NumerusForm } @@ -116,7 +116,7 @@ parse_qt_linguist_from_slice :: proc(data: []u8, options := DEFAULT_PARSE_OPTION if num_plurals < 2 { return translation, .TS_File_Expected_NumerusForm } - section[source.value] = make([]string, num_plurals) + section[source] = make([]string, num_plurals) num_plurals = 0 for { @@ -124,15 +124,15 @@ parse_qt_linguist_from_slice :: proc(data: []u8, options := DEFAULT_PARSE_OPTION if !numerus_found { break } - numerus := ts.elements[numerus_id] - section[source.value][num_plurals] = strings.intern_get(&translation.intern, numerus.value) + numerus := strings.intern_get(&translation.intern, ts.elements[numerus_id].value) + section[source][num_plurals] = numerus num_plurals += 1 } } else { // Single translation - section[source.value] = make([]string, 1) - section[source.value][0] = strings.intern_get(&translation.intern, xlat.value) + section[source] = make([]string, 1) + section[source][0] = xlat } nth += 1 diff --git a/tests/core/Makefile b/tests/core/Makefile index 2e1e4f78d..5c2918e30 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -2,7 +2,7 @@ ODIN=../../odin PYTHON=$(shell which python3) all: download_test_assets image_test compress_test strings_test hash_test crypto_test noise_test encoding_test \ - math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test + math_test linalg_glsl_math_test filepath_test reflect_test os_exit_test i18n_test download_test_assets: $(PYTHON) download_assets.py From 0ad448f1c71da7bc522012a894f02c9864e448d6 Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 30 Apr 2022 11:21:37 +0300 Subject: [PATCH 125/245] sys/windows: add a couple of procedures and types --- core/image/common.odin | 2 +- core/sys/windows/gdi32.odin | 5 +++++ core/sys/windows/types.odin | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/image/common.odin b/core/image/common.odin index 8c77ec48a..9955f0ee1 100644 --- a/core/image/common.odin +++ b/core/image/common.odin @@ -1131,4 +1131,4 @@ write_bytes :: proc(buf: ^bytes.Buffer, data: []u8) -> (err: compress.General_Er return compress.General_Error.Resize_Failed } return nil -} \ No newline at end of file +} diff --git a/core/sys/windows/gdi32.odin b/core/sys/windows/gdi32.odin index 15d5567c7..8c686f2dc 100644 --- a/core/sys/windows/gdi32.odin +++ b/core/sys/windows/gdi32.odin @@ -62,5 +62,10 @@ foreign gdi32 { ChoosePixelFormat :: proc(hdc: HDC, ppfd: ^PIXELFORMATDESCRIPTOR) -> c_int --- SwapBuffers :: proc(HDC) -> BOOL --- + SetDCBrushColor :: proc(hdc: HDC, color: COLORREF) -> COLORREF --- PatBlt :: proc(hdc: HDC, x, y, w, h: c_int, rop: DWORD) -> BOOL --- } + +RGB :: proc(r, g, b: u8) -> COLORREF { + return COLORREF(COLORREF(r) | COLORREF(g) << 8 | COLORREF(b) << 16) +} diff --git a/core/sys/windows/types.odin b/core/sys/windows/types.odin index 6bded29e1..4093fd3f9 100644 --- a/core/sys/windows/types.odin +++ b/core/sys/windows/types.odin @@ -55,6 +55,8 @@ UINT_PTR :: uintptr ULONG :: c_ulong UCHAR :: BYTE NTSTATUS :: c.long +COLORREF :: DWORD +LPCOLORREF :: ^COLORREF LPARAM :: LONG_PTR WPARAM :: UINT_PTR LRESULT :: LONG_PTR From 40bea95fb0c1f561f2bb53c967c698823c8c951b Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 30 Apr 2022 12:41:04 +0300 Subject: [PATCH 126/245] sys/windows: add GetDCBrushColor --- core/sys/windows/gdi32.odin | 1 + 1 file changed, 1 insertion(+) diff --git a/core/sys/windows/gdi32.odin b/core/sys/windows/gdi32.odin index 8c686f2dc..eb863b586 100644 --- a/core/sys/windows/gdi32.odin +++ b/core/sys/windows/gdi32.odin @@ -63,6 +63,7 @@ foreign gdi32 { SwapBuffers :: proc(HDC) -> BOOL --- SetDCBrushColor :: proc(hdc: HDC, color: COLORREF) -> COLORREF --- + GetDCBrushColor :: proc(hdc: HDC) -> COLORREF --- PatBlt :: proc(hdc: HDC, x, y, w, h: c_int, rop: DWORD) -> BOOL --- } From 8c7f3fd1e6f9b04da2b01e25bd7a5dee6feeee28 Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 30 Apr 2022 13:34:11 +0300 Subject: [PATCH 127/245] sys/windows: change macro and add comment --- core/sys/windows/gdi32.odin | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/sys/windows/gdi32.odin b/core/sys/windows/gdi32.odin index eb863b586..bec5225a7 100644 --- a/core/sys/windows/gdi32.odin +++ b/core/sys/windows/gdi32.odin @@ -67,6 +67,8 @@ foreign gdi32 { PatBlt :: proc(hdc: HDC, x, y, w, h: c_int, rop: DWORD) -> BOOL --- } -RGB :: proc(r, g, b: u8) -> COLORREF { - return COLORREF(COLORREF(r) | COLORREF(g) << 8 | COLORREF(b) << 16) +// Windows colors are packed as ABGR +RGB :: #force_inline proc "contextless" (r, g, b: u8) -> COLORREF { + res: [4]u8 = {0, rgb.b, rgb.g, rgb.r} + return transmute(COLORREF)res } From d2bac0c35e8f7c2347b6bd3763d64de6e902494b Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 30 Apr 2022 13:40:38 +0300 Subject: [PATCH 128/245] sys/windows: fix build issues --- core/sys/windows/gdi32.odin | 2 +- core/sys/windows/types.odin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sys/windows/gdi32.odin b/core/sys/windows/gdi32.odin index bec5225a7..e728503d2 100644 --- a/core/sys/windows/gdi32.odin +++ b/core/sys/windows/gdi32.odin @@ -69,6 +69,6 @@ foreign gdi32 { // Windows colors are packed as ABGR RGB :: #force_inline proc "contextless" (r, g, b: u8) -> COLORREF { - res: [4]u8 = {0, rgb.b, rgb.g, rgb.r} + res: [4]u8 = {0, b, g, r} return transmute(COLORREF)res } diff --git a/core/sys/windows/types.odin b/core/sys/windows/types.odin index 4093fd3f9..c3e461ba0 100644 --- a/core/sys/windows/types.odin +++ b/core/sys/windows/types.odin @@ -55,7 +55,7 @@ UINT_PTR :: uintptr ULONG :: c_ulong UCHAR :: BYTE NTSTATUS :: c.long -COLORREF :: DWORD +COLORREF :: DWORD // Windows colors are packed as ABGR LPCOLORREF :: ^COLORREF LPARAM :: LONG_PTR WPARAM :: UINT_PTR From dd6337224f817044be01fd270e9d70ddbc0571a5 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 Apr 2022 11:42:28 +0100 Subject: [PATCH 129/245] Correct explicit atomic orderings --- core/sync/primitives_atomic.odin | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/sync/primitives_atomic.odin b/core/sync/primitives_atomic.odin index 665b515ba..a0f08c412 100644 --- a/core/sync/primitives_atomic.odin +++ b/core/sync/primitives_atomic.odin @@ -298,7 +298,7 @@ atomic_cond_wait :: proc(c: ^Atomic_Cond, m: ^Atomic_Mutex) { } atomic_cond_wait_with_timeout :: proc(c: ^Atomic_Cond, m: ^Atomic_Mutex, duration: time.Duration) -> (ok: bool) { - state := u32(atomic_load(&c.state)) + state := u32(atomic_load_explicit(&c.state, .Relaxed)) unlock(m) ok = futex_wait_with_timeout(&c.state, state, duration) lock(m) @@ -307,12 +307,12 @@ atomic_cond_wait_with_timeout :: proc(c: ^Atomic_Cond, m: ^Atomic_Mutex, duratio atomic_cond_signal :: proc(c: ^Atomic_Cond) { - atomic_add_explicit(&c.state, 1, .Relaxed) + atomic_add_explicit(&c.state, 1, .Release) futex_signal(&c.state) } atomic_cond_broadcast :: proc(c: ^Atomic_Cond) { - atomic_add_explicit(&c.state, 1, .Relaxed) + atomic_add_explicit(&c.state, 1, .Release) futex_broadcast(&c.state) } @@ -351,7 +351,6 @@ atomic_sema_wait_with_timeout :: proc(s: ^Atomic_Sema, duration: time.Duration) return false } for { - original_count := atomic_load_explicit(&s.count, .Relaxed) for start := time.tick_now(); original_count == 0; /**/ { remaining := duration - time.tick_since(start) From d5886c1572c6b093079e3be9911d5aaad0e65a7d Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 Apr 2022 12:37:14 +0100 Subject: [PATCH 130/245] Remove the wait group based semaphore implementation It was a misuse of the data structure --- core/sync/extended.odin | 15 ++++-------- core/sync/primitives_internal.odin | 19 +++++++++++++++ core/sync/sema_internal.odin | 39 ------------------------------ 3 files changed, 24 insertions(+), 49 deletions(-) delete mode 100644 core/sync/sema_internal.odin diff --git a/core/sync/extended.odin b/core/sync/extended.odin index 2cca6f961..180d9b633 100644 --- a/core/sync/extended.odin +++ b/core/sync/extended.odin @@ -16,8 +16,7 @@ wait_group_add :: proc(wg: ^Wait_Group, delta: int) { return } - mutex_lock(&wg.mutex) - defer mutex_unlock(&wg.mutex) + guard(&wg.mutex) atomic_add(&wg.counter, delta) if wg.counter < 0 { @@ -36,8 +35,7 @@ wait_group_done :: proc(wg: ^Wait_Group) { } wait_group_wait :: proc(wg: ^Wait_Group) { - mutex_lock(&wg.mutex) - defer mutex_unlock(&wg.mutex) + guard(&wg.mutex) if wg.counter != 0 { cond_wait(&wg.cond, &wg.mutex) @@ -51,8 +49,7 @@ wait_group_wait_with_timeout :: proc(wg: ^Wait_Group, duration: time.Duration) - if duration <= 0 { return false } - mutex_lock(&wg.mutex) - defer mutex_unlock(&wg.mutex) + guard(&wg.mutex) if wg.counter != 0 { if !cond_wait_with_timeout(&wg.cond, &wg.mutex, duration) { @@ -119,8 +116,7 @@ barrier_init :: proc(b: ^Barrier, thread_count: int) { // Block the current thread until all threads have rendezvoused // Barrier can be reused after all threads rendezvoused once, and can be used continuously barrier_wait :: proc(b: ^Barrier) -> (is_leader: bool) { - mutex_lock(&b.mutex) - defer mutex_unlock(&b.mutex) + guard(&b.mutex) local_gen := b.generation_id b.index += 1 if b.index < b.thread_count { @@ -289,8 +285,7 @@ Once :: struct { once_do :: proc(o: ^Once, fn: proc()) { @(cold) do_slow :: proc(o: ^Once, fn: proc()) { - mutex_lock(&o.m) - defer mutex_unlock(&o.m) + guard(&o.m) if !o.done { fn() atomic_store_explicit(&o.done, true, .Release) diff --git a/core/sync/primitives_internal.odin b/core/sync/primitives_internal.odin index de9aca991..deacf632c 100644 --- a/core/sync/primitives_internal.odin +++ b/core/sync/primitives_internal.odin @@ -1,6 +1,25 @@ //+private package sync +import "core:time" + +_Sema :: struct { + atomic: Atomic_Sema, +} + +_sema_post :: proc(s: ^Sema, count := 1) { + atomic_sema_post(&s.impl.atomic, count) +} + +_sema_wait :: proc(s: ^Sema) { + atomic_sema_wait(&s.impl.atomic) +} + +_sema_wait_with_timeout :: proc(s: ^Sema, duration: time.Duration) -> bool { + return atomic_sema_wait_with_timeout(&s.impl.atomic, duration) +} + + when #config(ODIN_SYNC_RECURSIVE_MUTEX_USE_FUTEX, true) { _Recursive_Mutex :: struct { owner: Futex, diff --git a/core/sync/sema_internal.odin b/core/sync/sema_internal.odin deleted file mode 100644 index 5e2203c34..000000000 --- a/core/sync/sema_internal.odin +++ /dev/null @@ -1,39 +0,0 @@ -//+private -package sync - -import "core:time" - - -when #config(ODIN_SYNC_SEMA_USE_FUTEX, true) { - _Sema :: struct { - atomic: Atomic_Sema, - } - - _sema_post :: proc(s: ^Sema, count := 1) { - atomic_sema_post(&s.impl.atomic, count) - } - - _sema_wait :: proc(s: ^Sema) { - atomic_sema_wait(&s.impl.atomic) - } - - _sema_wait_with_timeout :: proc(s: ^Sema, duration: time.Duration) -> bool { - return atomic_sema_wait_with_timeout(&s.impl.atomic, duration) - } -} else { - _Sema :: struct { - wg: Wait_Group, - } - - _sema_post :: proc(s: ^Sema, count := 1) { - wait_group_add(&s.impl.wg, count) - } - - _sema_wait :: proc(s: ^Sema) { - wait_group_wait(&s.impl.wg) - } - - _sema_wait_with_timeout :: proc(s: ^Sema, duration: time.Duration) -> bool { - return wait_group_wait_with_timeout(&s.impl.wg, duration) - } -} \ No newline at end of file From 78a8da5fea73538fab2597a4691f87e63972535f Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 Apr 2022 12:37:39 +0100 Subject: [PATCH 131/245] Add `sync.Parker` --- core/sync/extended.odin | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/core/sync/extended.odin b/core/sync/extended.odin index 180d9b633..49d296c90 100644 --- a/core/sync/extended.odin +++ b/core/sync/extended.odin @@ -297,3 +297,59 @@ once_do :: proc(o: ^Once, fn: proc()) { do_slow(o, fn) } } + + + +// A Parker is an associated token which is initially not present: +// * The `park` procedure blocks the current thread unless or until the token +// is available, at which point the token is consumed. +// * The `park_with_timeout` procedures works the same as `park` but only +// blocks for the specified duration. +// * The `unpark` procedure automatically makes the token available if it +// was not already. +Parker :: struct { + state: Futex, +} + +// Blocks the current thread until the token is made available. +// +// Assumes this is only called by the thread that owns the Parker. +park :: proc(p: ^Parker) { + EMPTY :: 0 + NOTIFIED :: 1 + PARKED :: max(u32) + if atomic_sub_explicit(&p.state, 1, .Acquire) == NOTIFIED { + return + } + for { + futex_wait(&p.state, PARKED) + if _, ok := atomic_compare_exchange_strong_explicit(&p.state, NOTIFIED, EMPTY, .Acquire, .Acquire); ok { + return + } + } +} + +// Blocks the current thread until the token is made available, but only +// for a limited duration. +// +// Assumes this is only called by the thread that owns the Parker +park_with_timeout :: proc(p: ^Parker, duration: time.Duration) { + EMPTY :: 0 + NOTIFIED :: 1 + PARKED :: max(u32) + if atomic_sub_explicit(&p.state, 1, .Acquire) == NOTIFIED { + return + } + futex_wait_with_timeout(&p.state, PARKED, duration) + atomic_exchange_explicit(&p.state, EMPTY, .Acquire) +} + +// Automatically makes thee token available if it was not already. +unpark :: proc(p: ^Parker) { + EMPTY :: 0 + NOTIFIED :: 1 + PARKED :: max(Futex) + if atomic_exchange_explicit(&p.state, NOTIFIED, .Release) == PARKED { + futex_signal(&p.state) + } +} \ No newline at end of file From 4e39629a9a316817b20387b2dc7860f95ab110b4 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 Apr 2022 13:09:24 +0100 Subject: [PATCH 132/245] Unify implementation for *nix platforms --- core/sync/primitives_darwin.odin | 38 -------- core/sync/primitives_freebsd.odin | 36 ------- core/sync/primitives_internal.odin | 145 +++++++++++++---------------- core/sync/primitives_linux.odin | 37 -------- core/sync/primitives_openbsd.odin | 36 ------- 5 files changed, 67 insertions(+), 225 deletions(-) diff --git a/core/sync/primitives_darwin.odin b/core/sync/primitives_darwin.odin index 514f66f3e..521c8fe35 100644 --- a/core/sync/primitives_darwin.odin +++ b/core/sync/primitives_darwin.odin @@ -17,41 +17,3 @@ _current_thread_id :: proc "contextless" () -> int { pthread_threadid_np(nil, &tid) return int(tid) } - - - -_Mutex :: struct { - mutex: Atomic_Mutex, -} - -_mutex_lock :: proc(m: ^Mutex) { - atomic_mutex_lock(&m.impl.mutex) -} - -_mutex_unlock :: proc(m: ^Mutex) { - atomic_mutex_unlock(&m.impl.mutex) -} - -_mutex_try_lock :: proc(m: ^Mutex) -> bool { - return atomic_mutex_try_lock(&m.impl.mutex) -} - -_Cond :: struct { - cond: Atomic_Cond, -} - -_cond_wait :: proc(c: ^Cond, m: ^Mutex) { - atomic_cond_wait(&c.impl.cond, &m.impl.mutex) -} - -_cond_wait_with_timeout :: proc(c: ^Cond, m: ^Mutex, duration: time.Duration) -> bool { - return atomic_cond_wait_with_timeout(&c.impl.cond, &m.impl.mutex, duration) -} - -_cond_signal :: proc(c: ^Cond) { - atomic_cond_signal(&c.impl.cond) -} - -_cond_broadcast :: proc(c: ^Cond) { - atomic_cond_broadcast(&c.impl.cond) -} diff --git a/core/sync/primitives_freebsd.odin b/core/sync/primitives_freebsd.odin index b88fca181..9fdabb7c9 100644 --- a/core/sync/primitives_freebsd.odin +++ b/core/sync/primitives_freebsd.odin @@ -8,39 +8,3 @@ import "core:time" _current_thread_id :: proc "contextless" () -> int { return os.current_thread_id() } - -_Mutex :: struct { - mutex: Atomic_Mutex, -} - -_mutex_lock :: proc(m: ^Mutex) { - atomic_mutex_lock(&m.impl.mutex) -} - -_mutex_unlock :: proc(m: ^Mutex) { - atomic_mutex_unlock(&m.impl.mutex) -} - -_mutex_try_lock :: proc(m: ^Mutex) -> bool { - return atomic_mutex_try_lock(&m.impl.mutex) -} - -_Cond :: struct { - cond: Atomic_Cond, -} - -_cond_wait :: proc(c: ^Cond, m: ^Mutex) { - atomic_cond_wait(&c.impl.cond, &m.impl.mutex) -} - -_cond_wait_with_timeout :: proc(c: ^Cond, m: ^Mutex, duration: time.Duration) -> bool { - return atomic_cond_wait_with_timeout(&c.impl.cond, &m.impl.mutex, duration) -} - -_cond_signal :: proc(c: ^Cond) { - atomic_cond_signal(&c.impl.cond) -} - -_cond_broadcast :: proc(c: ^Cond) { - atomic_cond_broadcast(&c.impl.cond) -} diff --git a/core/sync/primitives_internal.odin b/core/sync/primitives_internal.odin index deacf632c..ba17c2eb5 100644 --- a/core/sync/primitives_internal.odin +++ b/core/sync/primitives_internal.odin @@ -20,99 +20,89 @@ _sema_wait_with_timeout :: proc(s: ^Sema, duration: time.Duration) -> bool { } -when #config(ODIN_SYNC_RECURSIVE_MUTEX_USE_FUTEX, true) { - _Recursive_Mutex :: struct { - owner: Futex, - recursion: i32, - } +_Recursive_Mutex :: struct { + owner: Futex, + recursion: i32, +} - _recursive_mutex_lock :: proc(m: ^Recursive_Mutex) { - tid := Futex(current_thread_id()) - for { - prev_owner := atomic_compare_exchange_strong_explicit(&m.impl.owner, 0, tid, .Acquire, .Acquire) - switch prev_owner { - case 0, tid: - m.impl.recursion += 1 - // inside the lock - return - } - - futex_wait(&m.impl.owner, u32(prev_owner)) - } - } - - _recursive_mutex_unlock :: proc(m: ^Recursive_Mutex) { - m.impl.recursion -= 1 - if m.impl.recursion != 0 { - return - } - atomic_exchange_explicit(&m.impl.owner, 0, .Release) - - futex_signal(&m.impl.owner) - // outside the lock - - } - - _recursive_mutex_try_lock :: proc(m: ^Recursive_Mutex) -> bool { - tid := Futex(current_thread_id()) +_recursive_mutex_lock :: proc(m: ^Recursive_Mutex) { + tid := Futex(current_thread_id()) + for { prev_owner := atomic_compare_exchange_strong_explicit(&m.impl.owner, 0, tid, .Acquire, .Acquire) switch prev_owner { case 0, tid: m.impl.recursion += 1 // inside the lock - return true + return } - return false - } -} else { - _Recursive_Mutex :: struct { - owner: int, - recursion: int, - mutex: Mutex, - } - _recursive_mutex_lock :: proc(m: ^Recursive_Mutex) { - tid := current_thread_id() - if tid != m.impl.owner { - mutex_lock(&m.impl.mutex) - } - // inside the lock - m.impl.owner = tid + futex_wait(&m.impl.owner, u32(prev_owner)) + } +} + +_recursive_mutex_unlock :: proc(m: ^Recursive_Mutex) { + m.impl.recursion -= 1 + if m.impl.recursion != 0 { + return + } + atomic_exchange_explicit(&m.impl.owner, 0, .Release) + + futex_signal(&m.impl.owner) + // outside the lock + +} + +_recursive_mutex_try_lock :: proc(m: ^Recursive_Mutex) -> bool { + tid := Futex(current_thread_id()) + prev_owner := atomic_compare_exchange_strong_explicit(&m.impl.owner, 0, tid, .Acquire, .Acquire) + switch prev_owner { + case 0, tid: m.impl.recursion += 1 - } - - _recursive_mutex_unlock :: proc(m: ^Recursive_Mutex) { - tid := current_thread_id() - assert(tid == m.impl.owner) - m.impl.recursion -= 1 - recursion := m.impl.recursion - if recursion == 0 { - m.impl.owner = 0 - } - if recursion == 0 { - mutex_unlock(&m.impl.mutex) - } - // outside the lock - - } - - _recursive_mutex_try_lock :: proc(m: ^Recursive_Mutex) -> bool { - tid := current_thread_id() - if m.impl.owner == tid { - return mutex_try_lock(&m.impl.mutex) - } - if !mutex_try_lock(&m.impl.mutex) { - return false - } // inside the lock - m.impl.owner = tid - m.impl.recursion += 1 return true } + return false } when ODIN_OS != .Windows { + _Mutex :: struct { + mutex: Atomic_Mutex, + } + + _mutex_lock :: proc(m: ^Mutex) { + atomic_mutex_lock(&m.impl.mutex) + } + + _mutex_unlock :: proc(m: ^Mutex) { + atomic_mutex_unlock(&m.impl.mutex) + } + + _mutex_try_lock :: proc(m: ^Mutex) -> bool { + return atomic_mutex_try_lock(&m.impl.mutex) + } + + _Cond :: struct { + cond: Atomic_Cond, + } + + _cond_wait :: proc(c: ^Cond, m: ^Mutex) { + atomic_cond_wait(&c.impl.cond, &m.impl.mutex) + } + + _cond_wait_with_timeout :: proc(c: ^Cond, m: ^Mutex, duration: time.Duration) -> bool { + return atomic_cond_wait_with_timeout(&c.impl.cond, &m.impl.mutex, duration) + } + + _cond_signal :: proc(c: ^Cond) { + atomic_cond_signal(&c.impl.cond) + } + + _cond_broadcast :: proc(c: ^Cond) { + atomic_cond_broadcast(&c.impl.cond) + } + + _RW_Mutex :: struct { mutex: Atomic_RW_Mutex, } @@ -140,5 +130,4 @@ when ODIN_OS != .Windows { _rw_mutex_try_shared_lock :: proc(rw: ^RW_Mutex) -> bool { return atomic_rw_mutex_try_shared_lock(&rw.impl.mutex) } - } \ No newline at end of file diff --git a/core/sync/primitives_linux.odin b/core/sync/primitives_linux.odin index 0a9f0cc33..4cc99bdf1 100644 --- a/core/sync/primitives_linux.odin +++ b/core/sync/primitives_linux.odin @@ -8,40 +8,3 @@ import "core:time" _current_thread_id :: proc "contextless" () -> int { return unix.sys_gettid() } - - -_Mutex :: struct { - mutex: Atomic_Mutex, -} - -_mutex_lock :: proc(m: ^Mutex) { - atomic_mutex_lock(&m.impl.mutex) -} - -_mutex_unlock :: proc(m: ^Mutex) { - atomic_mutex_unlock(&m.impl.mutex) -} - -_mutex_try_lock :: proc(m: ^Mutex) -> bool { - return atomic_mutex_try_lock(&m.impl.mutex) -} - -_Cond :: struct { - cond: Atomic_Cond, -} - -_cond_wait :: proc(c: ^Cond, m: ^Mutex) { - atomic_cond_wait(&c.impl.cond, &m.impl.mutex) -} - -_cond_wait_with_timeout :: proc(c: ^Cond, m: ^Mutex, duration: time.Duration) -> bool { - return atomic_cond_wait_with_timeout(&c.impl.cond, &m.impl.mutex, duration) -} - -_cond_signal :: proc(c: ^Cond) { - atomic_cond_signal(&c.impl.cond) -} - -_cond_broadcast :: proc(c: ^Cond) { - atomic_cond_broadcast(&c.impl.cond) -} diff --git a/core/sync/primitives_openbsd.odin b/core/sync/primitives_openbsd.odin index 7794016f8..fd56a4837 100644 --- a/core/sync/primitives_openbsd.odin +++ b/core/sync/primitives_openbsd.odin @@ -8,39 +8,3 @@ import "core:time" _current_thread_id :: proc "contextless" () -> int { return os.current_thread_id() } - -_Mutex :: struct { - mutex: Atomic_Mutex, -} - -_mutex_lock :: proc(m: ^Mutex) { - atomic_mutex_lock(&m.impl.mutex) -} - -_mutex_unlock :: proc(m: ^Mutex) { - atomic_mutex_unlock(&m.impl.mutex) -} - -_mutex_try_lock :: proc(m: ^Mutex) -> bool { - return atomic_mutex_try_lock(&m.impl.mutex) -} - -_Cond :: struct { - cond: Atomic_Cond, -} - -_cond_wait :: proc(c: ^Cond, m: ^Mutex) { - atomic_cond_wait(&c.impl.cond, &m.impl.mutex) -} - -_cond_wait_with_timeout :: proc(c: ^Cond, m: ^Mutex, duration: time.Duration) -> bool { - return atomic_cond_wait_with_timeout(&c.impl.cond, &m.impl.mutex, duration) -} - -_cond_signal :: proc(c: ^Cond) { - atomic_cond_signal(&c.impl.cond) -} - -_cond_broadcast :: proc(c: ^Cond) { - atomic_cond_broadcast(&c.impl.cond) -} From 2720f64c06da7e9aaf49b96e25230c8036055203 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 30 Apr 2022 13:28:45 +0100 Subject: [PATCH 133/245] Remove unused imports --- core/sync/primitives_darwin.odin | 1 - core/sync/primitives_freebsd.odin | 1 - core/sync/primitives_linux.odin | 1 - core/sync/primitives_openbsd.odin | 1 - 4 files changed, 4 deletions(-) diff --git a/core/sync/primitives_darwin.odin b/core/sync/primitives_darwin.odin index 521c8fe35..726113ae7 100644 --- a/core/sync/primitives_darwin.odin +++ b/core/sync/primitives_darwin.odin @@ -3,7 +3,6 @@ package sync import "core:c" -import "core:time" import "core:intrinsics" foreign import pthread "System.framework" diff --git a/core/sync/primitives_freebsd.odin b/core/sync/primitives_freebsd.odin index 9fdabb7c9..e6219acf1 100644 --- a/core/sync/primitives_freebsd.odin +++ b/core/sync/primitives_freebsd.odin @@ -3,7 +3,6 @@ package sync import "core:os" -import "core:time" _current_thread_id :: proc "contextless" () -> int { return os.current_thread_id() diff --git a/core/sync/primitives_linux.odin b/core/sync/primitives_linux.odin index 4cc99bdf1..1e75891df 100644 --- a/core/sync/primitives_linux.odin +++ b/core/sync/primitives_linux.odin @@ -3,7 +3,6 @@ package sync import "core:sys/unix" -import "core:time" _current_thread_id :: proc "contextless" () -> int { return unix.sys_gettid() diff --git a/core/sync/primitives_openbsd.odin b/core/sync/primitives_openbsd.odin index fd56a4837..4072a14e8 100644 --- a/core/sync/primitives_openbsd.odin +++ b/core/sync/primitives_openbsd.odin @@ -3,7 +3,6 @@ package sync import "core:os" -import "core:time" _current_thread_id :: proc "contextless" () -> int { return os.current_thread_id() From d6a8216ce48eb9478f307ccf70e5295424bd78ed Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 14:34:07 +0200 Subject: [PATCH 134/245] [pbm] Normalize some errors, correct .depth --- core/image/common.odin | 41 +++++++++++------- core/image/netpbm/netpbm.odin | 61 +++++++++++---------------- core/image/png/png.odin | 16 +++---- core/image/qoi/qoi.odin | 12 +++--- core/image/tga/tga.odin | 5 +-- tests/core/image/test_core_image.odin | 12 +++--- 6 files changed, 70 insertions(+), 77 deletions(-) diff --git a/core/image/common.odin b/core/image/common.odin index 2196565bd..6722036ff 100644 --- a/core/image/common.odin +++ b/core/image/common.odin @@ -45,7 +45,7 @@ Image :: struct { width: int, height: int, channels: int, - depth: int, + depth: int, // Channel depth in bits, typically 8 or 16 pixels: bytes.Buffer, /* Some image loaders/writers can return/take an optional background color. @@ -141,13 +141,14 @@ Option :: enum { alpha_drop_if_present, // Unimplemented for QOI. Returns error. alpha_premultiply, // Unimplemented for QOI. Returns error. blend_background, // Ignored for non-PNG formats + // Unimplemented do_not_expand_grayscale, do_not_expand_indexed, do_not_expand_channels, // SAVE OPTIONS - qoi_all_channels_linear, // QOI, informative info. If not set, defaults to sRGB with linear alpha. + qoi_all_channels_linear, // QOI, informative only. If not set, defaults to sRGB with linear alpha. } Options :: distinct bit_set[Option] @@ -166,12 +167,29 @@ Error :: union #shared_nil { General_Image_Error :: enum { None = 0, + // File I/O + Unable_To_Read_File, + Unable_To_Write_File, + + // Invalid + Invalid_Signature, + Invalid_Input_Image, + Image_Dimensions_Too_Large, Invalid_Image_Dimensions, Invalid_Number_Of_Channels, - Image_Dimensions_Too_Large, Image_Does_Not_Adhere_to_Spec, - Invalid_Input_Image, + Invalid_Image_Depth, + Invalid_Bit_Depth, + Invalid_Color_Space, + + // More data than pixels to decode into, for example. + Corrupt, + + // Output buffer is the wrong size Invalid_Output, + + // Allocation + Unable_To_Allocate_Or_Resize, } /* @@ -201,8 +219,6 @@ Netpbm_Error :: enum { None = 0, // reading - File_Not_Readable, - Invalid_Signature, Invalid_Header_Token_Character, Incomplete_Header, Invalid_Header_Value, @@ -212,9 +228,7 @@ Netpbm_Error :: enum { Invalid_Buffer_Value, // writing - File_Not_Writable, Invalid_Format, - Invalid_Image_Depth, } /* @@ -222,7 +236,6 @@ Netpbm_Error :: enum { */ PNG_Error :: enum { None = 0, - Invalid_PNG_Signature, IHDR_Not_First_Chunk, IHDR_Corrupt, IDAT_Missing, @@ -338,14 +351,10 @@ PNG_Interlace_Method :: enum u8 { */ QOI_Error :: enum { None = 0, - Invalid_QOI_Signature, - Invalid_Bit_Depth, // QOI supports only 8-bit images, error only returned from writer. - Invalid_Color_Space, // QOI allows 0 = sRGB or 1 = linear. - Corrupt, // More data than pixels to decode into, for example. Missing_Or_Corrupt_Trailer, // Image seemed to have decoded okay, but trailer is missing or corrupt. } -QOI_Magic :: u32be(0x716f6966) // "qoif" +QOI_Magic :: u32be(0x716f6966) // "qoif" QOI_Color_Space :: enum u8 { sRGB = 0, @@ -1170,10 +1179,10 @@ write_bytes :: proc(buf: ^bytes.Buffer, data: []u8) -> (err: compress.General_Er return nil } else if len(data) == 1 { if bytes.buffer_write_byte(buf, data[0]) != nil { - return compress.General_Error.Resize_Failed + return .Resize_Failed } } else if n, _ := bytes.buffer_write(buf, data); n != len(data) { - return compress.General_Error.Resize_Failed + return .Resize_Failed } return nil } \ No newline at end of file diff --git a/core/image/netpbm/netpbm.odin b/core/image/netpbm/netpbm.odin index 5c082e384..54935d6c6 100644 --- a/core/image/netpbm/netpbm.odin +++ b/core/image/netpbm/netpbm.odin @@ -9,8 +9,6 @@ import "core:strconv" import "core:strings" import "core:unicode" - - Image :: image.Image Format :: image.Netpbm_Format Header :: image.Netpbm_Header @@ -18,8 +16,6 @@ Info :: image.Netpbm_Info Error :: image.Error Format_Error :: image.Netpbm_Error - - Formats :: bit_set[Format] PBM :: Formats{.P1, .P4} PGM :: Formats{.P2, .P5} @@ -30,14 +26,12 @@ PFM :: Formats{.Pf, .PF} ASCII :: Formats{.P1, .P2, .P3} BINARY :: Formats{.P4, .P5, .P6} + PAM + PFM - - -read :: proc { - read_from_file, - read_from_buffer, +load :: proc { + load_from_file, + load_from_buffer, } -read_from_file :: proc(filename: string, allocator := context.allocator) -> (img: Image, err: Error) { +load_from_file :: proc(filename: string, allocator := context.allocator) -> (img: Image, err: Error) { context.allocator = allocator data, ok := os.read_entire_file(filename); defer delete(data) @@ -49,7 +43,7 @@ read_from_file :: proc(filename: string, allocator := context.allocator) -> (img return read_from_buffer(data) } -read_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: Image, err: Error) { +load_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: Image, err: Error) { context.allocator = allocator header: Header; defer header_destroy(&header) @@ -70,14 +64,12 @@ read_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: return } - - -write :: proc { - write_to_file, - write_to_buffer, +save :: proc { + save_to_file, + save_to_buffer, } -write_to_file :: proc(filename: string, img: Image, allocator := context.allocator) -> (err: Error) { +save_to_file :: proc(filename: string, img: Image, allocator := context.allocator) -> (err: Error) { context.allocator = allocator data: []byte; defer delete(data) @@ -90,7 +82,7 @@ write_to_file :: proc(filename: string, img: Image, allocator := context.allocat return Format_Error.None } -write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: []byte, err: Error) { +save_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: []byte, err: Error) { context.allocator = allocator info, ok := img.metadata.(^image.Netpbm_Info) @@ -109,12 +101,12 @@ write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: } if header.format in (PNM + PAM) { - if header.maxval <= int(max(u8)) && img.depth != 1 \ - || header.maxval > int(max(u8)) && header.maxval <= int(max(u16)) && img.depth != 2 { + if header.maxval <= int(max(u8)) && img.depth != 8 \ + || header.maxval > int(max(u8)) && header.maxval <= int(max(u16)) && img.depth != 16 { err = Format_Error.Invalid_Image_Depth return } - } else if header.format in PFM && img.depth != 4 { + } else if header.format in PFM && img.depth != 32 { err = Format_Error.Invalid_Image_Depth return } @@ -179,7 +171,7 @@ write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: mem.copy(raw_data(data.buf[len(header_buf):]), raw_data(pixels), len(pixels)) // convert from native endianness - if img.depth == 2 { + if img.depth == 16 { pixels := mem.slice_data_cast([]u16be, data.buf[len(header_buf):]) for p in &pixels { p = u16be(transmute(u16) p) @@ -212,7 +204,7 @@ write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: // Token ASCII case .P2, .P3: switch img.depth { - case 1: + case 8: pixels := img.pixels.buf[:] for y in 0 ..< img.height { for x in 0 ..< img.width { @@ -226,7 +218,7 @@ write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: fmt.sbprint(&data, "\n") } - case 2: + case 16: pixels := mem.slice_data_cast([]u16, img.pixels.buf[:]) for y in 0 ..< img.height { for x in 0 ..< img.width { @@ -251,8 +243,6 @@ write_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: return data.buf[:], Format_Error.None } - - parse_header :: proc(data: []byte, allocator := context.allocator) -> (header: Header, length: int, err: Error) { context.allocator = allocator @@ -351,7 +341,7 @@ _parse_header_pnm :: proc(data: []byte) -> (header: Header, length: int, err: Er // set extra info header.channels = 3 if header.format in PPM else 1 - header.depth = 2 if header.maxval > int(max(u8)) else 1 + header.depth = 16 if header.maxval > int(max(u8)) else 8 // limit checking if current_field < len(header_fields) { @@ -448,12 +438,11 @@ _parse_header_pam :: proc(data: []byte, allocator := context.allocator) -> (head } // extra info - header.depth = 2 if header.maxval > int(max(u8)) else 1 + header.depth = 16 if header.maxval > int(max(u8)) else 8 // limit checking if header.width < 1 \ || header.height < 1 \ - || header.depth < 1 \ || header.maxval < 1 \ || header.maxval > int(max(u16)) { err = Format_Error.Invalid_Header_Value @@ -484,7 +473,7 @@ _parse_header_pfm :: proc(data: []byte) -> (header: Header, length: int, err: Er } // floating point - header.depth = 4 + header.depth = 32 // width field, ok = strings.fields_iterator(&field_iterator) @@ -542,8 +531,6 @@ _parse_header_pfm :: proc(data: []byte) -> (header: Header, length: int, err: Er return } - - decode_image :: proc(header: Header, data: []byte, allocator := context.allocator) -> (img: Image, err: Error) { context.allocator = allocator @@ -554,7 +541,7 @@ decode_image :: proc(header: Header, data: []byte, allocator := context.allocato depth = header.depth, } - buffer_size := img.width * img.height * img.channels * img.depth + buffer_size := image.compute_buffer_size(img.width, img.height, img.channels, img.depth) // we can check data size for binary formats if header.format in BINARY { @@ -615,7 +602,7 @@ decode_image :: proc(header: Header, data: []byte, allocator := context.allocato } } } else { - if img.depth == 2 { + if img.depth == 16 { pixels := mem.slice_data_cast([]u16, img.pixels.buf[:]) for p in &pixels { p = u16(transmute(u16be) p) @@ -658,9 +645,9 @@ decode_image :: proc(header: Header, data: []byte, allocator := context.allocato } switch img.depth { - case 1: + case 8: bytes.buffer_write_byte(&img.pixels, u8(value)) - case 2: + case 16: vb := transmute([2]u8) u16(value) bytes.buffer_write(&img.pixels, vb[:]) } @@ -678,4 +665,4 @@ decode_image :: proc(header: Header, data: []byte, allocator := context.allocato err = Format_Error.None return -} +} \ No newline at end of file diff --git a/core/image/png/png.odin b/core/image/png/png.odin index ba888cb78..d526dfb27 100644 --- a/core/image/png/png.odin +++ b/core/image/png/png.odin @@ -238,7 +238,7 @@ append_chunk :: proc(list: ^[dynamic]image.PNG_Chunk, src: image.PNG_Chunk, allo append(list, c) if len(list) != length + 1 { // Resize during append failed. - return mem.Allocator_Error.Out_Of_Memory + return .Unable_To_Allocate_Or_Resize } return @@ -347,7 +347,7 @@ load_from_file :: proc(filename: string, options := Options{}, allocator := cont return load_from_slice(data, options) } else { img = new(Image) - return img, compress.General_Error.File_Not_Found + return img, .Unable_To_Read_File } } @@ -381,7 +381,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a signature, io_error := compress.read_data(ctx, Signature) if io_error != .None || signature != .PNG { - return img, .Invalid_PNG_Signature + return img, .Invalid_Signature } idat: []u8 @@ -747,7 +747,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a dest_raw_size := compute_buffer_size(int(header.width), int(header.height), out_image_channels, 8) t := bytes.Buffer{} if !resize(&t.buf, dest_raw_size) { - return {}, mem.Allocator_Error.Out_Of_Memory + return {}, .Unable_To_Allocate_Or_Resize } i := 0; j := 0 @@ -828,7 +828,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a dest_raw_size := compute_buffer_size(int(header.width), int(header.height), out_image_channels, 16) t := bytes.Buffer{} if !resize(&t.buf, dest_raw_size) { - return {}, mem.Allocator_Error.Out_Of_Memory + return {}, .Unable_To_Allocate_Or_Resize } p16 := mem.slice_data_cast([]u16, temp.buf[:]) @@ -1027,7 +1027,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a dest_raw_size := compute_buffer_size(int(header.width), int(header.height), out_image_channels, 8) t := bytes.Buffer{} if !resize(&t.buf, dest_raw_size) { - return {}, mem.Allocator_Error.Out_Of_Memory + return {}, .Unable_To_Allocate_Or_Resize } p := mem.slice_data_cast([]u8, temp.buf[:]) @@ -1535,7 +1535,7 @@ defilter :: proc(img: ^Image, filter_bytes: ^bytes.Buffer, header: ^image.PNG_IH num_bytes := compute_buffer_size(width, height, channels, depth == 16 ? 16 : 8) if !resize(&img.pixels.buf, num_bytes) { - return mem.Allocator_Error.Out_Of_Memory + return .Unable_To_Allocate_Or_Resize } filter_ok: bool @@ -1577,7 +1577,7 @@ defilter :: proc(img: ^Image, filter_bytes: ^bytes.Buffer, header: ^image.PNG_IH temp: bytes.Buffer temp_len := compute_buffer_size(x, y, channels, depth == 16 ? 16 : 8) if !resize(&temp.buf, temp_len) { - return mem.Allocator_Error.Out_Of_Memory + return .Unable_To_Allocate_Or_Resize } params := Filter_Params{ diff --git a/core/image/qoi/qoi.odin b/core/image/qoi/qoi.odin index fdbaab686..83b212be8 100644 --- a/core/image/qoi/qoi.odin +++ b/core/image/qoi/qoi.odin @@ -12,14 +12,12 @@ // The QOI specification is at https://qoiformat.org. package qoi -import "core:mem" import "core:image" import "core:compress" import "core:bytes" import "core:os" Error :: image.Error -General :: compress.General_Error Image :: image.Image Options :: image.Options @@ -57,7 +55,7 @@ save_to_memory :: proc(output: ^bytes.Buffer, img: ^Image, options := Options{} max_size := pixels * (img.channels + 1) + size_of(image.QOI_Header) + size_of(u64be) if !resize(&output.buf, max_size) { - return General.Resize_Failed + return .Unable_To_Allocate_Or_Resize } header := image.QOI_Header{ @@ -177,7 +175,7 @@ save_to_file :: proc(output: string, img: ^Image, options := Options{}, allocato save_to_memory(out, img, options) or_return write_ok := os.write_entire_file(output, out.buf[:]) - return nil if write_ok else General.Cannot_Open_File + return nil if write_ok else .Unable_To_Write_File } save :: proc{save_to_memory, save_to_file} @@ -201,7 +199,7 @@ load_from_file :: proc(filename: string, options := Options{}, allocator := cont return load_from_slice(data, options) } else { img = new(Image) - return img, compress.General_Error.File_Not_Found + return img, .Unable_To_Read_File } } @@ -221,7 +219,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a header := image.read_data(ctx, image.QOI_Header) or_return if header.magic != image.QOI_Magic { - return img, .Invalid_QOI_Signature + return img, .Invalid_Signature } if img == nil { @@ -264,7 +262,7 @@ load_from_context :: proc(ctx: ^$C, options := Options{}, allocator := context.a bytes_needed := image.compute_buffer_size(int(header.width), int(header.height), img.channels, 8) if !resize(&img.pixels.buf, bytes_needed) { - return img, mem.Allocator_Error.Out_Of_Memory + return img, .Unable_To_Allocate_Or_Resize } /* diff --git a/core/image/tga/tga.odin b/core/image/tga/tga.odin index 3c860cb62..0539706b3 100644 --- a/core/image/tga/tga.odin +++ b/core/image/tga/tga.odin @@ -17,7 +17,6 @@ import "core:bytes" import "core:os" Error :: image.Error -General :: compress.General_Error Image :: image.Image Options :: image.Options @@ -55,7 +54,7 @@ save_to_memory :: proc(output: ^bytes.Buffer, img: ^Image, options := Options{} necessary := pixels * img.channels + size_of(image.TGA_Header) if !resize(&output.buf, necessary) { - return General.Resize_Failed + return .Unable_To_Allocate_Or_Resize } header := image.TGA_Header{ @@ -97,7 +96,7 @@ save_to_file :: proc(output: string, img: ^Image, options := Options{}, allocato save_to_memory(out, img, options) or_return write_ok := os.write_entire_file(output, out.buf[:]) - return nil if write_ok else General.Cannot_Open_File + return nil if write_ok else .Unable_To_Write_File } save :: proc{save_to_memory, save_to_file} \ No newline at end of file diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index 0c11ca5ae..c328757e4 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -1199,37 +1199,37 @@ Corrupt_PNG_Tests := []PNG_Test{ { "xs1n0g01", // signature byte 1 MSBit reset to zero { - {Default, .Invalid_PNG_Signature, {}, 0x_0000_0000}, + {Default, .Invalid_Signature, {}, 0x_0000_0000}, }, }, { "xs2n0g01", // signature byte 2 is a 'Q' { - {Default, .Invalid_PNG_Signature, {}, 0x_0000_0000}, + {Default, .Invalid_Signature, {}, 0x_0000_0000}, }, }, { "xs4n0g01", // signature byte 4 lowercase { - {Default, .Invalid_PNG_Signature, {}, 0x_0000_0000}, + {Default, .Invalid_Signature, {}, 0x_0000_0000}, }, }, { "xs7n0g01", // 7th byte a space instead of control-Z { - {Default, .Invalid_PNG_Signature, {}, 0x_0000_0000}, + {Default, .Invalid_Signature, {}, 0x_0000_0000}, }, }, { "xcrn0g04", // added cr bytes { - {Default, .Invalid_PNG_Signature, {}, 0x_0000_0000}, + {Default, .Invalid_Signature, {}, 0x_0000_0000}, }, }, { "xlfn0g04", // added lf bytes { - {Default, .Invalid_PNG_Signature, {}, 0x_0000_0000}, + {Default, .Invalid_Signature, {}, 0x_0000_0000}, }, }, { From 3978e7e1cac9305698e9270fec02d7cd9557cf35 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 14:43:58 +0200 Subject: [PATCH 135/245] [xml] Add `parse_from_string` overload. `parse` now takes either a `[]u8` slice or a string. `load_from_file` takes a path string. --- core/encoding/xml/xml_reader.odin | 13 ++++++++++--- tests/core/encoding/xml/test_core_xml.odin | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index 6d0d4e1aa..151d44e2a 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -493,7 +493,16 @@ parse_from_slice :: proc(data: []u8, options := DEFAULT_Options, path := "", err return doc, .None } -parse_from_file :: proc(filename: string, options := DEFAULT_Options, error_handler := default_error_handler, allocator := context.allocator) -> (doc: ^Document, err: Error) { +parse_from_string :: proc(data: string, options := DEFAULT_Options, path := "", error_handler := default_error_handler, allocator := context.allocator) -> (doc: ^Document, err: Error) { + _data := transmute([]u8)data + + return parse_from_slice(_data, options, path, error_handler, allocator) +} + +parse :: proc { parse_from_string, parse_from_slice } + +// Load an XML file +load_from_file :: proc(filename: string, options := DEFAULT_Options, error_handler := default_error_handler, allocator := context.allocator) -> (doc: ^Document, err: Error) { context.allocator = allocator options := options @@ -505,8 +514,6 @@ parse_from_file :: proc(filename: string, options := DEFAULT_Options, error_hand return parse_from_slice(data, options, filename, error_handler, allocator) } -parse :: proc { parse_from_file, parse_from_slice } - destroy :: proc(doc: ^Document) { if doc == nil { return } diff --git a/tests/core/encoding/xml/test_core_xml.odin b/tests/core/encoding/xml/test_core_xml.odin index 07cbc1779..c8b02b635 100644 --- a/tests/core/encoding/xml/test_core_xml.odin +++ b/tests/core/encoding/xml/test_core_xml.odin @@ -295,7 +295,7 @@ run_tests :: proc(t: ^testing.T) { path := test_file_path(test.filename) log(t, fmt.tprintf("Trying to parse %v", path)) - doc, err := xml.parse(path, test.options, Silent) + doc, err := xml.load_from_file(path, test.options, Silent) defer xml.destroy(doc) tree_string := doc_to_string(doc) From d24bebdb9eb6a0a1e733fc2b325bc3472c648af9 Mon Sep 17 00:00:00 2001 From: hikari Date: Sat, 30 Apr 2022 16:55:26 +0300 Subject: [PATCH 136/245] sys/windows: add a couple procedures and tons of constants --- core/sys/windows/system_params.odin | 271 ++++++++++++++++++++++++++++ core/sys/windows/user32.odin | 4 + 2 files changed, 275 insertions(+) create mode 100644 core/sys/windows/system_params.odin diff --git a/core/sys/windows/system_params.odin b/core/sys/windows/system_params.odin new file mode 100644 index 000000000..e94d777bf --- /dev/null +++ b/core/sys/windows/system_params.odin @@ -0,0 +1,271 @@ +// +build windows +package sys_windows + +// Parameter for SystemParametersInfo. +SPI_GETBEEP :: 0x0001 +SPI_SETBEEP :: 0x0002 +SPI_GETMOUSE :: 0x0003 +SPI_SETMOUSE :: 0x0004 +SPI_GETBORDER :: 0x0005 +SPI_SETBORDER :: 0x0006 +SPI_GETKEYBOARDSPEED :: 0x000A +SPI_SETKEYBOARDSPEED :: 0x000B +SPI_LANGDRIVER :: 0x000C +SPI_ICONHORIZONTALSPACING :: 0x000D +SPI_GETSCREENSAVETIMEOUT :: 0x000E +SPI_SETSCREENSAVETIMEOUT :: 0x000F +SPI_GETSCREENSAVEACTIVE :: 0x0010 +SPI_SETSCREENSAVEACTIVE :: 0x0011 +SPI_GETGRIDGRANULARITY :: 0x0012 +SPI_SETGRIDGRANULARITY :: 0x0013 +SPI_SETDESKWALLPAPER :: 0x0014 +SPI_SETDESKPATTERN :: 0x0015 +SPI_GETKEYBOARDDELAY :: 0x0016 +SPI_SETKEYBOARDDELAY :: 0x0017 +SPI_ICONVERTICALSPACING :: 0x0018 +SPI_GETICONTITLEWRAP :: 0x0019 +SPI_SETICONTITLEWRAP :: 0x001A +SPI_GETMENUDROPALIGNMENT :: 0x001B +SPI_SETMENUDROPALIGNMENT :: 0x001C +SPI_SETDOUBLECLKWIDTH :: 0x001D +SPI_SETDOUBLECLKHEIGHT :: 0x001E +SPI_GETICONTITLELOGFONT :: 0x001F +SPI_SETDOUBLECLICKTIME :: 0x0020 +SPI_SETMOUSEBUTTONSWAP :: 0x0021 +SPI_SETICONTITLELOGFONT :: 0x0022 +SPI_GETFASTTASKSWITCH :: 0x0023 +SPI_SETFASTTASKSWITCH :: 0x0024 + +SPI_SETDRAGFULLWINDOWS :: 0x0025 +SPI_GETDRAGFULLWINDOWS :: 0x0026 +SPI_GETNONCLIENTMETRICS :: 0x0029 +SPI_SETNONCLIENTMETRICS :: 0x002A +SPI_GETMINIMIZEDMETRICS :: 0x002B +SPI_SETMINIMIZEDMETRICS :: 0x002C +SPI_GETICONMETRICS :: 0x002D +SPI_SETICONMETRICS :: 0x002E +SPI_SETWORKAREA :: 0x002F +SPI_GETWORKAREA :: 0x0030 +SPI_SETPENWINDOWS :: 0x0031 +SPI_GETHIGHCONTRAST :: 0x0042 +SPI_SETHIGHCONTRAST :: 0x0043 +SPI_GETKEYBOARDPREF :: 0x0044 +SPI_SETKEYBOARDPREF :: 0x0045 +SPI_GETSCREENREADER :: 0x0046 +SPI_SETSCREENREADER :: 0x0047 +SPI_GETANIMATION :: 0x0048 +SPI_SETANIMATION :: 0x0049 +SPI_GETFONTSMOOTHING :: 0x004A +SPI_SETFONTSMOOTHING :: 0x004B +SPI_SETDRAGWIDTH :: 0x004C +SPI_SETDRAGHEIGHT :: 0x004D +SPI_SETHANDHELD :: 0x004E +SPI_GETLOWPOWERTIMEOUT :: 0x004F +SPI_GETPOWEROFFTIMEOUT :: 0x0050 +SPI_SETLOWPOWERTIMEOUT :: 0x0051 +SPI_SETPOWEROFFTIMEOUT :: 0x0052 +SPI_GETLOWPOWERACTIVE :: 0x0053 +SPI_GETPOWEROFFACTIVE :: 0x0054 +SPI_SETLOWPOWERACTIVE :: 0x0055 +SPI_SETPOWEROFFACTIVE :: 0x0056 +SPI_SETCURSORS :: 0x0057 +SPI_SETICONS :: 0x0058 +SPI_GETDEFAULTINPUTLANG :: 0x0059 +SPI_SETDEFAULTINPUTLANG :: 0x005A +SPI_SETLANGTOGGLE :: 0x005B +SPI_GETWINDOWSEXTENSION :: 0x005C +SPI_SETMOUSETRAILS :: 0x005D +SPI_GETMOUSETRAILS :: 0x005E +SPI_SETSCREENSAVERRUNNING :: 0x0061 + +SPI_SCREENSAVERRUNNING :: SPI_SETSCREENSAVERRUNNING +SPI_GETFILTERKEYS :: 0x0032 +SPI_SETFILTERKEYS :: 0x0033 +SPI_GETTOGGLEKEYS :: 0x0034 +SPI_SETTOGGLEKEYS :: 0x0035 +SPI_GETMOUSEKEYS :: 0x0036 +SPI_SETMOUSEKEYS :: 0x0037 +SPI_GETSHOWSOUNDS :: 0x0038 +SPI_SETSHOWSOUNDS :: 0x0039 +SPI_GETSTICKYKEYS :: 0x003A +SPI_SETSTICKYKEYS :: 0x003B +SPI_GETACCESSTIMEOUT :: 0x003C +SPI_SETACCESSTIMEOUT :: 0x003D +SPI_GETSERIALKEYS :: 0x003E +SPI_SETSERIALKEYS :: 0x003F +SPI_GETSOUNDSENTRY :: 0x0040 +SPI_SETSOUNDSENTRY :: 0x0041 +SPI_GETSNAPTODEFBUTTON :: 0x005F +SPI_SETSNAPTODEFBUTTON :: 0x0060 +SPI_GETMOUSEHOVERWIDTH :: 0x0062 +SPI_SETMOUSEHOVERWIDTH :: 0x0063 +SPI_GETMOUSEHOVERHEIGHT :: 0x0064 +SPI_SETMOUSEHOVERHEIGHT :: 0x0065 +SPI_GETMOUSEHOVERTIME :: 0x0066 +SPI_SETMOUSEHOVERTIME :: 0x0067 +SPI_GETWHEELSCROLLLINES :: 0x0068 +SPI_SETWHEELSCROLLLINES :: 0x0069 +SPI_GETMENUSHOWDELAY :: 0x006A +SPI_SETMENUSHOWDELAY :: 0x006B + +SPI_GETWHEELSCROLLCHARS :: 0x006C +SPI_SETWHEELSCROLLCHARS :: 0x006D +SPI_GETSHOWIMEUI :: 0x006E +SPI_SETSHOWIMEUI :: 0x006F +SPI_GETMOUSESPEED :: 0x0070 +SPI_SETMOUSESPEED :: 0x0071 +SPI_GETSCREENSAVERRUNNING :: 0x0072 +SPI_GETDESKWALLPAPER :: 0x0073 +SPI_GETAUDIODESCRIPTION :: 0x0074 +SPI_SETAUDIODESCRIPTION :: 0x0075 +SPI_GETSCREENSAVESECURE :: 0x0076 +SPI_SETSCREENSAVESECURE :: 0x0077 + +SPI_GETHUNGAPPTIMEOUT :: 0x0078 +SPI_SETHUNGAPPTIMEOUT :: 0x0079 +SPI_GETWAITTOKILLTIMEOUT :: 0x007A +SPI_SETWAITTOKILLTIMEOUT :: 0x007B +SPI_GETWAITTOKILLSERVICETIMEOUT :: 0x007C +SPI_SETWAITTOKILLSERVICETIMEOUT :: 0x007D +SPI_GETMOUSEDOCKTHRESHOLD :: 0x007E +SPI_SETMOUSEDOCKTHRESHOLD :: 0x007F +SPI_GETPENDOCKTHRESHOLD :: 0x0080 +SPI_SETPENDOCKTHRESHOLD :: 0x0081 +SPI_GETWINARRANGING :: 0x0082 +SPI_SETWINARRANGING :: 0x0083 +SPI_GETMOUSEDRAGOUTTHRESHOLD :: 0x0084 +SPI_SETMOUSEDRAGOUTTHRESHOLD :: 0x0085 +SPI_GETPENDRAGOUTTHRESHOLD :: 0x0086 +SPI_SETPENDRAGOUTTHRESHOLD :: 0x0087 +SPI_GETMOUSESIDEMOVETHRESHOLD :: 0x0088 +SPI_SETMOUSESIDEMOVETHRESHOLD :: 0x0089 +SPI_GETPENSIDEMOVETHRESHOLD :: 0x008A +SPI_SETPENSIDEMOVETHRESHOLD :: 0x008B +SPI_GETDRAGFROMMAXIMIZE :: 0x008C +SPI_SETDRAGFROMMAXIMIZE :: 0x008D +SPI_GETSNAPSIZING :: 0x008E +SPI_SETSNAPSIZING :: 0x008F +SPI_GETDOCKMOVING :: 0x0090 +SPI_SETDOCKMOVING :: 0x0091 + +SPI_GETACTIVEWINDOWTRACKING :: 0x1000 +SPI_SETACTIVEWINDOWTRACKING :: 0x1001 +SPI_GETMENUANIMATION :: 0x1002 +SPI_SETMENUANIMATION :: 0x1003 +SPI_GETCOMBOBOXANIMATION :: 0x1004 +SPI_SETCOMBOBOXANIMATION :: 0x1005 +SPI_GETLISTBOXSMOOTHSCROLLING :: 0x1006 +SPI_SETLISTBOXSMOOTHSCROLLING :: 0x1007 +SPI_GETGRADIENTCAPTIONS :: 0x1008 +SPI_SETGRADIENTCAPTIONS :: 0x1009 +SPI_GETKEYBOARDCUES :: 0x100A +SPI_SETKEYBOARDCUES :: 0x100B +SPI_GETMENUUNDERLINES :: SPI_GETKEYBOARDCUES +SPI_SETMENUUNDERLINES :: SPI_SETKEYBOARDCUES +SPI_GETACTIVEWNDTRKZORDER :: 0x100C +SPI_SETACTIVEWNDTRKZORDER :: 0x100D +SPI_GETHOTTRACKING :: 0x100E +SPI_SETHOTTRACKING :: 0x100F +SPI_GETMENUFADE :: 0x1012 +SPI_SETMENUFADE :: 0x1013 +SPI_GETSELECTIONFADE :: 0x1014 +SPI_SETSELECTIONFADE :: 0x1015 +SPI_GETTOOLTIPANIMATION :: 0x1016 +SPI_SETTOOLTIPANIMATION :: 0x1017 +SPI_GETTOOLTIPFADE :: 0x1018 +SPI_SETTOOLTIPFADE :: 0x1019 +SPI_GETCURSORSHADOW :: 0x101A +SPI_SETCURSORSHADOW :: 0x101B +SPI_GETMOUSESONAR :: 0x101C +SPI_SETMOUSESONAR :: 0x101D +SPI_GETMOUSECLICKLOCK :: 0x101E +SPI_SETMOUSECLICKLOCK :: 0x101F +SPI_GETMOUSEVANISH :: 0x1020 +SPI_SETMOUSEVANISH :: 0x1021 +SPI_GETFLATMENU :: 0x1022 +SPI_SETFLATMENU :: 0x1023 +SPI_GETDROPSHADOW :: 0x1024 +SPI_SETDROPSHADOW :: 0x1025 +SPI_GETBLOCKSENDINPUTRESETS :: 0x1026 +SPI_SETBLOCKSENDINPUTRESETS :: 0x1027 +SPI_GETUIEFFECTS :: 0x103E +SPI_SETUIEFFECTS :: 0x103F +SPI_GETDISABLEOVERLAPPEDCONTENT :: 0x1040 +SPI_SETDISABLEOVERLAPPEDCONTENT :: 0x1041 +SPI_GETCLIENTAREAANIMATION :: 0x1042 +SPI_SETCLIENTAREAANIMATION :: 0x1043 +SPI_GETCLEARTYPE :: 0x1048 +SPI_SETCLEARTYPE :: 0x1049 +SPI_GETSPEECHRECOGNITION :: 0x104A +SPI_SETSPEECHRECOGNITION :: 0x104B +SPI_GETCARETBROWSING :: 0x104C +SPI_SETCARETBROWSING :: 0x104D +SPI_GETTHREADLOCALINPUTSETTINGS :: 0x104E +SPI_SETTHREADLOCALINPUTSETTINGS :: 0x104F +SPI_GETSYSTEMLANGUAGEBAR :: 0x1050 +SPI_SETSYSTEMLANGUAGEBAR :: 0x1051 +SPI_GETFOREGROUNDLOCKTIMEOUT :: 0x2000 +SPI_SETFOREGROUNDLOCKTIMEOUT :: 0x2001 +SPI_GETACTIVEWNDTRKTIMEOUT :: 0x2002 +SPI_SETACTIVEWNDTRKTIMEOUT :: 0x2003 +SPI_GETFOREGROUNDFLASHCOUNT :: 0x2004 +SPI_SETFOREGROUNDFLASHCOUNT :: 0x2005 +SPI_GETCARETWIDTH :: 0x2006 +SPI_SETCARETWIDTH :: 0x2007 +SPI_GETMOUSECLICKLOCKTIME :: 0x2008 +SPI_SETMOUSECLICKLOCKTIME :: 0x2009 +SPI_GETFONTSMOOTHINGTYPE :: 0x200A +SPI_SETFONTSMOOTHINGTYPE :: 0x200B +// constants for SPI_GETFONTSMOOTHINGTYPE and SPI_SETFONTSMOOTHINGTYPE: +FE_FONTSMOOTHINGSTANDARD :: 0x0001 +FE_FONTSMOOTHINGCLEARTYPE :: 0x0002 + +SPI_GETFONTSMOOTHINGCONTRAST :: 0x200C +SPI_SETFONTSMOOTHINGCONTRAST :: 0x200D + +SPI_GETFOCUSBORDERWIDTH :: 0x200E +SPI_SETFOCUSBORDERWIDTH :: 0x200F +SPI_GETFOCUSBORDERHEIGHT :: 0x2010 +SPI_SETFOCUSBORDERHEIGHT :: 0x2011 + +SPI_GETFONTSMOOTHINGORIENTATION :: 0x2012 +SPI_SETFONTSMOOTHINGORIENTATION :: 0x2013 + +// constants for SPI_GETFONTSMOOTHINGORIENTATION and SPI_SETFONTSMOOTHINGORIENTATION: +FE_FONTSMOOTHINGORIENTATIONBGR :: 0x0000 +FE_FONTSMOOTHINGORIENTATIONRGB :: 0x0001 + +SPI_GETMINIMUMHITRADIUS :: 0x2014 +SPI_SETMINIMUMHITRADIUS :: 0x2015 +SPI_GETMESSAGEDURATION :: 0x2016 +SPI_SETMESSAGEDURATION :: 0x2017 + +SPI_GETCONTACTVISUALIZATION :: 0x2018 +SPI_SETCONTACTVISUALIZATION :: 0x2019 +// constants for SPI_GETCONTACTVISUALIZATION and SPI_SETCONTACTVISUALIZATION +CONTACTVISUALIZATION_OFF :: 0x0000 +CONTACTVISUALIZATION_ON :: 0x0001 +CONTACTVISUALIZATION_PRESENTATIONMODE :: 0x0002 + +SPI_GETGESTUREVISUALIZATION :: 0x201A +SPI_SETGESTUREVISUALIZATION :: 0x201B +// constants for SPI_GETGESTUREVISUALIZATION and SPI_SETGESTUREVISUALIZATION +GESTUREVISUALIZATION_OFF :: 0x0000 +GESTUREVISUALIZATION_ON :: 0x001F +GESTUREVISUALIZATION_TAP :: 0x0001 +GESTUREVISUALIZATION_DOUBLETAP :: 0x0002 +GESTUREVISUALIZATION_PRESSANDTAP :: 0x0004 +GESTUREVISUALIZATION_PRESSANDHOLD :: 0x0008 +GESTUREVISUALIZATION_RIGHTTAP :: 0x0010 + +SPI_GETMOUSEWHEELROUTING :: 0x201C +SPI_SETMOUSEWHEELROUTING :: 0x201D + +MOUSEWHEEL_ROUTING_FOCUS :: 0 +MOUSEWHEEL_ROUTING_HYBRID :: 1 +MOUSEWHEEL_ROUTING_MOUSE_POS :: 2 + +// Flags +SPIF_UPDATEINIFILE :: 0x0001 +SPIF_SENDWININICHANGE :: 0x0002 +SPIF_SENDCHANGE :: SPIF_SENDWININICHANGE diff --git a/core/sys/windows/user32.odin b/core/sys/windows/user32.odin index dd45df42a..6f42267db 100644 --- a/core/sys/windows/user32.odin +++ b/core/sys/windows/user32.odin @@ -114,10 +114,14 @@ foreign user32 { cy: c_int, uFlags: UINT, ) -> BOOL --- + MoveWindow :: proc(hWnd: HWND, X, Y, hWidth, hHeight: c_int, bRepaint: BOOL) -> BOOL --- GetSystemMetrics :: proc(nIndex: c_int) -> c_int --- AdjustWindowRect :: proc(lpRect: LPRECT, dwStyle: DWORD, bMenu: BOOL) -> BOOL --- AdjustWindowRectEx :: proc(lpRect: LPRECT, dwStyle: DWORD, bMenu: BOOL, dwExStyle: DWORD) -> BOOL --- + SystemParametersInfoA :: proc(uiAction, uiParam: UINT, pvParam: PVOID, fWinIni: UINT) -> BOOL --- + SystemParametersInfoW :: proc(uiAction, uiParam: UINT, pvParam: PVOID, fWinIni: UINT) -> BOOL --- + GetWindowDC :: proc(hWnd: HWND) -> HDC --- GetDC :: proc(hWnd: HWND) -> HDC --- ReleaseDC :: proc(hWnd: HWND, hDC: HDC) -> c_int --- From dd8b71e353bc72eecf95ca2ae45c437dc01e89bf Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 17:52:23 +0200 Subject: [PATCH 137/245] [pbm] WIP unit tests. --- core/image/netpbm/helpers.odin | 1 + core/image/netpbm/netpbm.odin | 138 +++++++++++++++++++++----- tests/core/image/test_core_image.odin | 58 ++++++++--- 3 files changed, 155 insertions(+), 42 deletions(-) diff --git a/core/image/netpbm/helpers.odin b/core/image/netpbm/helpers.odin index 5a3000a87..8c5cdd622 100644 --- a/core/image/netpbm/helpers.odin +++ b/core/image/netpbm/helpers.odin @@ -14,6 +14,7 @@ destroy :: proc(img: ^image.Image) -> bool { header_destroy(&info.header) free(info) img.metadata = nil + free(img) return true } diff --git a/core/image/netpbm/netpbm.odin b/core/image/netpbm/netpbm.odin index 54935d6c6..cccf7e865 100644 --- a/core/image/netpbm/netpbm.odin +++ b/core/image/netpbm/netpbm.odin @@ -31,19 +31,19 @@ load :: proc { load_from_buffer, } -load_from_file :: proc(filename: string, allocator := context.allocator) -> (img: Image, err: Error) { +load_from_file :: proc(filename: string, allocator := context.allocator) -> (img: ^Image, err: Error) { context.allocator = allocator data, ok := os.read_entire_file(filename); defer delete(data) if !ok { - err = .File_Not_Readable + err = .Unable_To_Read_File return } - return read_from_buffer(data) + return load_from_buffer(data) } -load_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: Image, err: Error) { +load_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: ^Image, err: Error) { context.allocator = allocator header: Header; defer header_destroy(&header) @@ -51,7 +51,9 @@ load_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: header, header_size = parse_header(data) or_return img_data := data[header_size:] - img = decode_image(header, img_data) or_return + + img = new(Image) + decode_image(img, header, img_data) or_return info := new(Info) info.header = header @@ -69,27 +71,42 @@ save :: proc { save_to_buffer, } -save_to_file :: proc(filename: string, img: Image, allocator := context.allocator) -> (err: Error) { +save_to_file :: proc(filename: string, img: ^Image, custom_info: Info = {}, allocator := context.allocator) -> (err: Error) { context.allocator = allocator data: []byte; defer delete(data) - data = write_to_buffer(img) or_return + data = save_to_buffer(img, custom_info) or_return if ok := os.write_entire_file(filename, data); !ok { - return .File_Not_Writable + return .Unable_To_Write_File } return Format_Error.None } -save_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: []byte, err: Error) { +save_to_buffer :: proc(img: ^Image, custom_info: Info = {}, allocator := context.allocator) -> (buffer: []byte, err: Error) { context.allocator = allocator - info, ok := img.metadata.(^image.Netpbm_Info) - if !ok { - err = image.General_Image_Error.Invalid_Input_Image - return + info: Info = {} + if custom_info.header.width > 0 { + // Custom info has been set, use it. + info = custom_info + } else { + img_info, ok := img.metadata.(^image.Netpbm_Info) + if !ok { + // image doesn't have .Netpbm info, guess it + auto_info, auto_info_found := autoselect_pbm_format_from_image(img) + if auto_info_found { + info = auto_info + } else { + return {}, .Invalid_Input_Image + } + } else { + // use info as stored on image + info = img_info^ + } } + // using info so we can just talk about the header using info @@ -103,11 +120,11 @@ save_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: [ if header.format in (PNM + PAM) { if header.maxval <= int(max(u8)) && img.depth != 8 \ || header.maxval > int(max(u8)) && header.maxval <= int(max(u16)) && img.depth != 16 { - err = Format_Error.Invalid_Image_Depth + err = .Invalid_Image_Depth return } } else if header.format in PFM && img.depth != 32 { - err = Format_Error.Invalid_Image_Depth + err = .Invalid_Image_Depth return } @@ -233,11 +250,11 @@ save_to_buffer :: proc(img: Image, allocator := context.allocator) -> (buffer: [ } case: - return data.buf[:], Format_Error.Invalid_Image_Depth + return data.buf[:], .Invalid_Image_Depth } case: - return data.buf[:], Format_Error.Invalid_Format + return data.buf[:], .Invalid_Format } return data.buf[:], Format_Error.None @@ -263,7 +280,7 @@ parse_header :: proc(data: []byte, allocator := context.allocator) -> (header: H } } - err = Format_Error.Invalid_Signature + err = .Invalid_Signature return } @@ -366,7 +383,7 @@ _parse_header_pam :: proc(data: []byte, allocator := context.allocator) -> (head // the spec needs the newline apparently if string(data[0:3]) != "P7\n" { - err = Format_Error.Invalid_Signature + err = .Invalid_Signature return } header.format = .P7 @@ -468,7 +485,7 @@ _parse_header_pfm :: proc(data: []byte) -> (header: Header, length: int, err: Er header.format = .PF header.channels = 3 case: - err = Format_Error.Invalid_Signature + err = .Invalid_Signature return } @@ -531,18 +548,18 @@ _parse_header_pfm :: proc(data: []byte) -> (header: Header, length: int, err: Er return } -decode_image :: proc(header: Header, data: []byte, allocator := context.allocator) -> (img: Image, err: Error) { +decode_image :: proc(img: ^Image, header: Header, data: []byte, allocator := context.allocator) -> (err: Error) { + assert(img != nil) context.allocator = allocator - img = Image { - width = header.width, - height = header.height, - channels = header.channels, - depth = header.depth, - } + img.width = header.width + img.height = header.height + img.channels = header.channels + img.depth = header.depth buffer_size := image.compute_buffer_size(img.width, img.height, img.channels, img.depth) + when false { // we can check data size for binary formats if header.format in BINARY { if header.format == .P4 { @@ -558,6 +575,7 @@ decode_image :: proc(header: Header, data: []byte, allocator := context.allocato } } } + } // for ASCII and P4, we use length for the termination condition, so start at 0 // BINARY will be a simple memcopy so the buffer length should also be initialised @@ -665,4 +683,70 @@ decode_image :: proc(header: Header, data: []byte, allocator := context.allocato err = Format_Error.None return +} + +// Automatically try to select an appropriate format to save to based on `img.channel` and `img.depth` +autoselect_pbm_format_from_image :: proc(img: ^Image, prefer_binary := true, force_black_and_white := false, pfm_scale := f32(1.0)) -> (res: Info, ok: bool) { + /* + PBM (P1, P4): Portable Bit Map, stores black and white images (1 channel) + PGM (P2, P5): Portable Gray Map, stores greyscale images (1 channel, 1 or 2 bytes per value) + PPM (P3, P6): Portable Pixel Map, stores colour images (3 channel, 1 or 2 bytes per value) + PAM (P7 ): Portable Arbitrary Map, stores arbitrary channel images (1 or 2 bytes per value) + PFM (Pf, PF): Portable Float Map, stores floating-point images (Pf: 1 channel, PF: 3 channel) + + ASCII :: Formats{.P1, .P2, .P3} + */ + using res.header + + width = img.width + height = img.height + channels = img.channels + depth = img.depth + maxval = 255 if img.depth == 8 else 65535 + little_endian = true if ODIN_ENDIAN == .Little else false + + // Assume we'll find a suitable format + ok = true + + switch img.channels { + case 1: + // Must be Portable Float Map + if img.depth == 32 { + format = .Pf + return + } + + if force_black_and_white { + // Portable Bit Map + format = .P4 if prefer_binary else .P1 + maxval = 1 + return + } else { + // Portable Gray Map + format = .P5 if prefer_binary else .P2 + return + } + + case 3: + // Must be Portable Float Map + if img.depth == 32 { + format = .PF + return + } + + // Portable Pixel Map + format = .P6 if prefer_binary else .P3 + return + + case: + // Portable Arbitrary Map + if img.depth == 8 || img.depth == 16 { + format = .P7 + scale = pfm_scale + return + } + } + + // We couldn't find a suitable format + return {}, false } \ No newline at end of file diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index c328757e4..1ffd3b93d 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -13,6 +13,7 @@ import "core:testing" import "core:compress" import "core:image" +import pbm "core:image/netpbm" import "core:image/png" import "core:image/qoi" @@ -1506,26 +1507,53 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { passed &= test.hash == png_hash - // Roundtrip through QOI to test the QOI encoder and decoder. - if passed && img.depth == 8 && (img.channels == 3 || img.channels == 4) { - qoi_buffer: bytes.Buffer - defer bytes.buffer_destroy(&qoi_buffer) - qoi_save_err := qoi.save(&qoi_buffer, img) + if passed { + // Roundtrip through QOI to test the QOI encoder and decoder. + if img.depth == 8 && (img.channels == 3 || img.channels == 4) { + qoi_buffer: bytes.Buffer + defer bytes.buffer_destroy(&qoi_buffer) + qoi_save_err := qoi.save(&qoi_buffer, img) - error = fmt.tprintf("%v test %v QOI save failed with %v.", file.file, count, qoi_save_err) - expect(t, qoi_save_err == nil, error) + error = fmt.tprintf("%v test %v QOI save failed with %v.", file.file, count, qoi_save_err) + expect(t, qoi_save_err == nil, error) - if qoi_save_err == nil { - qoi_img, qoi_load_err := qoi.load(qoi_buffer.buf[:]) - defer qoi.destroy(qoi_img) + if qoi_save_err == nil { + qoi_img, qoi_load_err := qoi.load(qoi_buffer.buf[:]) + defer qoi.destroy(qoi_img) - error = fmt.tprintf("%v test %v QOI load failed with %v.", file.file, count, qoi_load_err) - expect(t, qoi_load_err == nil, error) + error = fmt.tprintf("%v test %v QOI load failed with %v.", file.file, count, qoi_load_err) + expect(t, qoi_load_err == nil, error) - qoi_hash := hash.crc32(qoi_img.pixels.buf[:]) - error = fmt.tprintf("%v test %v QOI load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, qoi_hash, png_hash, test.options) - expect(t, qoi_hash == png_hash, error) + qoi_hash := hash.crc32(qoi_img.pixels.buf[:]) + error = fmt.tprintf("%v test %v QOI load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, qoi_hash, png_hash, test.options) + expect(t, qoi_hash == png_hash, error) + } } + + // Roundtrip through PBM to test the PBM encoders and decoders - prefer binary + pbm_buf, pbm_save_err := pbm.save_to_buffer(img) + defer delete(pbm_buf) + + error = fmt.tprintf("%v test %v PBM save failed with %v.", file.file, count, pbm_save_err) + expect(t, pbm_save_err == nil, error) + + if pbm_save_err == nil { + // Try to load it again. + pbm_img, pbm_load_err := pbm.load(pbm_buf) + defer pbm.destroy(pbm_img) + + if pbm_load_err == nil { + fmt.printf("%v test %v PBM load worked with %v.\n", file.file, count, pbm_load_err) + } + error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) + expect(t, pbm_load_err == nil, error) + } + + // Roundtrip through PBM to test the PBM encoders and decoders - prefer ASCII + // pbm_info, pbm_format_selected = pbm.autoselect_pbm_format_from_image(img, false) + // fmt.printf("Autoselect PBM: %v (%v)\n", pbm_info, pbm_format_selected) + + } if .return_metadata in test.options { From 234d52986776812641a2766de40e63798b55c857 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 19:25:16 +0200 Subject: [PATCH 138/245] [pbm] WIP unit tests. part deux. --- tests/core/image/test_core_image.odin | 28 +++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index 1ffd3b93d..93baa76ec 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -1534,6 +1534,9 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { pbm_buf, pbm_save_err := pbm.save_to_buffer(img) defer delete(pbm_buf) + filename := fmt.tprintf("%v-%v.ppm", file.file, count) + pbm.save_to_file(filename, img) + error = fmt.tprintf("%v test %v PBM save failed with %v.", file.file, count, pbm_save_err) expect(t, pbm_save_err == nil, error) @@ -1544,9 +1547,30 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { if pbm_load_err == nil { fmt.printf("%v test %v PBM load worked with %v.\n", file.file, count, pbm_load_err) + + pbm_hash := hash.crc32(pbm_img.pixels.buf[:]) + if pbm_hash == png_hash { + fmt.printf("\t%v test %v PBM load hash %08x matched PNG's\n", file.file, count, png_hash) + } else { + if img.width != pbm_img.width || img.height != pbm_img.height || img.channels != pbm_img.channels || img.depth != pbm_img.depth { + fmt.printf("\tHash failed. IMG: %v, %v, %v, %v PBM: %v, %v, %v, %v\n", img.width, img.height, img.channels, img.depth, pbm_img.width, pbm_img.height, pbm_img.channels, pbm_img.depth) + } else if len(img.pixels.buf) != len(pbm_img.pixels.buf) { + fmt.printf("\tLengths differ. IMG: %v PBM: %v\n", len(img.pixels.buf), len(pbm_img.pixels.buf)) + } else if file.file[:3] == "bas" { + for v, i in img.pixels.buf { + if v != pbm_img.pixels.buf[i] { + fmt.printf("\tChannels: %v, Depth: %v, Pixel %v differs. PNG: %v, PBM: %v\n", img.channels, img.depth, i, img.pixels.buf[i:][:4], pbm_img.pixels.buf[i:][:4]) + break + } + } + } + // error = fmt.tprintf("%v test %v PBM load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, pbm_hash, png_hash, test.options) + // expect(t, pbm_hash == png_hash, error) + } + } else { + // error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) + // expect(t, pbm_load_err == nil, error) } - error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) - expect(t, pbm_load_err == nil, error) } // Roundtrip through PBM to test the PBM encoders and decoders - prefer ASCII From 8bd16c32f3bbe724321127fcaaf798a1928cf0fe Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 21:00:32 +0200 Subject: [PATCH 139/245] [pbm] Fixes. --- core/image/netpbm/helpers.odin | 5 +- core/image/netpbm/netpbm.odin | 45 ++++++++-------- tests/core/image/test_core_image.odin | 76 ++++++++++++++------------- 3 files changed, 64 insertions(+), 62 deletions(-) diff --git a/core/image/netpbm/helpers.odin b/core/image/netpbm/helpers.odin index 8c5cdd622..2fbd32ecc 100644 --- a/core/image/netpbm/helpers.odin +++ b/core/image/netpbm/helpers.odin @@ -6,15 +6,16 @@ import "core:image" destroy :: proc(img: ^image.Image) -> bool { if img == nil do return false + defer free(img) + bytes.buffer_destroy(&img.pixels) + //! TEMP CAST info, ok := img.metadata.(^image.Netpbm_Info) if !ok do return false - bytes.buffer_destroy(&img.pixels) header_destroy(&info.header) free(info) img.metadata = nil - free(img) return true } diff --git a/core/image/netpbm/netpbm.odin b/core/image/netpbm/netpbm.odin index cccf7e865..768c06110 100644 --- a/core/image/netpbm/netpbm.odin +++ b/core/image/netpbm/netpbm.odin @@ -46,13 +46,13 @@ load_from_file :: proc(filename: string, allocator := context.allocator) -> (img load_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: ^Image, err: Error) { context.allocator = allocator + img = new(Image) + header: Header; defer header_destroy(&header) header_size: int header, header_size = parse_header(data) or_return img_data := data[header_size:] - - img = new(Image) decode_image(img, header, img_data) or_return info := new(Info) @@ -62,8 +62,7 @@ load_from_buffer :: proc(data: []byte, allocator := context.allocator) -> (img: } img.metadata = info - err = Format_Error.None - return + return img, nil } save :: proc { @@ -140,8 +139,14 @@ save_to_buffer :: proc(img: ^Image, custom_info: Info = {}, allocator := context fmt.sbprintf(&data, "%i\n", header.maxval) } } else if header.format in PAM { - fmt.sbprintf(&data, "WIDTH %i\nHEIGHT %i\nMAXVAL %i\nDEPTH %i\nTUPLTYPE %s\nENDHDR\n", - img.width, img.height, header.maxval, img.channels, header.tupltype) + if len(header.tupltype) > 0 { + fmt.sbprintf(&data, "WIDTH %i\nHEIGHT %i\nMAXVAL %i\nDEPTH %i\nTUPLTYPE %s\nENDHDR\n", + img.width, img.height, header.maxval, img.channels, header.tupltype) + } else { + fmt.sbprintf(&data, "WIDTH %i\nHEIGHT %i\nMAXVAL %i\nDEPTH %i\nENDHDR\n", + img.width, img.height, header.maxval, img.channels) + } + } else if header.format in PFM { scale := -header.scale if header.little_endian else header.scale fmt.sbprintf(&data, "%i %i\n%f\n", img.width, img.height, scale) @@ -369,10 +374,12 @@ _parse_header_pnm :: proc(data: []byte) -> (header: Header, length: int, err: Er if header.width < 1 \ || header.height < 1 \ || header.maxval < 1 || header.maxval > int(max(u16)) { - err = Format_Error.Invalid_Header_Value + fmt.printf("[pnm] Header: {{width = %v, height = %v, maxval: %v}}\n", header.width, header.height, header.maxval) + err = .Invalid_Header_Value return } + length -= 1 err = Format_Error.None return } @@ -427,7 +434,7 @@ _parse_header_pam :: proc(data: []byte, allocator := context.allocator) -> (head case "TUPLTYPE": if len(value) == 0 { - err = Format_Error.Invalid_Header_Value + err = .Invalid_Header_Value return } @@ -462,6 +469,7 @@ _parse_header_pam :: proc(data: []byte, allocator := context.allocator) -> (head || header.height < 1 \ || header.maxval < 1 \ || header.maxval > int(max(u16)) { + fmt.printf("[pam] Header: {{width = %v, height = %v, maxval: %v}}\n", header.width, header.height, header.maxval) err = Format_Error.Invalid_Header_Value return } @@ -540,7 +548,8 @@ _parse_header_pfm :: proc(data: []byte) -> (header: Header, length: int, err: Er if header.width < 1 \ || header.height < 1 \ || header.scale == 0.0 { - err = Format_Error.Invalid_Header_Value + fmt.printf("[pfm] Header: {{width = %v, height = %v, scale: %v}}\n", header.width, header.height, header.scale) + err = .Invalid_Header_Value return } @@ -559,23 +568,13 @@ decode_image :: proc(img: ^Image, header: Header, data: []byte, allocator := con buffer_size := image.compute_buffer_size(img.width, img.height, img.channels, img.depth) - when false { // we can check data size for binary formats if header.format in BINARY { - if header.format == .P4 { - p4_size := (img.width / 8 + 1) * img.height - if len(data) < p4_size { - err = Format_Error.Buffer_Too_Small - return - } - } else { - if len(data) < buffer_size { - err = Format_Error.Buffer_Too_Small - return - } + if len(data) < buffer_size { + fmt.printf("len(data): %v, buffer size: %v\n", len(data), buffer_size) + return .Buffer_Too_Small } } - } // for ASCII and P4, we use length for the termination condition, so start at 0 // BINARY will be a simple memcopy so the buffer length should also be initialised @@ -605,7 +604,7 @@ decode_image :: proc(img: ^Image, header: Header, data: []byte, allocator := con // Simple binary case .P5, .P6, .P7, .Pf, .PF: - mem.copy(raw_data(img.pixels.buf), raw_data(data), buffer_size) + copy(img.pixels.buf[:], data[:]) // convert to native endianness if header.format in PFM { diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index 93baa76ec..f1f1e1244 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -1530,54 +1530,56 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { } } - // Roundtrip through PBM to test the PBM encoders and decoders - prefer binary - pbm_buf, pbm_save_err := pbm.save_to_buffer(img) - defer delete(pbm_buf) + { + // Roundtrip through PBM to test the PBM encoders and decoders - prefer binary + pbm_buf, pbm_save_err := pbm.save_to_buffer(img) + defer delete(pbm_buf) - filename := fmt.tprintf("%v-%v.ppm", file.file, count) - pbm.save_to_file(filename, img) + error = fmt.tprintf("%v test %v PBM save failed with %v.", file.file, count, pbm_save_err) + expect(t, pbm_save_err == nil, error) - error = fmt.tprintf("%v test %v PBM save failed with %v.", file.file, count, pbm_save_err) - expect(t, pbm_save_err == nil, error) + if pbm_save_err == nil { + // Try to load it again. + pbm_img, pbm_load_err := pbm.load(pbm_buf) + defer pbm.destroy(pbm_img) - if pbm_save_err == nil { - // Try to load it again. - pbm_img, pbm_load_err := pbm.load(pbm_buf) - defer pbm.destroy(pbm_img) + error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) + expect(t, pbm_load_err == nil, error) - if pbm_load_err == nil { - fmt.printf("%v test %v PBM load worked with %v.\n", file.file, count, pbm_load_err) + if pbm_load_err == nil { + pbm_hash := hash.crc32(pbm_img.pixels.buf[:]) - pbm_hash := hash.crc32(pbm_img.pixels.buf[:]) - if pbm_hash == png_hash { - fmt.printf("\t%v test %v PBM load hash %08x matched PNG's\n", file.file, count, png_hash) - } else { - if img.width != pbm_img.width || img.height != pbm_img.height || img.channels != pbm_img.channels || img.depth != pbm_img.depth { - fmt.printf("\tHash failed. IMG: %v, %v, %v, %v PBM: %v, %v, %v, %v\n", img.width, img.height, img.channels, img.depth, pbm_img.width, pbm_img.height, pbm_img.channels, pbm_img.depth) - } else if len(img.pixels.buf) != len(pbm_img.pixels.buf) { - fmt.printf("\tLengths differ. IMG: %v PBM: %v\n", len(img.pixels.buf), len(pbm_img.pixels.buf)) - } else if file.file[:3] == "bas" { - for v, i in img.pixels.buf { - if v != pbm_img.pixels.buf[i] { - fmt.printf("\tChannels: %v, Depth: %v, Pixel %v differs. PNG: %v, PBM: %v\n", img.channels, img.depth, i, img.pixels.buf[i:][:4], pbm_img.pixels.buf[i:][:4]) - break - } - } - } - // error = fmt.tprintf("%v test %v PBM load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, pbm_hash, png_hash, test.options) - // expect(t, pbm_hash == png_hash, error) + error = fmt.tprintf("%v test %v PBM load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, pbm_hash, png_hash, test.options) + expect(t, pbm_hash == png_hash, error) } - } else { - // error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) - // expect(t, pbm_load_err == nil, error) } } - // Roundtrip through PBM to test the PBM encoders and decoders - prefer ASCII - // pbm_info, pbm_format_selected = pbm.autoselect_pbm_format_from_image(img, false) - // fmt.printf("Autoselect PBM: %v (%v)\n", pbm_info, pbm_format_selected) + { + // Roundtrip through PBM to test the PBM encoders and decoders - prefer ASCII + pbm_info, pbm_format_selected := pbm.autoselect_pbm_format_from_image(img, false) + pbm_buf, pbm_save_err := pbm.save_to_buffer(img, pbm_info) + defer delete(pbm_buf) + error = fmt.tprintf("%v test %v PBM save failed with %v.", file.file, count, pbm_save_err) + expect(t, pbm_save_err == nil, error) + if pbm_save_err == nil { + // Try to load it again. + pbm_img, pbm_load_err := pbm.load(pbm_buf) + defer pbm.destroy(pbm_img) + + error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) + expect(t, pbm_load_err == nil, error) + + if pbm_load_err == nil { + pbm_hash := hash.crc32(pbm_img.pixels.buf[:]) + + error = fmt.tprintf("%v test %v PBM load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, pbm_hash, png_hash, test.options) + expect(t, pbm_hash == png_hash, error) + } + } + } } if .return_metadata in test.options { From 7a032cf9f9818cfb566e91b7f5926bd7278daf07 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 21:57:14 +0200 Subject: [PATCH 140/245] [pbm] Also test PFM formats. --- tests/core/image/test_core_image.odin | 109 ++++++++++++++++++++++---- 1 file changed, 95 insertions(+), 14 deletions(-) diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index f1f1e1244..2ecc67151 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -1558,25 +1558,106 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { { // Roundtrip through PBM to test the PBM encoders and decoders - prefer ASCII pbm_info, pbm_format_selected := pbm.autoselect_pbm_format_from_image(img, false) - pbm_buf, pbm_save_err := pbm.save_to_buffer(img, pbm_info) - defer delete(pbm_buf) - error = fmt.tprintf("%v test %v PBM save failed with %v.", file.file, count, pbm_save_err) - expect(t, pbm_save_err == nil, error) + // We already tested the binary formats above. + if pbm_info.header.format in pbm.ASCII { + pbm_buf, pbm_save_err := pbm.save_to_buffer(img, pbm_info) + defer delete(pbm_buf) - if pbm_save_err == nil { - // Try to load it again. - pbm_img, pbm_load_err := pbm.load(pbm_buf) - defer pbm.destroy(pbm_img) + error = fmt.tprintf("%v test %v PBM save failed with %v.", file.file, count, pbm_save_err) + expect(t, pbm_save_err == nil, error) - error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) - expect(t, pbm_load_err == nil, error) + if pbm_save_err == nil { + // Try to load it again. + pbm_img, pbm_load_err := pbm.load(pbm_buf) + defer pbm.destroy(pbm_img) - if pbm_load_err == nil { - pbm_hash := hash.crc32(pbm_img.pixels.buf[:]) + error = fmt.tprintf("%v test %v PBM load failed with %v.", file.file, count, pbm_load_err) + expect(t, pbm_load_err == nil, error) - error = fmt.tprintf("%v test %v PBM load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, pbm_hash, png_hash, test.options) - expect(t, pbm_hash == png_hash, error) + if pbm_load_err == nil { + pbm_hash := hash.crc32(pbm_img.pixels.buf[:]) + + error = fmt.tprintf("%v test %v PBM load hash is %08x, expected it match PNG's %08x with %v.", file.file, count, pbm_hash, png_hash, test.options) + expect(t, pbm_hash == png_hash, error) + } + } + } + } + + { + // We still need to test Portable Float Maps + if (img.channels == 1 || img.channels == 3) && (img.depth == 8 || img.depth == 16) { + + // Make temporary float image + float_img := new(image.Image) + defer png.destroy(float_img) + + float_img.width = img.width + float_img.height = img.height + float_img.channels = img.channels + float_img.depth = 32 + + buffer_size := image.compute_buffer_size(img.width, img.height, img.channels, 32) + resize(&float_img.pixels.buf, buffer_size) + + pbm_info := pbm.Info { + header = { + width = img.width, + height = img.height, + channels = img.channels, + depth = img.depth, + maxval = 255 if img.depth == 8 else 65535, + little_endian = true if ODIN_ENDIAN == .Little else false, + scale = 1.0, + format = .Pf if img.channels == 1 else .PF, + }, + } + + // Transform data... + orig_float := mem.slice_data_cast([]f32, float_img.pixels.buf[:]) + + switch img.depth { + case 8: + for v, i in img.pixels.buf { + orig_float[i] = f32(v) / f32(256) + } + case 16: + wide := mem.slice_data_cast([]u16, img.pixels.buf[:]) + for v, i in wide { + orig_float[i] = f32(v) / f32(65536) + } + } + + float_pbm_buf, float_pbm_save_err := pbm.save_to_buffer(float_img, pbm_info) + defer delete(float_pbm_buf) + + error = fmt.tprintf("%v test %v save as PFM failed with %v", file.file, count, float_pbm_save_err) + expect(t, float_pbm_save_err == nil, error) + + if float_pbm_save_err == nil { + // Load float image and compare. + float_pbm_img, float_pbm_load_err := pbm.load(float_pbm_buf) + defer pbm.destroy(float_pbm_img) + + error = fmt.tprintf("%v test %v PFM load failed with %v", file.file, count, float_pbm_load_err) + expect(t, float_pbm_load_err == nil, error) + + load_float := mem.slice_data_cast([]f32, float_pbm_img.pixels.buf[:]) + + error = fmt.tprintf("%v test %v PFM load returned %v floats, expected %v", file.file, count, len(load_float), len(orig_float)) + expect(t, len(load_float) == len(orig_float), error) + + // Compare floats + equal := true + for orig, i in orig_float { + if orig != load_float[i] { + equal = false + break + } + } + error = fmt.tprintf("%v test %v PFM loaded floats to match", file.file, count) + expect(t, equal, error) } } } From 2081f8fcd66efa71ab526d10751bbe882be228ba Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 22:04:47 +0200 Subject: [PATCH 141/245] [tests/core/image] Remove old crappy PPM writer. --- tests/core/image/test_core_image.odin | 201 -------------------------- 1 file changed, 201 deletions(-) diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index 2ecc67151..9c9831199 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -27,7 +27,6 @@ import "core:time" import "core:runtime" -WRITE_PPM_ON_FAIL :: #config(WRITE_PPM_ON_FAIL, false) TEST_SUITE_PATH :: "assets/PNG" TEST_count := 0 @@ -1879,12 +1878,6 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { } } - if WRITE_PPM_ON_FAIL && !passed && err == nil { // It loaded but had an error in its compares. - testing.logf(t, "Test failed, writing ppm/%v-%v.ppm to help debug.\n", file.file, count) - output := fmt.tprintf("ppm/%v-%v.ppm", file.file, count) - write_image_as_ppm(output, img) - } - png.destroy(img) for _, v in track.allocation_map { @@ -1895,198 +1888,4 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { } return -} - -// Crappy PPM writer used during testing. Don't use in production. -write_image_as_ppm :: proc(filename: string, image: ^image.Image) -> (success: bool) { - - _bg :: proc(x, y: int, high := true) -> (res: [3]u16) { - if high { - l := u16(30 * 256 + 30) - - if (x & 4 == 0) ~ (y & 4 == 0) { - res = [3]u16{l, l, l} - } else { - res = [3]u16{l >> 1, l >> 1, l >> 1} - } - } else { - if (x & 4 == 0) ~ (y & 4 == 0) { - res = [3]u16{30, 30, 30} - } else { - res = [3]u16{15, 15, 15} - } - } - return - } - - using image - using os - - flags: int = O_WRONLY|O_CREATE|O_TRUNC - - img := image - - // PBM 16-bit images are big endian - when ODIN_ENDIAN == .Little { - if img.depth == 16 { - // The pixel components are in Big Endian. Let's byteswap back. - input := mem.slice_data_cast([]u16, img.pixels.buf[:]) - output := mem.slice_data_cast([]u16be, img.pixels.buf[:]) - #no_bounds_check for v, i in input { - output[i] = u16be(v) - } - } - } - - pix := bytes.buffer_to_bytes(&img.pixels) - - if len(pix) == 0 || len(pix) < image.width * image.height * int(image.channels) { - return false - } - - mode: int = 0 - when ODIN_OS == .Linux || ODIN_OS == .Darwin { - // NOTE(justasd): 644 (owner read, write; group read; others read) - mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH - } - - fd, err := open(filename, flags, mode) - if err != 0 { - return false - } - defer close(fd) - - write_string(fd, - fmt.tprintf("P6\n%v %v\n%v\n", width, height, (1 << uint(depth) -1)), - ) - - if channels == 3 { - // We don't handle transparency here... - write_ptr(fd, raw_data(pix), len(pix)) - } else { - bpp := depth == 16 ? 2 : 1 - bytes_needed := width * height * 3 * bpp - - op := bytes.Buffer{} - bytes.buffer_init_allocator(&op, bytes_needed, bytes_needed) - defer bytes.buffer_destroy(&op) - - if channels == 1 { - if depth == 16 { - assert(len(pix) == width * height * 2) - p16 := mem.slice_data_cast([]u16, pix) - o16 := mem.slice_data_cast([]u16, op.buf[:]) - #no_bounds_check for len(p16) != 0 { - r := u16(p16[0]) - o16[0] = r - o16[1] = r - o16[2] = r - p16 = p16[1:] - o16 = o16[3:] - } - } else { - o := 0 - for i := 0; i < len(pix); i += 1 { - r := pix[i] - op.buf[o ] = r - op.buf[o+1] = r - op.buf[o+2] = r - o += 3 - } - } - write_ptr(fd, raw_data(op.buf), len(op.buf)) - } else if channels == 2 { - if depth == 16 { - p16 := mem.slice_data_cast([]u16, pix) - o16 := mem.slice_data_cast([]u16, op.buf[:]) - - bgcol := img.background - - #no_bounds_check for len(p16) != 0 { - r := f64(u16(p16[0])) - bg: f64 - if bgcol != nil { - v := bgcol.([3]u16)[0] - bg = f64(v) - } - a := f64(u16(p16[1])) / 65535.0 - l := (a * r) + (1 / a) * bg - - o16[0] = u16(l) - o16[1] = u16(l) - o16[2] = u16(l) - - p16 = p16[2:] - o16 = o16[3:] - } - } else { - o := 0 - for i := 0; i < len(pix); i += 2 { - r := pix[i]; a := pix[i+1]; a1 := f32(a) / 255.0 - c := u8(f32(r) * a1) - op.buf[o ] = c - op.buf[o+1] = c - op.buf[o+2] = c - o += 3 - } - } - write_ptr(fd, raw_data(op.buf), len(op.buf)) - } else if channels == 4 { - if depth == 16 { - p16 := mem.slice_data_cast([]u16be, pix) - o16 := mem.slice_data_cast([]u16be, op.buf[:]) - - i := 0 - for len(p16) > 0 { - i += 1 - x := i % width - y := i / width - bg := _bg(x, y, true) - - r := f32(p16[0]) - g := f32(p16[1]) - b := f32(p16[2]) - a := f32(p16[3]) / 65535.0 - - lr := (a * r) + (1 / a) * f32(bg[0]) - lg := (a * g) + (1 / a) * f32(bg[1]) - lb := (a * b) + (1 / a) * f32(bg[2]) - - o16[0] = u16be(lr) - o16[1] = u16be(lg) - o16[2] = u16be(lb) - - p16 = p16[4:] - o16 = o16[3:] - } - } else { - o := 0 - - for i := 0; i < len(pix); i += 4 { - - x := (i / 4) % width - y := i / width / 4 - _b := _bg(x, y, false) - bgcol := [3]u8{u8(_b[0]), u8(_b[1]), u8(_b[2])} - - r := f32(pix[i]) - g := f32(pix[i+1]) - b := f32(pix[i+2]) - a := f32(pix[i+3]) / 255.0 - - lr := u8(f32(r) * a + (1 / a) * f32(bgcol[0])) - lg := u8(f32(g) * a + (1 / a) * f32(bgcol[1])) - lb := u8(f32(b) * a + (1 / a) * f32(bgcol[2])) - op.buf[o ] = lr - op.buf[o+1] = lg - op.buf[o+2] = lb - o += 3 - } - } - write_ptr(fd, raw_data(op.buf), len(op.buf)) - } else { - return false - } - } - return true } \ No newline at end of file From 6ade9acc4d220a9912fb7d88ae26d82131351e12 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 30 Apr 2022 22:54:53 +0200 Subject: [PATCH 142/245] [pbm] Remove stray comment. --- core/image/netpbm/helpers.odin | 1 - 1 file changed, 1 deletion(-) diff --git a/core/image/netpbm/helpers.odin b/core/image/netpbm/helpers.odin index 2fbd32ecc..016f9453e 100644 --- a/core/image/netpbm/helpers.odin +++ b/core/image/netpbm/helpers.odin @@ -9,7 +9,6 @@ destroy :: proc(img: ^image.Image) -> bool { defer free(img) bytes.buffer_destroy(&img.pixels) - //! TEMP CAST info, ok := img.metadata.(^image.Netpbm_Info) if !ok do return false From b2fdb881eb6734b973b4bb0a8ff04a3a775c9454 Mon Sep 17 00:00:00 2001 From: hikari Date: Sun, 1 May 2022 13:21:28 +0300 Subject: [PATCH 143/245] sys/windows: remove A variant for one SystemParametersInfoW --- core/sys/windows/user32.odin | 1 - 1 file changed, 1 deletion(-) diff --git a/core/sys/windows/user32.odin b/core/sys/windows/user32.odin index 6f42267db..f83713a33 100644 --- a/core/sys/windows/user32.odin +++ b/core/sys/windows/user32.odin @@ -119,7 +119,6 @@ foreign user32 { AdjustWindowRect :: proc(lpRect: LPRECT, dwStyle: DWORD, bMenu: BOOL) -> BOOL --- AdjustWindowRectEx :: proc(lpRect: LPRECT, dwStyle: DWORD, bMenu: BOOL, dwExStyle: DWORD) -> BOOL --- - SystemParametersInfoA :: proc(uiAction, uiParam: UINT, pvParam: PVOID, fWinIni: UINT) -> BOOL --- SystemParametersInfoW :: proc(uiAction, uiParam: UINT, pvParam: PVOID, fWinIni: UINT) -> BOOL --- GetWindowDC :: proc(hWnd: HWND) -> HDC --- From 335b7242099153f0777ce5417b8ef8261de03ec8 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 1 May 2022 12:47:05 +0200 Subject: [PATCH 144/245] [xxh3] Fix flaws in streaming implementation --- core/hash/xxhash/streaming.odin | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/hash/xxhash/streaming.odin b/core/hash/xxhash/streaming.odin index d6df1089f..68a4920a5 100644 --- a/core/hash/xxhash/streaming.odin +++ b/core/hash/xxhash/streaming.odin @@ -52,9 +52,6 @@ XXH3_128_reset_with_seed :: proc(state: ^XXH3_state, seed: XXH64_hash) -> (err: XXH3_64_reset_with_seed :: XXH3_128_reset_with_seed XXH3_128_update :: proc(state: ^XXH3_state, input: []u8) -> (err: Error) { - if len(input) < XXH3_MIDSIZE_MAX { - return .Error - } return XXH3_update(state, input, XXH3_accumulate_512, XXH3_scramble_accumulator) } XXH3_64_update :: XXH3_128_update @@ -127,6 +124,7 @@ XXH3_create_state :: proc(allocator := context.allocator) -> (res: ^XXH3_state, err = nil if mem_error == nil else .Error XXH3_init_state(state) + XXH3_128_reset(state) return state, nil } @@ -234,7 +232,9 @@ XXH3_update :: #force_inline proc( */ if state.buffered_size > 0 { load_size := int(XXH3_INTERNAL_BUFFER_SIZE - state.buffered_size) - mem_copy(&state.buffer[state.buffered_size], &input[0], load_size) + + state_ptr := rawptr(uintptr(raw_data(state.buffer[:])) + uintptr(state.buffered_size)) + mem_copy(state_ptr, raw_data(input), load_size) input = input[load_size:] XXH3_consume_stripes( From 74d3bcec05e693889b075ef64d88ee3ef985d13c Mon Sep 17 00:00:00 2001 From: WalterPlinge <22519813+WalterPlinge@users.noreply.github.com> Date: Sun, 1 May 2022 21:29:09 +0100 Subject: [PATCH 145/245] Fixed the depth values in the doc file, made some info more clear --- core/image/netpbm/doc.odin | 19 ++++++++++--------- core/image/netpbm/netpbm.odin | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/core/image/netpbm/doc.odin b/core/image/netpbm/doc.odin index baeb99968..1b5b46856 100644 --- a/core/image/netpbm/doc.odin +++ b/core/image/netpbm/doc.odin @@ -6,24 +6,25 @@ Formats: PAM (P7 ): Portable Arbitrary Map, stores arbitrary channel images (1 or 2 bytes per value) PFM (Pf, PF): Portable Float Map, stores floating-point images (Pf: 1 channel, PF: 3 channel) -Reading +Reading: All formats fill out header fields `format`, `width`, `height`, `channels`, `depth` Specific formats use more fields - PGM, PPM, and PAM set `maxval` - PAM also sets `tupltype`, and is able to set `channels` to an arbitrary value - PFM sets `scale` and `little_endian` + PGM, PPM, and PAM set `maxval` (maximum of 65535) + PAM sets `tupltype` if there is one, and can set `channels` to any value (not just 1 or 3) + PFM sets `scale` (float equivalent of `maxval`) and `little_endian` (endianness of stored floats) Currently doesn't support reading multiple images from one binary-format file -Writing +Writing: + You can use your own `Netpbm_Info` struct to control how images are written All formats require the header field `format` to be specified Additional header fields are required for specific formats - PGM, PPM, and PAM require `maxval` + PGM, PPM, and PAM require `maxval` (maximum of 65535) PAM also uses `tupltype`, though it may be left as default (empty or nil string) - PFM requires `scale` and `little_endian`, though the latter may be left untouched (default is false) + PFM requires `scale`, and optionally `little_endian` Some syntax differences from the specifications: - `channels` stores what the PAM specification calls `depth` - `depth` instead stores how many bytes will fit `maxval` (should only be 1, 2, or 4) + `channels` stores the number of values per pixel, what the PAM specification calls `depth` + `depth` instead is the number of bits for a single value (32 for PFM, 16 or 8 otherwise) `scale` and `little_endian` are separated, so the `header` will always store a positive `scale` `little_endian` will only be true for a negative `scale` PFM, every other format will be false `little_endian` only describes the netpbm data being read/written, the image buffer will be native diff --git a/core/image/netpbm/netpbm.odin b/core/image/netpbm/netpbm.odin index 768c06110..9574faa26 100644 --- a/core/image/netpbm/netpbm.odin +++ b/core/image/netpbm/netpbm.odin @@ -109,7 +109,7 @@ save_to_buffer :: proc(img: ^Image, custom_info: Info = {}, allocator := context // using info so we can just talk about the header using info - //? validation + // validation if header.format in (PBM + PGM + Formats{.Pf}) && img.channels != 1 \ || header.format in (PPM + Formats{.PF}) && img.channels != 3 { err = .Invalid_Number_Of_Channels From 10a311092b3a025921bdf62710972bcd91b57730 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 1 May 2022 23:15:06 +0100 Subject: [PATCH 146/245] Add basic arm32 ABI support (linux_arm32) --- src/build_settings.cpp | 15 ++++++- src/llvm_abi.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 89d370144..1619c342b 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -30,6 +30,7 @@ enum TargetArchKind : u16 { TargetArch_amd64, TargetArch_i386, + TargetArch_arm32, TargetArch_arm64, TargetArch_wasm32, TargetArch_wasm64, @@ -75,6 +76,7 @@ String target_arch_names[TargetArch_COUNT] = { str_lit(""), str_lit("amd64"), str_lit("i386"), + str_lit("arm32"), str_lit("arm64"), str_lit("wasm32"), str_lit("wasm64"), @@ -98,6 +100,7 @@ TargetEndianKind target_endians[TargetArch_COUNT] = { TargetEndian_Little, TargetEndian_Little, TargetEndian_Little, + TargetEndian_Little, }; #ifndef ODIN_VERSION_RAW @@ -367,7 +370,16 @@ gb_global TargetMetrics target_linux_arm64 = { 8, 16, str_lit("aarch64-linux-elf"), - str_lit("e-m:e-i8:8:32-i16:32-i64:64-i128:128-n32:64-S128"), + str_lit("e-m:o-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"), +}; + +gb_global TargetMetrics target_linux_arm32 = { + TargetOs_linux, + TargetArch_arm32, + 4, + 8, + str_lit("aapcs-linux-gnu"), + str_lit("e-m:o-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"), }; gb_global TargetMetrics target_darwin_amd64 = { @@ -483,6 +495,7 @@ gb_global NamedTargetMetrics named_targets[] = { { str_lit("linux_i386"), &target_linux_i386 }, { str_lit("linux_amd64"), &target_linux_amd64 }, { str_lit("linux_arm64"), &target_linux_arm64 }, + { str_lit("linux_arm32"), &target_linux_arm32 }, { str_lit("windows_i386"), &target_windows_i386 }, { str_lit("windows_amd64"), &target_windows_amd64 }, { str_lit("freebsd_i386"), &target_freebsd_i386 }, diff --git a/src/llvm_abi.cpp b/src/llvm_abi.cpp index 07d2dd6e3..c6ff12f95 100644 --- a/src/llvm_abi.cpp +++ b/src/llvm_abi.cpp @@ -516,6 +516,10 @@ namespace lbAbiAmd64SysV { bool is_register(LLVMTypeRef type) { LLVMTypeKind kind = LLVMGetTypeKind(type); + i64 sz = lb_sizeof(type); + if (sz == 0) { + return false; + } switch (kind) { case LLVMIntegerTypeKind: case LLVMHalfTypeKind: @@ -1164,6 +1168,88 @@ namespace lbAbiWasm32 { } } +namespace lbAbiArm32 { + Array compute_arg_types(LLVMContextRef c, LLVMTypeRef *arg_types, unsigned arg_count, ProcCallingConvention calling_convention); + lbArgType compute_return_type(LLVMContextRef c, LLVMTypeRef return_type, bool return_is_defined); + + LB_ABI_INFO(abi_info) { + lbFunctionType *ft = gb_alloc_item(permanent_allocator(), lbFunctionType); + ft->ctx = c; + ft->args = compute_arg_types(c, arg_types, arg_count, calling_convention); + ft->ret = compute_return_type(c, return_type, return_is_defined); + ft->calling_convention = calling_convention; + return ft; + } + + bool is_register(LLVMTypeRef type, bool is_return) { + LLVMTypeKind kind = LLVMGetTypeKind(type); + switch (kind) { + case LLVMHalfTypeKind: + case LLVMFloatTypeKind: + case LLVMDoubleTypeKind: + return true; + case LLVMIntegerTypeKind: + return lb_sizeof(type) <= 8; + case LLVMFunctionTypeKind: + return true; + case LLVMPointerTypeKind: + return true; + case LLVMVectorTypeKind: + return true; + } + return false; + } + + lbArgType non_struct(LLVMContextRef c, LLVMTypeRef type, bool is_return) { + LLVMAttributeRef attr = nullptr; + LLVMTypeRef i1 = LLVMInt1TypeInContext(c); + if (type == i1) { + attr = lb_create_enum_attribute(c, "zeroext"); + } + return lb_arg_type_direct(type, nullptr, nullptr, attr); + } + + Array compute_arg_types(LLVMContextRef c, LLVMTypeRef *arg_types, unsigned arg_count, ProcCallingConvention calling_convention) { + auto args = array_make(heap_allocator(), arg_count); + + for (unsigned i = 0; i < arg_count; i++) { + LLVMTypeRef t = arg_types[i]; + if (is_register(t, false)) { + args[i] = non_struct(c, t, false); + } else { + i64 sz = lb_sizeof(t); + i64 a = lb_alignof(t); + if (is_calling_convention_odin(calling_convention) && sz > 8) { + // Minor change to improve performance using the Odin calling conventions + args[i] = lb_arg_type_indirect(t, nullptr); + } else if (a <= 4) { + unsigned n = cast(unsigned)((sz + 3) / 4); + args[i] = lb_arg_type_direct(LLVMArrayType(LLVMIntTypeInContext(c, 32), n)); + } else { + unsigned n = cast(unsigned)((sz + 7) / 8); + args[i] = lb_arg_type_direct(LLVMArrayType(LLVMIntTypeInContext(c, 64), n)); + } + } + } + return args; + } + + lbArgType compute_return_type(LLVMContextRef c, LLVMTypeRef return_type, bool return_is_defined) { + if (!return_is_defined) { + return lb_arg_type_direct(LLVMVoidTypeInContext(c)); + } else if (!is_register(return_type, true)) { + switch (lb_sizeof(return_type)) { + case 1: return lb_arg_type_direct(LLVMIntTypeInContext(c, 8), return_type, nullptr, nullptr); + case 2: return lb_arg_type_direct(LLVMIntTypeInContext(c, 16), return_type, nullptr, nullptr); + case 3: case 4: return lb_arg_type_direct(LLVMIntTypeInContext(c, 32), return_type, nullptr, nullptr); + } + LLVMAttributeRef attr = lb_create_enum_attribute_with_type(c, "sret", return_type); + return lb_arg_type_indirect(return_type, attr); + } + return non_struct(c, return_type, true); + } +}; + LB_ABI_INFO(lb_get_abi_info) { switch (calling_convention) { @@ -1203,6 +1289,8 @@ LB_ABI_INFO(lb_get_abi_info) { } case TargetArch_i386: return lbAbi386::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention); + case TargetArch_arm32: + return lbAbiArm32::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention); case TargetArch_arm64: return lbAbiArm64::abi_info(c, arg_types, arg_count, return_type, return_is_defined, calling_convention); case TargetArch_wasm32: From 0e27b27b81f4b51ae4691d4dc84ae130867b3f67 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 1 May 2022 23:28:32 +0100 Subject: [PATCH 147/245] Fix building issues with arm32 --- src/build_settings.cpp | 46 +++++++++++++++++++++++++----------------- src/checker.cpp | 1 + 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 1619c342b..e596e54e5 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -378,7 +378,7 @@ gb_global TargetMetrics target_linux_arm32 = { TargetArch_arm32, 4, 8, - str_lit("aapcs-linux-gnu"), + str_lit("arm-linux-gnu"), str_lit("e-m:o-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"), }; @@ -1127,6 +1127,15 @@ void init_build_context(TargetMetrics *cross_target) { bc->link_flags = str_lit("-arch x86 "); break; } + } else if (bc->metrics.arch == TargetArch_arm32) { + switch (bc->metrics.os) { + case TargetOs_linux: + bc->link_flags = str_lit("-arch arm "); + break; + default: + gb_printf_err("Compiler Error: Unsupported architecture\n"); + gb_exit(1); + } } else if (bc->metrics.arch == TargetArch_arm64) { switch (bc->metrics.os) { case TargetOs_darwin: @@ -1214,27 +1223,28 @@ bool init_build_paths(String init_filename) { return false; } - GB_ASSERT(find_result.windows_sdk_um_library_path.len > 0); - GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); - - if (find_result.windows_sdk_root.len > 0) { - bc->build_paths[BuildPath_Win_SDK_Root] = path_from_string(ha, find_result.windows_sdk_root); - } - if (find_result.windows_sdk_um_library_path.len > 0) { - bc->build_paths[BuildPath_Win_SDK_UM_Lib] = path_from_string(ha, find_result.windows_sdk_um_library_path); - } + GB_ASSERT(find_result.windows_sdk_ucrt_library_path.len > 0); - if (find_result.windows_sdk_ucrt_library_path.len > 0) { - bc->build_paths[BuildPath_Win_SDK_UCRT_Lib] = path_from_string(ha, find_result.windows_sdk_ucrt_library_path); - } + if (find_result.windows_sdk_root.len > 0) { + bc->build_paths[BuildPath_Win_SDK_Root] = path_from_string(ha, find_result.windows_sdk_root); + } - if (find_result.vs_exe_path.len > 0) { - bc->build_paths[BuildPath_VS_EXE] = path_from_string(ha, find_result.vs_exe_path); - } + if (find_result.windows_sdk_um_library_path.len > 0) { + bc->build_paths[BuildPath_Win_SDK_UM_Lib] = path_from_string(ha, find_result.windows_sdk_um_library_path); + } - if (find_result.vs_library_path.len > 0) { - bc->build_paths[BuildPath_VS_LIB] = path_from_string(ha, find_result.vs_library_path); + if (find_result.windows_sdk_ucrt_library_path.len > 0) { + bc->build_paths[BuildPath_Win_SDK_UCRT_Lib] = path_from_string(ha, find_result.windows_sdk_ucrt_library_path); + } + + if (find_result.vs_exe_path.len > 0) { + bc->build_paths[BuildPath_VS_EXE] = path_from_string(ha, find_result.vs_exe_path); + } + + if (find_result.vs_library_path.len > 0) { + bc->build_paths[BuildPath_VS_LIB] = path_from_string(ha, find_result.vs_library_path); + } } gb_free(ha, find_result.windows_sdk_root.text); diff --git a/src/checker.cpp b/src/checker.cpp index 1bb786ea1..1e33c6e9d 100644 --- a/src/checker.cpp +++ b/src/checker.cpp @@ -944,6 +944,7 @@ void init_universal(void) { {"Unknown", TargetArch_Invalid}, {"amd64", TargetArch_amd64}, {"i386", TargetArch_i386}, + {"arm32", TargetArch_arm32}, {"arm64", TargetArch_arm64}, {"wasm32", TargetArch_wasm32}, {"wasm64", TargetArch_wasm64}, From 18ad6c33ef896fc7b7bbf27af8b807b36b59e561 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 1 May 2022 23:32:31 +0100 Subject: [PATCH 148/245] Implement syscall for arm32 --- src/llvm_backend_proc.cpp | 167 ++++++++++++++++++++++---------------- 1 file changed, 96 insertions(+), 71 deletions(-) diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index 96ff19d10..06a74f625 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -189,7 +189,7 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool ignore_body) GB_ASSERT(entity->kind == Entity_Procedure); String link_name = entity->Procedure.link_name; if (entity->flags & EntityFlag_CustomLinkName && - link_name != "") { + link_name != "") { if (string_starts_with(link_name, str_lit("__"))) { LLVMSetLinkage(p->value, LLVMExternalLinkage); } else { @@ -200,12 +200,12 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool ignore_body) } } lb_set_linkage_from_entity_flags(p->module, p->value, entity->flags); - - + + if (p->is_foreign) { lb_set_wasm_import_attributes(p->value, entity, p->name); } - + // NOTE(bill): offset==0 is the return value isize offset = 1; @@ -280,7 +280,7 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool ignore_body) if (p->body != nullptr) { // String debug_name = entity->token.string.text; String debug_name = p->name; - + p->debug_info = LLVMDIBuilderCreateFunction(m->debug_builder, scope, cast(char const *)debug_name.text, debug_name.len, cast(char const *)p->name.text, p->name.len, @@ -1315,22 +1315,22 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, case BuiltinProc_clamp: return lb_emit_clamp(p, type_of_expr(expr), - lb_build_expr(p, ce->args[0]), - lb_build_expr(p, ce->args[1]), - lb_build_expr(p, ce->args[2])); + lb_build_expr(p, ce->args[0]), + lb_build_expr(p, ce->args[1]), + lb_build_expr(p, ce->args[2])); case BuiltinProc_soa_zip: return lb_soa_zip(p, ce, tv); case BuiltinProc_soa_unzip: return lb_soa_unzip(p, ce, tv); - + case BuiltinProc_transpose: { lbValue m = lb_build_expr(p, ce->args[0]); return lb_emit_matrix_tranpose(p, m, tv.type); } - + case BuiltinProc_outer_product: { lbValue a = lb_build_expr(p, ce->args[0]); @@ -1347,13 +1347,13 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, GB_ASSERT(is_type_matrix(tv.type)); return lb_emit_arith_matrix(p, Token_Mul, a, b, tv.type, true); } - + case BuiltinProc_matrix_flatten: { lbValue m = lb_build_expr(p, ce->args[0]); return lb_emit_matrix_flatten(p, m, tv.type); } - + // "Intrinsics" case BuiltinProc_alloca: @@ -1370,7 +1370,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, case BuiltinProc_cpu_relax: if (build_context.metrics.arch == TargetArch_i386 || - build_context.metrics.arch == TargetArch_amd64) { + build_context.metrics.arch == TargetArch_amd64) { LLVMTypeRef func_type = LLVMFunctionType(LLVMVoidTypeInContext(p->module->ctx), nullptr, 0, false); LLVMValueRef the_asm = llvm_get_inline_asm(func_type, str_lit("pause"), {}, true); GB_ASSERT(the_asm != nullptr); @@ -1538,7 +1538,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, lbValue dst = lb_build_expr(p, ce->args[0]); lbValue src = lb_build_expr(p, ce->args[1]); lbValue len = lb_build_expr(p, ce->args[2]); - + lb_mem_copy_overlapping(p, dst, src, len, false); return {}; } @@ -1547,7 +1547,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, lbValue dst = lb_build_expr(p, ce->args[0]); lbValue src = lb_build_expr(p, ce->args[1]); lbValue len = lb_build_expr(p, ce->args[2]); - + lb_mem_copy_non_overlapping(p, dst, src, len, false); return {}; } @@ -1651,7 +1651,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, res.type = type_deref(dst.type); return res; } - + case BuiltinProc_unaligned_store: { lbValue dst = lb_build_expr(p, ce->args[0]); @@ -1661,7 +1661,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, lb_mem_copy_non_overlapping(p, dst, src, lb_const_int(p->module, t_int, type_size_of(t)), false); return {}; } - + case BuiltinProc_unaligned_load: { lbValue src = lb_build_expr(p, ce->args[0]); @@ -1843,7 +1843,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, res.type = t; return lb_emit_conv(p, res, t); } - + case BuiltinProc_prefetch_read_instruction: case BuiltinProc_prefetch_read_data: case BuiltinProc_prefetch_write_instruction: @@ -1871,27 +1871,27 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, cache = 1; break; } - + char const *name = "llvm.prefetch"; - + LLVMTypeRef types[1] = {lb_type(p->module, t_rawptr)}; unsigned id = LLVMLookupIntrinsicID(name, gb_strlen(name)); GB_ASSERT_MSG(id != 0, "Unable to find %s.%s", name, LLVMPrintTypeToString(types[0])); LLVMValueRef ip = LLVMGetIntrinsicDeclaration(p->module->mod, id, types, gb_count_of(types)); - + LLVMTypeRef llvm_i32 = lb_type(p->module, t_i32); LLVMValueRef args[4] = {}; args[0] = ptr.value; args[1] = LLVMConstInt(llvm_i32, rw, false); args[2] = LLVMConstInt(llvm_i32, locality, false); args[3] = LLVMConstInt(llvm_i32, cache, false); - + lbValue res = {}; res.value = LLVMBuildCall(p->builder, ip, args, gb_count_of(args), ""); res.type = nullptr; return res; } - + case BuiltinProc___entry_point: if (p->module->info->entry_point) { lbValue entry_point = lb_find_procedure_value_from_entity(p->module, p->module->info->entry_point); @@ -1909,22 +1909,22 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, arg = lb_emit_conv(p, arg, t_uintptr); args[i] = arg.value; } - + LLVMTypeRef llvm_uintptr = lb_type(p->module, t_uintptr); LLVMTypeRef *llvm_arg_types = gb_alloc_array(permanent_allocator(), LLVMTypeRef, arg_count); for (unsigned i = 0; i < arg_count; i++) { llvm_arg_types[i] = llvm_uintptr; } - + LLVMTypeRef func_type = LLVMFunctionType(llvm_uintptr, llvm_arg_types, arg_count, false); - + LLVMValueRef inline_asm = nullptr; - + switch (build_context.metrics.arch) { case TargetArch_amd64: { GB_ASSERT(arg_count <= 7); - + char asm_string[] = "syscall"; gbString constraints = gb_string_make(heap_allocator(), "={rax}"); for (unsigned i = 0; i < arg_count; i++) { @@ -1963,11 +1963,11 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, case TargetArch_i386: { GB_ASSERT(arg_count <= 7); - + char asm_string_default[] = "int $0x80"; char *asm_string = asm_string_default; gbString constraints = gb_string_make(heap_allocator(), "={eax}"); - + for (unsigned i = 0; i < gb_min(arg_count, 6); i++) { constraints = gb_string_appendc(constraints, ",{"); static char const *regs[] = { @@ -1984,56 +1984,81 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, if (arg_count == 7) { char asm_string7[] = "push %[arg6]\npush %%ebp\nmov 4(%%esp), %%ebp\nint $0x80\npop %%ebp\nadd $4, %%esp"; asm_string = asm_string7; - + constraints = gb_string_appendc(constraints, ",rm"); } - + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; case TargetArch_arm64: { - GB_ASSERT(arg_count <= 7); - - if(build_context.metrics.os == TargetOs_darwin) { - char asm_string[] = "svc #0x80"; - gbString constraints = gb_string_make(heap_allocator(), "={x0}"); - for (unsigned i = 0; i < arg_count; i++) { - constraints = gb_string_appendc(constraints, ",{"); - static char const *regs[] = { - "x16", - "x0", - "x1", - "x2", - "x3", - "x4", - "x5", - }; - constraints = gb_string_appendc(constraints, regs[i]); - constraints = gb_string_appendc(constraints, "}"); - } + GB_ASSERT(arg_count <= 7); - inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); - } else { - char asm_string[] = "svc #0"; - gbString constraints = gb_string_make(heap_allocator(), "={x0}"); - for (unsigned i = 0; i < arg_count; i++) { - constraints = gb_string_appendc(constraints, ",{"); - static char const *regs[] = { - "x8", - "x0", - "x1", - "x2", - "x3", - "x4", - "x5", - }; - constraints = gb_string_appendc(constraints, regs[i]); - constraints = gb_string_appendc(constraints, "}"); - } + if(build_context.metrics.os == TargetOs_darwin) { + char asm_string[] = "svc #0x80"; + gbString constraints = gb_string_make(heap_allocator(), "={x0}"); + for (unsigned i = 0; i < arg_count; i++) { + constraints = gb_string_appendc(constraints, ",{"); + static char const *regs[] = { + "x16", + "x0", + "x1", + "x2", + "x3", + "x4", + "x5", + }; + constraints = gb_string_appendc(constraints, regs[i]); + constraints = gb_string_appendc(constraints, "}"); + } - inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); - } + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); + } else { + char asm_string[] = "svc #0"; + gbString constraints = gb_string_make(heap_allocator(), "={x0}"); + for (unsigned i = 0; i < arg_count; i++) { + constraints = gb_string_appendc(constraints, ",{"); + static char const *regs[] = { + "x8", + "x0", + "x1", + "x2", + "x3", + "x4", + "x5", + }; + constraints = gb_string_appendc(constraints, regs[i]); + constraints = gb_string_appendc(constraints, "}"); + } + + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); + } + } + break; + case TargetArch_arm32: + { + // TODO(bill): Check this is correct + GB_ASSERT(arg_count <= 7); + + char asm_string[] = "svc #0"; + gbString constraints = gb_string_make(heap_allocator(), "={r0}"); + for (unsigned i = 0; i < arg_count; i++) { + constraints = gb_string_appendc(constraints, ",{"); + static char const *regs[] = { + "r8", + "r0", + "r1", + "r2", + "r3", + "r4", + "r5", + }; + constraints = gb_string_appendc(constraints, regs[i]); + constraints = gb_string_appendc(constraints, "}"); + } + + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; default: From be8de4a1ffd0c555b94579351d5363f830a58272 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 1 May 2022 23:52:55 +0100 Subject: [PATCH 149/245] Update arch enum --- core/runtime/core.odin | 1 + core/runtime/core_builtin.odin | 6 ++++-- core/sys/unix/syscalls_linux.odin | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/runtime/core.odin b/core/runtime/core.odin index 4269450de..e2933d20a 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -415,6 +415,7 @@ Odin_OS_Type :: type_of(ODIN_OS) Unknown, amd64, i386, + arm32, arm64, wasm32, wasm64, diff --git a/core/runtime/core_builtin.odin b/core/runtime/core_builtin.odin index 13e464a76..43b9ee1bf 100644 --- a/core/runtime/core_builtin.odin +++ b/core/runtime/core_builtin.odin @@ -631,13 +631,15 @@ assert :: proc(condition: bool, message := "", loc := #caller_location) { // to improve performance to make the CPU not // execute speculatively, making it about an order of // magnitude faster - proc(message: string, loc: Source_Code_Location) { + @(cold) + internal :: proc(message: string, loc: Source_Code_Location) { p := context.assertion_failure_proc if p == nil { p = default_assertion_failure_proc } p("runtime assertion", message, loc) - }(message, loc) + } + internal(message, loc) } } diff --git a/core/sys/unix/syscalls_linux.odin b/core/sys/unix/syscalls_linux.odin index 3d06d42d4..f50ae825b 100644 --- a/core/sys/unix/syscalls_linux.odin +++ b/core/sys/unix/syscalls_linux.odin @@ -1114,7 +1114,7 @@ when ODIN_ARCH == .amd64 { SYS_landlock_add_rule : uintptr : 445 SYS_landlock_restrict_self : uintptr : 446 SYS_memfd_secret : uintptr : 447 -} else when false /*ODIN_ARCH == .arm*/ { // TODO +} else when ODIN_ARCH == .arm32 { // TODO SYS_restart_syscall : uintptr : 0 SYS_exit : uintptr : 1 SYS_fork : uintptr : 2 From 8023c8abc7087c763da5e843252d3899784e57be Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 2 May 2022 14:10:02 +0100 Subject: [PATCH 150/245] Fix `@(disable=...)` --- src/llvm_backend_proc.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index 06a74f625..a0e9a5da5 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -823,12 +823,6 @@ lbValue lb_emit_call(lbProcedure *p, lbValue value, Array const &args, GB_ASSERT(pt->kind == Type_Proc); Type *results = pt->Proc.results; - if (p->entity != nullptr) { - if (p->entity->flags & EntityFlag_Disabled) { - return {}; - } - } - lbAddr context_ptr = {}; if (pt->Proc.calling_convention == ProcCC_Odin) { context_ptr = lb_find_or_generate_context_ptr(p); @@ -2280,6 +2274,15 @@ lbValue lb_build_call_expr_internal(lbProcedure *p, Ast *expr) { // NOTE(bill): Regular call lbValue value = {}; Ast *proc_expr = unparen_expr(ce->proc); + + Entity *proc_entity = entity_of_node(proc_expr); + if (proc_entity != nullptr) { + if (proc_entity->flags & EntityFlag_Disabled) { + GB_ASSERT(tv.type == nullptr); + return {}; + } + } + if (proc_expr->tav.mode == Addressing_Constant) { ExactValue v = proc_expr->tav.value; switch (v.kind) { @@ -2306,13 +2309,6 @@ lbValue lb_build_call_expr_internal(lbProcedure *p, Ast *expr) { } } - Entity *proc_entity = entity_of_node(proc_expr); - if (proc_entity != nullptr) { - if (proc_entity->flags & EntityFlag_Disabled) { - return {}; - } - } - if (value.value == nullptr) { value = lb_build_expr(p, proc_expr); } From 97717d65efde6f83e502f0261a3fb08a34ea3f04 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 2 May 2022 16:09:09 +0100 Subject: [PATCH 151/245] Add `vendor:openexr` No foreign library yet --- vendor/openexr/exr_attr.odin | 397 +++++++++++++++++ vendor/openexr/exr_base.odin | 170 ++++++++ vendor/openexr/exr_chunkio.odin | 143 +++++++ vendor/openexr/exr_coding.odin | 119 ++++++ vendor/openexr/exr_context.odin | 485 +++++++++++++++++++++ vendor/openexr/exr_debug.odin | 8 + vendor/openexr/exr_decode.odin | 288 +++++++++++++ vendor/openexr/exr_encode.odin | 319 ++++++++++++++ vendor/openexr/exr_errors.odin | 62 +++ vendor/openexr/exr_part.odin | 733 ++++++++++++++++++++++++++++++++ 10 files changed, 2724 insertions(+) create mode 100644 vendor/openexr/exr_attr.odin create mode 100644 vendor/openexr/exr_base.odin create mode 100644 vendor/openexr/exr_chunkio.odin create mode 100644 vendor/openexr/exr_coding.odin create mode 100644 vendor/openexr/exr_context.odin create mode 100644 vendor/openexr/exr_debug.odin create mode 100644 vendor/openexr/exr_decode.odin create mode 100644 vendor/openexr/exr_encode.odin create mode 100644 vendor/openexr/exr_errors.odin create mode 100644 vendor/openexr/exr_part.odin diff --git a/vendor/openexr/exr_attr.odin b/vendor/openexr/exr_attr.odin new file mode 100644 index 000000000..eb07142ec --- /dev/null +++ b/vendor/openexr/exr_attr.odin @@ -0,0 +1,397 @@ +package vendor_openexr + +import "core:c" + +// Enum declaring allowed values for \c u8 value stored in built-in compression type. +compression_t :: enum c.int { + NONE = 0, + RLE = 1, + ZIPS = 2, + ZIP = 3, + PIZ = 4, + PXR24 = 5, + B44 = 6, + B44A = 7, + DWAA = 8, + DWAB = 9, +} + +// Enum declaring allowed values for \c u8 value stored in built-in env map type. +envmap_t :: enum c.int { + LATLONG = 0, + CUBE = 1, +} + +// Enum declaring allowed values for \c u8 value stored in \c lineOrder type. +lineorder_t :: enum c.int { + INCREASING_Y = 0, + DECREASING_Y = 1, + RANDOM_Y = 2, +} + +// Enum declaring allowed values for part type. +storage_t :: enum c.int { + SCANLINE = 0, // Corresponds to type of \c scanlineimage. + TILED, // Corresponds to type of \c tiledimage. + DEEP_SCANLINE, // Corresponds to type of \c deepscanline. + DEEP_TILED, // Corresponds to type of \c deeptile. +} + +// @brief Enum representing what type of tile information is contained. +tile_level_mode_t :: enum c.int { + ONE_LEVEL = 0, // Single level of image data. + MIPMAP_LEVELS = 1, // Mipmapped image data. + RIPMAP_LEVELS = 2, // Ripmapped image data. +} + +/** @brief Enum representing how to scale positions between levels. */ +tile_round_mode_t :: enum c.int { + DOWN = 0, + UP = 1, +} + +/** @brief Enum capturing the underlying data type on a channel. */ +pixel_type_t :: enum c.int { + UINT = 0, + HALF = 1, + FLOAT = 2, +} + +/* /////////////////////////////////////// */ +/* First set of structs are data where we can read directly with no allocation needed... */ + +/** @brief Struct to hold color chromaticities to interpret the tristimulus color values in the image data. */ +attr_chromaticities_t :: struct #packed { + red_x: f32, + red_y: f32, + green_x: f32, + green_y: f32, + blue_x: f32, + blue_y: f32, + white_x: f32, + white_y: f32, +} + +/** @brief Struct to hold keycode information. */ +attr_keycode_t :: struct #packed { + film_mfc_code: i32, + film_type: i32, + prefix: i32, + count: i32, + perf_offset: i32, + perfs_per_frame: i32, + perfs_per_count: i32, +} + +/** @brief struct to hold a 32-bit floating-point 3x3 matrix. */ +attr_m33f_t :: struct #packed { + m: [9]f32, +} + +/** @brief struct to hold a 64-bit floating-point 3x3 matrix. */ +attr_m33d_t :: struct #packed { + m: [9]f64, +} + +/** @brief Struct to hold a 32-bit floating-point 4x4 matrix. */ +attr_m44f_t :: struct #packed { + m: [16]f32, +} + +/** @brief Struct to hold a 64-bit floating-point 4x4 matrix. */ +attr_m44d_t :: struct #packed { + m: [16]f64, +} + +/** @brief Struct to hold an integer ratio value. */ +attr_rational_t :: struct #packed { + num: i32, + denom: u32, +} + +/** @brief Struct to hold timecode information. */ +attr_timecode_t :: struct #packed { + time_and_flags: u32, + user_data: u32, +} + +/** @brief Struct to hold a 2-element integer vector. */ +attr_v2i_t :: distinct [2]i32 + +/** @brief Struct to hold a 2-element 32-bit float vector. */ +attr_v2f_t :: distinct [2]f32 + +/** @brief Struct to hold a 2-element 64-bit float vector. */ +attr_v2d_t :: distinct [2]f64 + +/** @brief Struct to hold a 3-element integer vector. */ +attr_v3i_t :: distinct [3]i32 + +/** @brief Struct to hold a 3-element 32-bit float vector. */ +attr_v3f_t :: distinct [3]f32 + +/** @brief Struct to hold a 3-element 64-bit float vector. */ +attr_v3d_t :: distinct [3]f64 + +/** @brief Struct to hold an integer box/region definition. */ +attr_box2i_t :: struct #packed { + min: attr_v2i_t, + max: attr_v2i_t, +} + +/** @brief Struct to hold a floating-point box/region definition. */ +attr_box2f_t:: struct #packed { + min: attr_v2f_t, + max: attr_v2f_t, +} + +/** @brief Struct holding base tiledesc attribute type defined in spec + * + * NB: This is in a tightly packed area so it can be read directly, be + * careful it doesn't become padded to the next \c uint32_t boundary. + */ +attr_tiledesc_t :: struct #packed { + x_size: u32, + y_size: u32, + level_and_round: u8, +} + +/** @brief Macro to access type of tiling from packed structure. */ +GET_TILE_LEVEL_MODE :: #force_inline proc "c" (tiledesc: attr_tiledesc_t) -> tile_level_mode_t { + return tile_level_mode_t(tiledesc.level_and_round & 0xf) +} +/** @brief Macro to access the rounding mode of tiling from packed structure. */ +GET_TILE_ROUND_MODE :: #force_inline proc "c" (tiledesc: attr_tiledesc_t) -> tile_round_mode_t { + return tile_round_mode_t((tiledesc.level_and_round >> 4) & 0xf) +} +/** @brief Macro to pack the tiling type and rounding mode into packed structure. */ +PACK_TILE_LEVEL_ROUND :: #force_inline proc "c" (lvl: tile_level_mode_t, mode: tile_round_mode_t) -> u8 { + return ((u8(mode) & 0xf) << 4) | (u8(lvl) & 0xf) +} + + +/* /////////////////////////////////////// */ +/* Now structs that involve heap allocation to store data. */ + +/** Storage for a string. */ +attr_string_t :: struct { + length: i32, + /** If this is non-zero, the string owns the data, if 0, is a const ref to a static string. */ + alloc_size: i32, + + str: cstring, +} + +/** Storage for a string vector. */ +attr_string_vector_t :: struct { + n_strings: i32, + /** If this is non-zero, the string vector owns the data, if 0, is a const ref. */ + alloc_size: i32, + + strings: [^]attr_string_t, +} + +/** Float vector storage struct. */ +attr_float_vector_t :: struct { + length: i32, + /** If this is non-zero, the float vector owns the data, if 0, is a const ref. */ + alloc_size: i32, + + arr: [^]f32, +} + +/** Hint for lossy compression methods about how to treat values + * (logarithmic or linear), meaning a human sees values like R, G, B, + * luminance difference between 0.1 and 0.2 as about the same as 1.0 + * to 2.0 (logarithmic), where chroma coordinates are closer to linear + * (0.1 and 0.2 is about the same difference as 1.0 and 1.1). + */ +perceptual_treatment_t :: enum c.int { + LOGARITHMIC = 0, + LINEAR = 1, +} + +/** Individual channel information. */ +attr_chlist_entry_t :: struct { + name: attr_string_t, + /** Data representation for these pixels: uint, half, float. */ + pixel_type: pixel_type_t, + /** Possible values are 0 and 1 per docs perceptual_treatment_t. */ + p_linear: u8, + reserved: [3]u8, + x_sampling: i32, + y_sampling: i32, +} + +/** List of channel information (sorted alphabetically). */ +attr_chlist_t :: struct { + num_channels: c.int, + num_alloced: c.int, + + entries: [^]attr_chlist_entry_t, +} + +/** @brief Struct to define attributes of an embedded preview image. */ +attr_preview_t :: struct { + width: u32, + height: u32, + /** If this is non-zero, the preview owns the data, if 0, is a const ref. */ + alloc_size: c.size_t, + + rgba: [^]u8, +} + +/** Custom storage structure for opaque data. + * + * Handlers for opaque types can be registered, then when a + * non-builtin type is encountered with a registered handler, the + * function pointers to unpack/pack it will be set up. + * + * @sa register_attr_type_handler + */ +attr_opaquedata_t :: struct { + size: i32, + unpacked_size: i32, + /** If this is non-zero, the struct owns the data, if 0, is a const ref. */ + packed_alloc_size: i32, + pad: [4]u8, + + packed_data: rawptr, + + /** When an application wants to have custom data, they can store + * an unpacked form here which will be requested to be destroyed + * upon destruction of the attribute. + */ + unpacked_data: rawptr, + + /** An application can register an attribute handler which then + * fills in these function pointers. This allows a user to delay + * the expansion of the custom type until access is desired, and + * similarly, to delay the packing of the data until write time. + */ + unpack_func_ptr: proc "c" ( + ctxt: context_t, + data: rawptr, + attrsize: i32, + outsize: ^i32, + outbuffer: ^rawptr) -> result_t, + pack_func_ptr: proc "c" ( + ctxt: context_t, + data: rawptr, + datasize: i32, + outsize: ^i32, + outbuffer: rawptr) -> result_t, + destroy_unpacked_func_ptr: proc "c" ( + ctxt: context_t, data: rawptr, attrsize: i32), +} + +/* /////////////////////////////////////// */ + +/** @brief Built-in/native attribute type enum. + * + * This will enable us to do a tagged type struct to generically store + * attributes. + */ +attribute_type_t :: enum c.int { + UNKNOWN = 0, // Type indicating an error or uninitialized attribute. + BOX2I, // Integer region definition. @see attr_box2i_t. + BOX2F, // Float region definition. @see attr_box2f_t. + CHLIST, // Definition of channels in file @see chlist_entry. + CHROMATICITIES, // Values to specify color space of colors in file @see attr_chromaticities_t. + COMPRESSION, // ``u8`` declaring compression present. + DOUBLE, // Double precision floating point number. + ENVMAP, // ``u8`` declaring environment map type. + FLOAT, // Normal (4 byte) precision floating point number. + FLOAT_VECTOR, // List of normal (4 byte) precision floating point numbers. + INT, // 32-bit signed integer value. + KEYCODE, // Struct recording keycode @see attr_keycode_t. + LINEORDER, // ``u8`` declaring scanline ordering. + M33F, // 9 32-bit floats representing a 3x3 matrix. + M33D, // 9 64-bit floats representing a 3x3 matrix. + M44F, // 16 32-bit floats representing a 4x4 matrix. + M44D, // 16 64-bit floats representing a 4x4 matrix. + PREVIEW, // 2 ``unsigned ints`` followed by 4 x w x h ``u8`` image. + RATIONAL, // \c int followed by ``unsigned int`` + STRING, // ``int`` (length) followed by char string data. + STRING_VECTOR, // 0 or more text strings (int + string). number is based on attribute size. + TILEDESC, // 2 ``unsigned ints`` ``xSize``, ``ySize`` followed by mode. + TIMECODE, // 2 ``unsigned ints`` time and flags, user data. + V2I, // Pair of 32-bit integers. + V2F, // Pair of 32-bit floats. + V2D, // Pair of 64-bit floats. + V3I, // Set of 3 32-bit integers. + V3F, // Set of 3 32-bit floats. + V3D, // Set of 3 64-bit floats. + OPAQUE, // User/unknown provided type. +} + +/** @brief Storage, name and type information for an attribute. + * + * Attributes (metadata) for the file cause a surprising amount of + * overhead. It is not uncommon for a production-grade EXR to have + * many attributes. As such, the attribute struct is designed in a + * slightly more complicated manner. It is optimized to have the + * storage for that attribute: the struct itself, the name, the type, + * and the data all allocated as one block. Further, the type and + * standard names may use a static string to avoid allocating space + * for those as necessary with the pointers pointing to static strings + * (not to be freed). Finally, small values are optimized for. + */ +attribute_t :: struct { + /** Name of the attribute. */ + name: cstring, + /** String type name of the attribute. */ + type_name: cstring, + /** Length of name string (short flag is 31 max, long allows 255). */ + name_length: u8, + /** Length of type string (short flag is 31 max, long allows 255). */ + type_name_length: u8, + + pad: [2]u8, + + /** Enum of the attribute type. */ + type: attribute_type_t, + + /** Union of pointers of different types that can be used to type + * pun to an appropriate type for builtins. Do note that while + * this looks like a big thing, it is only the size of a single + * pointer. These are all pointers into some other data block + * storing the value you want, with the exception of the pod types + * which are just put in place (i.e. small value optimization). + * + * The attribute type \c type should directly correlate to one + * of these entries. + */ + using _: struct #raw_union { + // NB: not pointers for POD types + uc: u8, + d: f64, + f: f32, + i: i32, + + box2i: ^attr_box2i_t, + box2f: ^attr_box2f_t, + chlist: ^attr_chlist_t, + chromaticities: ^attr_chromaticities_t, + keycode: ^attr_keycode_t, + floatvector: ^attr_float_vector_t, + m33f: ^attr_m33f_t, + m33d: ^attr_m33d_t, + m44f: ^attr_m44f_t, + m44d: ^attr_m44d_t, + preview: ^attr_preview_t, + rational: ^attr_rational_t, + string: ^attr_string_t, + stringvector: ^attr_string_vector_t, + tiledesc: ^attr_tiledesc_t, + timecode: ^attr_timecode_t, + v2i: ^attr_v2i_t, + v2f: ^attr_v2f_t, + v2d: ^attr_v2d_t, + v3i: ^attr_v3i_t, + v3f: ^attr_v3f_t, + v3d: ^attr_v3d_t, + opaque: ^attr_opaquedata_t, + rawptr: ^u8, + }, +} \ No newline at end of file diff --git a/vendor/openexr/exr_base.odin b/vendor/openexr/exr_base.odin new file mode 100644 index 000000000..0db4cc7ff --- /dev/null +++ b/vendor/openexr/exr_base.odin @@ -0,0 +1,170 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +import "core:c" + +/** @brief Function pointer used to hold a malloc-like routine. + * + * Providing these to a context will override what memory is used to + * allocate the context itself, as well as any allocations which + * happen during processing of a file or stream. This can be used by + * systems which provide rich malloc tracking routines to override the + * internal allocations performed by the library. + * + * This function is expected to allocate and return a new memory + * handle, or `NULL` if allocation failed (which the library will then + * handle and return an out-of-memory error). + * + * If one is provided, both should be provided. + * @sa exr_memory_free_func_t + */ +memory_allocation_func_t :: proc "c" (bytes: c.size_t) -> rawptr + +/** @brief Function pointer used to hold a free-like routine. + * + * Providing these to a context will override what memory is used to + * allocate the context itself, as well as any allocations which + * happen during processing of a file or stream. This can be used by + * systems which provide rich malloc tracking routines to override the + * internal allocations performed by the library. + * + * This function is expected to return memory to the system, ala free + * from the C library. + * + * If providing one, probably need to provide both routines. + * @sa exr_memory_allocation_func_t + */ +memory_free_func_t :: proc "c" (ptr: rawptr) + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + /** @brief Retrieve the current library version. The @p extra string is for + * custom installs, and is a static string, do not free the returned + * pointer. + */ + get_library_version :: proc(maj, min, patch: ^c.int, extra: ^cstring) --- + + /** @brief Limit the size of image allowed to be parsed or created by + * the library. + * + * This is used as a safety check against corrupt files, but can also + * serve to avoid potential issues on machines which have very + * constrained RAM. + * + * These values are among the only globals in the core layer of + * OpenEXR. The intended use is for applications to define a global + * default, which will be combined with the values provided to the + * individual context creation routine. The values are used to check + * against parsed header values. This adds some level of safety from + * memory overruns where a corrupt file given to the system may cause + * a large allocation to happen, enabling buffer overruns or other + * potential security issue. + * + * These global values are combined with the values in + * \ref exr_context_initializer_t using the following rules: + * + * 1. negative values are ignored. + * + * 2. if either value has a positive (non-zero) value, and the other + * has 0, the positive value is preferred. + * + * 3. If both are positive (non-zero), the minimum value is used. + * + * 4. If both values are 0, this disables the constrained size checks. + * + * This function does not fail. + */ + set_default_maximum_image_size :: proc(w, h: c.int) --- + + /** @brief Retrieve the global default maximum image size. + * + * This function does not fail. + */ + get_default_maximum_image_size :: proc(w, h: ^c.int) --- + + /** @brief Limit the size of an image tile allowed to be parsed or + * created by the library. + * + * Similar to image size, this places constraints on the maximum tile + * size as a safety check against bad file data + * + * This is used as a safety check against corrupt files, but can also + * serve to avoid potential issues on machines which have very + * constrained RAM + * + * These values are among the only globals in the core layer of + * OpenEXR. The intended use is for applications to define a global + * default, which will be combined with the values provided to the + * individual context creation routine. The values are used to check + * against parsed header values. This adds some level of safety from + * memory overruns where a corrupt file given to the system may cause + * a large allocation to happen, enabling buffer overruns or other + * potential security issue. + * + * These global values are combined with the values in + * \ref exr_context_initializer_t using the following rules: + * + * 1. negative values are ignored. + * + * 2. if either value has a positive (non-zero) value, and the other + * has 0, the positive value is preferred. + * + * 3. If both are positive (non-zero), the minimum value is used. + * + * 4. If both values are 0, this disables the constrained size checks. + * + * This function does not fail. + */ + set_default_maximum_tile_size :: proc(w, h: c.int) --- + + /** @brief Retrieve the global maximum tile size. + * + * This function does not fail. + */ + get_default_maximum_tile_size :: proc(w, h: ^c.int) --- + + /** @} */ + + /** + * @defgroup CompressionDefaults Provides default compression settings + * @{ + */ + + /** @brief Assigns a default zip compression level. + * + * This value may be controlled separately on each part, but this + * global control determines the initial value. + */ + set_default_zip_compression_level :: proc(l: c.int) --- + + /** @brief Retrieve the global default zip compression value + */ + get_default_zip_compression_level :: proc(l: ^c.int) --- + + /** @brief Assigns a default DWA compression quality level. + * + * This value may be controlled separately on each part, but this + * global control determines the initial value. + */ + set_default_dwa_compression_quality :: proc(q: f32) --- + + /** @brief Retrieve the global default dwa compression quality + */ + get_default_dwa_compression_quality :: proc(q: ^f32) --- + + /** @brief Allow the user to override default allocator used internal + * allocations necessary for files, attributes, and other temporary + * memory. + * + * These routines may be overridden when creating a specific context, + * however this provides global defaults such that the default can be + * applied. + * + * If either pointer is 0, the appropriate malloc/free routine will be + * substituted. + * + * This function does not fail. + */ + set_default_memory_routines :: proc(alloc_func: memory_allocation_func_t, free_func: memory_free_func_t) --- +} \ No newline at end of file diff --git a/vendor/openexr/exr_chunkio.odin b/vendor/openexr/exr_chunkio.odin new file mode 100644 index 000000000..612db2cb3 --- /dev/null +++ b/vendor/openexr/exr_chunkio.odin @@ -0,0 +1,143 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +import "core:c" + +/** + * Struct describing raw data information about a chunk. + * + * A chunk is the generic term for a pixel data block in an EXR file, + * as described in the OpenEXR File Layout documentation. This is + * common between all different forms of data that can be stored. + */ +chunk_info_t :: struct { + idx: i32, + + /** For tiles, this is the tilex; for scans it is the x. */ + start_x: i32, + /** For tiles, this is the tiley; for scans it is the scanline y. */ + start_y: i32, + height: i32, /**< For this chunk. */ + width: i32, /**< For this chunk. */ + + level_x: u8, /**< For tiled files. */ + level_y: u8, /**< For tiled files. */ + + type: u8, + compression: u8, + + data_offset: u64, + packed_size: u64, + unpacked_size: u64, + + sample_count_data_offset: u64, + sample_count_table_size: u64, +} + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + read_scanline_chunk_info :: proc(ctxt: const_context_t, part_index: c.int, y: c.int, cinfo: ^chunk_info_t) -> result_t --- + + read_tile_chunk_info :: proc( + ctxt: const_context_t, + part_index: c.int, + tilex: c.int, + tiley: c.int, + levelx: c.int, + levely: c.int, + cinfo: ^chunk_info_t) -> result_t --- + + /** Read the packed data block for a chunk. + * + * This assumes that the buffer pointed to by @p packed_data is + * large enough to hold the chunk block info packed_size bytes. + */ + read_chunk :: proc( + ctxt: const_context_t, + part_index: c.int, + cinfo: ^chunk_info_t, + packed_data: rawptr) -> result_t --- + + /** + * Read chunk for deep data. + * + * This allows one to read the packed data, the sample count data, or both. + * \c exr_read_chunk also works to read deep data packed data, + * but this is a routine to get the sample count table and the packed + * data in one go, or if you want to pre-read the sample count data, + * you can get just that buffer. + */ + read_deep_chunk :: proc( + ctxt: const_context_t, + part_index: c.int, + cinfo: ^chunk_info_t, + packed_data: rawptr, + sample_data: rawptr) -> result_t --- + + /**************************************/ + + /** Initialize a \c chunk_info_t structure when encoding scanline + * data (similar to read but does not do anything with a chunk + * table). + */ + write_scanline_chunk_info :: proc(ctxt: context_t, part_index: c.int, y: c.int, cinfo: ^chunk_info_t) -> result_t --- + + /** Initialize a \c chunk_info_t structure when encoding tiled data + * (similar to read but does not do anything with a chunk table). + */ + write_tile_chunk_info :: proc( + ctxt: context_t, + part_index: c.int, + tilex: c.int, + tiley: c.int, + levelx: c.int, + levely: c.int, + cinfo: ^chunk_info_t) -> result_t --- + + /** + * @p y must the appropriate starting y for the specified chunk. + */ + write_scanline_chunk :: proc( + ctxt: context_t, + part_index: int, + y: int, + packed_data: rawptr, + packed_size: u64) -> result_t --- + + /** + * @p y must the appropriate starting y for the specified chunk. + */ + write_deep_scanline_chunk :: proc( + ctxt: context_t, + part_index: c.int, + y: c.int, + packed_data: rawptr, + packed_size: u64, + unpacked_size: u64, + sample_data: rawptr, + sample_data_size: u64) -> result_t --- + + write_tile_chunk :: proc( + ctxt: context_t, + part_index: c.int, + tilex: c.int, + tiley: c.int, + levelx: c.int, + levely: c.int, + packed_data: rawptr, + packed_size: u64) -> result_t --- + + write_deep_tile_chunk :: proc( + ctxt: context_t, + part_index: c.int, + tilex: c.int, + tiley: c.int, + levelx: c.int, + levely: c.int, + packed_data: rawptr, + packed_size: u64, + unpacked_size: u64, + sample_data: rawptr, + sample_data_size: u64) -> result_t --- +} \ No newline at end of file diff --git a/vendor/openexr/exr_coding.odin b/vendor/openexr/exr_coding.odin new file mode 100644 index 000000000..337475edf --- /dev/null +++ b/vendor/openexr/exr_coding.odin @@ -0,0 +1,119 @@ +package vendor_openexr + +import "core:c" +/** + * Enum for use in a custom allocator in the encode/decode pipelines + * (that is, so the implementor knows whether to allocate on which + * device based on the buffer disposition). + */ +transcoding_pipeline_buffer_id_t :: enum c.int { + PACKED, + UNPACKED, + COMPRESSED, + SCRATCH1, + SCRATCH2, + PACKED_SAMPLES, + SAMPLES, +} + +/** @brief Struct for negotiating buffers when decoding/encoding + * chunks of data. + * + * This is generic and meant to negotiate exr data bi-directionally, + * in that the same structure is used for both decoding and encoding + * chunks for read and write, respectively. + * + * The first half of the structure will be filled by the library, and + * the caller is expected to fill the second half appropriately. + */ +coding_channel_info_t :: struct { + /************************************************** + * Elements below are populated by the library when + * decoding is initialized/updated and must be left + * untouched when using the default decoder routines. + **************************************************/ + + /** Channel name. + * + * This is provided as a convenient reference. Do not free, this + * refers to the internal data structure in the context. + */ + channel_name: cstring, + + /** Number of lines for this channel in this chunk. + * + * May be 0 or less than overall image height based on sampling + * (i.e. when in 4:2:0 type sampling) + */ + height: i32, + + /** Width in pixel count. + * + * May be 0 or less than overall image width based on sampling + * (i.e. 4:2:2 will have some channels have fewer values). + */ + width: i32, + + /** Horizontal subsampling information. */ + x_samples: i32, + /** Vertical subsampling information. */ + y_samples: i32, + + /** Linear flag from channel definition (used by b44). */ + p_linear: u8, + + /** How many bytes per pixel this channel consumes (2 for float16, + * 4 for float32/uint32). + */ + bytes_per_element: i8, + + /** Small form of exr_pixel_type_t enum (EXR_PIXEL_UINT/HALF/FLOAT). */ + data_type: u16, + + /************************************************** + * Elements below must be edited by the caller + * to control encoding/decoding. + **************************************************/ + + /** How many bytes per pixel the input is or output should be + * (2 for float16, 4 for float32/uint32). Defaults to same + * size as input. + */ + user_bytes_per_element: i16, + + /** Small form of exr_pixel_type_t enum + * (EXR_PIXEL_UINT/HALF/FLOAT). Defaults to same type as input. + */ + user_data_type: u16, + + /** Increment to get to next pixel. + * + * This is in bytes. Must be specified when the decode pointer is + * specified (and always for encode). + * + * This is useful for implementing transcoding generically of + * planar or interleaved data. For planar data, where the layout + * is RRRRRGGGGGBBBBB, you can pass in 1 * bytes per component. + */ + + user_pixel_stride: i32, + + /** When \c lines > 1 for a chunk, this is the increment used to get + * from beginning of line to beginning of next line. + * + * This is in bytes. Must be specified when the decode pointer is + * specified (and always for encode). + */ + user_line_stride: i32, + + /** This data member has different requirements reading vs + * writing. When reading, if this is left as `NULL`, the channel + * will be skipped during read and not filled in. During a write + * operation, this pointer is considered const and not + * modified. To make this more clear, a union is used here. + */ + using _: struct #raw_union { + decode_to_ptr: ^u8, + encode_from_ptr: ^u8, + }, +} diff --git a/vendor/openexr/exr_context.odin b/vendor/openexr/exr_context.odin new file mode 100644 index 000000000..958e30490 --- /dev/null +++ b/vendor/openexr/exr_context.odin @@ -0,0 +1,485 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +import "core:c" + +#assert(size_of(c.int) == size_of(b32)) + +context_t :: distinct rawptr +const_context_t :: context_t + +/** + * @defgroup ContextFunctions OpenEXR Context Stream/File Functions + * + * @brief These are a group of function interfaces used to customize + * the error handling, memory allocations, or I/O behavior of an + * OpenEXR context. + * + * @{ + */ + +/** @brief Stream error notifier + * + * This function pointer is provided to the stream functions by the + * library such that they can provide a nice error message to the + * user during stream operations. + */ +stream_error_func_ptr_t :: proc "c" (ctxt: const_context_t, code: result_t, fmt: cstring, #c_vararg args: ..any) -> result_t + +/** @brief Error callback function + * + * Because a file can be read from using many threads at once, it is + * difficult to store an error message for later retrieval. As such, + * when a file is constructed, a callback function can be provided + * which delivers an error message for the calling application to + * handle. This will then be delivered on the same thread causing the + * error. + */ +error_handler_cb_t :: proc "c" (ctxt: const_context_t, code: result_t, msg: cstring) + +/** Destroy custom stream function pointer + * + * Generic callback to clean up user data for custom streams. + * This is called when the file is closed and expected not to + * error. + * + * @param failed Indicates the write operation failed, the + * implementor may wish to cleanup temporary files + */ +destroy_stream_func_ptr_t :: proc "c" (ctxt: const_context_t, userdata: rawptr, failed: c.int) + +/** Query stream size function pointer + * + * Used to query the size of the file, or amount of data representing + * the openexr file in the data stream. + * + * This is used to validate requests against the file. If the size is + * unavailable, return -1, which will disable these validation steps + * for this file, although appropriate memory safeguards must be in + * place in the calling application. + */ +query_size_func_ptr_t :: proc "c" (ctxt: const_context_t, userdata: rawptr) -> i64 + +/** @brief Read custom function pointer + * + * Used to read data from a custom output. Expects similar semantics to + * pread or ReadFile with overlapped data under win32. + * + * It is required that this provides thread-safe concurrent access to + * the same file. If the stream/input layer you are providing does + * not have this guarantee, your are responsible for providing + * appropriate serialization of requests. + * + * A file should be expected to be accessed in the following pattern: + * - upon open, the header and part information attributes will be read + * - upon the first image read request, the offset tables will be read + * multiple threads accessing this concurrently may actually read + * these values at the same time + * - chunks can then be read in any order as preferred by the + * application + * + * While this should mean that the header will be read in 'stream' + * order (no seeks required), no guarantee is made beyond that to + * retrieve image/deep data in order. So if the backing file is + * truly a stream, it is up to the provider to implement appropriate + * caching of data to give the appearance of being able to seek/read + * atomically. + */ +read_func_ptr_t :: proc "c" ( + ctxt: const_context_t, + userdata: rawptr, + buffer: rawptr, + sz: u64, + offset: u64, + error_cb: stream_error_func_ptr_t) -> i64 + +/** Write custom function pointer + * + * Used to write data to a custom output. Expects similar semantics to + * pwrite or WriteFile with overlapped data under win32. + * + * It is required that this provides thread-safe concurrent access to + * the same file. While it is unlikely that multiple threads will + * be used to write data for compressed forms, it is possible. + * + * A file should be expected to be accessed in the following pattern: + * - upon open, the header and part information attributes is constructed. + * + * - when the write_header routine is called, the header becomes immutable + * and is written to the file. This computes the space to store the chunk + * offsets, but does not yet write the values. + * + * - Image chunks are written to the file, and appear in the order + * they are written, not in the ordering that is required by the + * chunk offset table (unless written in that order). This may vary + * slightly if the size of the chunks is not directly known and + * tight packing of data is necessary. + * + * - at file close, the chunk offset tables are written to the file. + */ +write_func_ptr_t :: proc "c" ( + ctxt: const_context_t, + userdata: rawptr, + buffer: rawptr, + sz: u64, + offset: u64, + error_cb: stream_error_func_ptr_t) -> i64 + +/** @brief Struct used to pass function pointers into the context + * initialization routines. + * + * This partly exists to avoid the chicken and egg issue around + * creating the storage needed for the context on systems which want + * to override the malloc/free routines. + * + * However, it also serves to make a tidier/simpler set of functions + * to create and start processing exr files. + * + * The size member is required for version portability. + * + * It can be initialized using \c EXR_DEFAULT_CONTEXT_INITIALIZER. + * + * \code{.c} + * exr_context_initializer_t myctxtinit = DEFAULT_CONTEXT_INITIALIZER; + * myctxtinit.error_cb = &my_super_cool_error_callback_function; + * ... + * \endcode + * + */ +context_initializer_t :: struct { + /** @brief Size member to tag initializer for version stability. + * + * This should be initialized to the size of the current + * structure. This allows EXR to add functions or other + * initializers in the future, and retain version compatibility + */ + size: c.size_t, + + /** @brief Error callback function pointer + * + * The error callback is allowed to be `NULL`, and will use a + * default print which outputs to \c stderr. + * + * @sa exr_error_handler_cb_t + */ + error_handler_fn: error_handler_cb_t, + + /** Custom allocator, if `NULL`, will use malloc. @sa memory_allocation_func_t */ + alloc_fn: memory_allocation_func_t, + + /** Custom deallocator, if `NULL`, will use free. @sa memory_free_func_t */ + free_fn: memory_free_func_t, + + /** Blind data passed to custom read, size, write, destroy + * functions below. Up to user to manage this pointer. + */ + user_data: rawptr, + + /** @brief Custom read routine. + * + * This is only used during read or update contexts. If this is + * provided, it is expected that the caller has previously made + * the stream available, and placed whatever stream/file data + * into \c user_data above. + * + * If this is `NULL`, and the context requested is for reading an + * exr file, an internal implementation is provided for reading + * from normal filesystem files, and the filename provided is + * attempted to be opened as such. + * + * Expected to be `NULL` for a write-only operation, but is ignored + * if it is provided. + * + * For update contexts, both read and write functions must be + * provided if either is. + * + * @sa exr_read_func_ptr_t + */ + read_fn: read_func_ptr_t, + + /** @brief Custom size query routine. + * + * Used to provide validation when reading header values. If this + * is not provided, but a custom read routine is provided, this + * will disable some of the validation checks when parsing the + * image header. + * + * Expected to be `NULL` for a write-only operation, but is ignored + * if it is provided. + * + * @sa exr_query_size_func_ptr_t + */ + size_fn: query_size_func_ptr_t, + + /** @brief Custom write routine. + * + * This is only used during write or update contexts. If this is + * provided, it is expected that the caller has previously made + * the stream available, and placed whatever stream/file data + * into \c user_data above. + * + * If this is `NULL`, and the context requested is for writing an + * exr file, an internal implementation is provided for reading + * from normal filesystem files, and the filename provided is + * attempted to be opened as such. + * + * For update contexts, both read and write functions must be + * provided if either is. + * + * @sa exr_write_func_ptr_t + */ + write_fn: write_func_ptr_t, + + /** @brief Optional function to destroy the user data block of a custom stream. + * + * Allows one to free any user allocated data, and close any handles. + * + * @sa exr_destroy_stream_func_ptr_t + * */ + destroy_fn: destroy_stream_func_ptr_t, + + /** Initialize a field specifying what the maximum image width + * allowed by the context is. See exr_set_default_maximum_image_size() to + * understand how this interacts with global defaults. + */ + max_image_width: c.int, + + /** Initialize a field specifying what the maximum image height + * allowed by the context is. See exr_set_default_maximum_image_size() to + * understand how this interacts with global defaults. + */ + max_image_height: c.int, + + /** Initialize a field specifying what the maximum tile width + * allowed by the context is. See exr_set_default_maximum_tile_size() to + * understand how this interacts with global defaults. + */ + max_tile_width: c.int, + + /** Initialize a field specifying what the maximum tile height + * allowed by the context is. See exr_set_default_maximum_tile_size() to + * understand how this interacts with global defaults. + */ + max_tile_height: c.int, + + /** Initialize a field specifying what the default zip compression level should be + * for this context. See exr_set_default_zip_compresion_level() to + * set it for all contexts. + */ + zip_level: c.int, + + /** Initialize the default dwa compression quality. See + * exr_set_default_dwa_compression_quality() to set the default + * for all contexts. + */ + dwa_quality: f32, + + /** Initialize with a bitwise or of the various context flags + */ + flags: c.int, +} + +/** @brief context flag which will enforce strict header validation + * checks and may prevent reading of files which could otherwise be + * processed. + */ +CONTEXT_FLAG_STRICT_HEADER :: (1 << 0) + +/** @brief Disables error messages while parsing headers + * + * The return values will remain the same, but error reporting will be + * skipped. This is only valid for reading contexts + */ +CONTEXT_FLAG_SILENT_HEADER_PARSE :: (1 << 1) + +/** @brief Disables reconstruction logic upon corrupt / missing data chunks + * + * This will disable the reconstruction logic that searches through an + * incomplete file, and will instead just return errors at read + * time. This is only valid for reading contexts + */ +CONTEXT_FLAG_DISABLE_CHUNK_RECONSTRUCTION :: (1 << 2) + +/** @brief Simple macro to initialize the context initializer with default values. */ +DEFAULT_CONTEXT_INITIALIZER :: context_initializer_t{zip_level = -2, dwa_quality = -1} + +/** @} */ /* context function pointer declarations */ + + +/** @brief Enum describing how default files are handled during write. */ +default_write_mode_t :: enum c.int { + WRITE_FILE_DIRECTLY = 0, /**< Overwrite filename provided directly, deleted upon error. */ + INTERMEDIATE_TEMP_FILE = 1, /**< Create a temporary file, renaming it upon successful write, leaving original upon error */ +} + + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + /** @brief Check the magic number of the file and report + * `EXR_ERR_SUCCESS` if the file appears to be a valid file (or at least + * has the correct magic number and can be read). + */ + test_file_header :: proc(filename: cstring, ctxtdata: ^context_initializer_t) -> result_t --- + + /** @brief Close and free any internally allocated memory, + * calling any provided destroy function for custom streams. + * + * If the file was opened for write, first save the chunk offsets + * or any other unwritten data. + */ + finish :: proc(ctxt: ^context_t) -> result_t --- + + /** @brief Create and initialize a read-only exr read context. + * + * If a custom read function is provided, the filename is for + * informational purposes only, the system assumes the user has + * previously opened a stream, file, or whatever and placed relevant + * data in userdata to access that. + * + * One notable attribute of the context is that once it has been + * created and returned a successful code, it has parsed all the + * header data. This is done as one step such that it is easier to + * provide a safe context for multiple threads to request data from + * the same context concurrently. + * + * Once finished reading data, use exr_finish() to clean up + * the context. + * + * If you have custom I/O requirements, see the initializer context + * documentation \ref exr_context_initializer_t. The @p ctxtdata parameter + * is optional, if `NULL`, default values will be used. + */ + start_read :: proc( + ctxt: ^context_t, + filename: cstring, + ctxtdata: ^context_initializer_t) -> result_t --- + + /** @brief Create and initialize a write-only context. + * + * If a custom write function is provided, the filename is for + * informational purposes only, and the @p default_mode parameter will be + * ignored. As such, the system assumes the user has previously opened + * a stream, file, or whatever and placed relevant data in userdata to + * access that. + * + * Multi-Threading: To avoid issues with creating multi-part EXR + * files, the library approaches writing as a multi-step process, so + * the same concurrent guarantees can not be made for writing a + * file. The steps are: + * + * 1. Context creation (this function) + * + * 2. Part definition (required attributes and additional metadata) + * + * 3. Transition to writing data (this "commits" the part definitions, + * any changes requested after will result in an error) + * + * 4. Write part data in sequential order of parts (part0 + * -> partN-1). + * + * 5. Within each part, multiple threads can be encoding and writing + * data concurrently. For some EXR part definitions, this may be able + * to write data concurrently when it can predict the chunk sizes, or + * data is allowed to be padded. For others, it may need to + * temporarily cache chunks until the data is received to flush in + * order. The concurrency around this is handled by the library + * + * 6. Once finished writing data, use exr_finish() to clean + * up the context, which will flush any unwritten data such as the + * final chunk offset tables, and handle the temporary file flags. + * + * If you have custom I/O requirements, see the initializer context + * documentation \ref exr_context_initializer_t. The @p ctxtdata + * parameter is optional, if `NULL`, default values will be used. + */ + start_write :: proc( + ctxt: ^context_t, + filename: cstring, + default_mode: default_write_mode_t, + ctxtdata: ^context_initializer_t) -> result_t --- + + /** @brief Create a new context for updating an exr file in place. + * + * This is a custom mode that allows one to modify the value of a + * metadata entry, although not to change the size of the header, or + * any of the image data. + * + * If you have custom I/O requirements, see the initializer context + * documentation \ref exr_context_initializer_t. The @p ctxtdata parameter + * is optional, if `NULL`, default values will be used. + */ + start_inplace_header_update :: proc( + ctxt: ^context_t, + filename: cstring, + ctxtdata: ^context_initializer_t) -> result_t --- + + /** @brief Retrieve the file name the context is for as provided + * during the start routine. + * + * Do not free the resulting string. + */ + + get_file_name :: proc(ctxt: const_context_t, name: ^cstring) -> result_t --- + + /** @brief Query the user data the context was constructed with. This + * is perhaps useful in the error handler callback to jump back into + * an object the user controls. + */ + + get_user_data :: proc(ctxt: const_context_t, userdata: ^rawptr) -> result_t --- + + /** Any opaque attribute data entry of the specified type is tagged + * with these functions enabling downstream users to unpack (or pack) + * the data. + * + * The library handles the memory packed data internally, but the + * handler is expected to allocate and manage memory for the + * *unpacked* buffer (the library will call the destroy function). + * + * NB: the pack function will be called twice (unless there is a + * memory failure), the first with a `NULL` buffer, requesting the + * maximum size (or exact size if known) for the packed buffer, then + * the second to fill the output packed buffer, at which point the + * size can be re-updated to have the final, precise size to put into + * the file. + */ + register_attr_type_handler :: proc( + ctxt: context_t, + type: cstring, + unpack_func_ptr: proc "c" ( + ctxt: context_t, + data: rawptr, + attrsize: i32, + outsize: ^i32, + outbuffer: ^rawptr) -> result_t, + pack_func_ptr: proc "c" ( + ctxt: context_t, + data: rawptr, + datasize: i32, + outsize: ^i32, + outbuffer: rawptr) -> result_t, + destroy_unpacked_func_ptr: proc "c" ( + ctxt: context_t, data: rawptr, datasize: i32), + ) -> result_t --- + + /** @brief Enable long name support in the output context */ + + set_longname_support :: proc(ctxt: context_t, onoff: b32) -> result_t --- + + /** @brief Write the header data. + * + * Opening a new output file has a small initialization state problem + * compared to opening for read/update: we need to enable the user + * to specify an arbitrary set of metadata across an arbitrary number + * of parts. To avoid having to create the list of parts and entire + * metadata up front, prior to calling the above exr_start_write(), + * allow the data to be set, then once this is called, it switches + * into a mode where the library assumes the data is now valid. + * + * It will recompute the number of chunks that will be written, and + * reset the chunk offsets. If you modify file attributes or part + * information after a call to this, it will error. + */ + write_header :: proc(ctxt: context_t) -> result_t --- +} \ No newline at end of file diff --git a/vendor/openexr/exr_debug.odin b/vendor/openexr/exr_debug.odin new file mode 100644 index 000000000..f2c8e18cb --- /dev/null +++ b/vendor/openexr/exr_debug.odin @@ -0,0 +1,8 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + print_context_info :: proc(c: const_context_t, verbose: b32) -> result_t --- +} \ No newline at end of file diff --git a/vendor/openexr/exr_decode.odin b/vendor/openexr/exr_decode.odin new file mode 100644 index 000000000..7eca819f7 --- /dev/null +++ b/vendor/openexr/exr_decode.odin @@ -0,0 +1,288 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +import "core:c" + +/** Can be bit-wise or'ed into the decode_flags in the decode pipeline. + * + * Indicates that the sample count table should be decoded to a an + * individual sample count list (n, m, o, ...), with an extra int at + * the end containing the total samples. + * + * Without this (i.e. a value of 0 in that bit), indicates the sample + * count table should be decoded to a cumulative list (n, n+m, n+m+o, + * ...), which is the on-disk representation. + */ +DECODE_SAMPLE_COUNTS_AS_INDIVIDUAL :: u16(1 << 0) + +/** Can be bit-wise or'ed into the decode_flags in the decode pipeline. + * + * Indicates that the data in the channel pointers to decode to is not + * a direct pointer, but instead is a pointer-to-pointers. In this + * mode, the user_pixel_stride and user_line_stride are used to + * advance the pointer offsets for each pixel in the output, but the + * user_bytes_per_element and user_data_type are used to put + * (successive) entries into each destination pointer (if not `NULL`). + * + * So each channel pointer must then point to an array of + * chunk.width * chunk.height pointers. + * + * With this, you can only extract desired pixels (although all the + * pixels must be initially decompressed) to handle such operations + * like proxying where you might want to read every other pixel. + * + * If this is NOT set (0), the default unpacking routine assumes the + * data will be planar and contiguous (each channel is a separate + * memory block), ignoring user_line_stride and user_pixel_stride. + */ +DECODE_NON_IMAGE_DATA_AS_POINTERS :: u16(1 << 1) + +/** + * When reading non-image data (i.e. deep), only read the sample table. + */ +DECODE_SAMPLE_DATA_ONLY :: u16(1 << 2) + +/** + * Struct meant to be used on a per-thread basis for reading exr data + * + * As should be obvious, this structure is NOT thread safe, but rather + * meant to be used by separate threads, which can all be accessing + * the same context concurrently. + */ +decode_pipeline_t :: struct { + /** The output channel information for this chunk. + * + * User is expected to fill the channel pointers for the desired + * output channels (any that are `NULL` will be skipped) if you are + * going to use exr_decoding_choose_default_routines(). If all that is + * desired is to read and decompress the data, this can be left + * uninitialized. + * + * Describes the channel information. This information is + * allocated dynamically during exr_decoding_initialize(). + */ + channels: [^]coding_channel_info_t, + channel_count: i16, + + /** Decode flags to control the behavior. */ + decode_flags: u16, + + /** Copy of the parameters given to the initialize/update for + * convenience. + */ + part_index: c.int, + ctx: const_context_t, + chunk: chunk_info_t, + + /** Can be used by the user to pass custom context data through + * the decode pipeline. + */ + decoding_user_data: rawptr, + + /** The (compressed) buffer. + * + * If `NULL`, will be allocated during the run of the pipeline. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + packed_buffer: rawptr, + + /** Used when re-using the same decode pipeline struct to know if + * chunk is changed size whether current buffer is large enough. + */ + packed_alloc_size: c.size_t, + + /** The decompressed buffer (unpacked_size from the chunk block + * info), but still packed into storage order, only needed for + * compressed files. + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + unpacked_buffer: rawptr, + + /** Used when re-using the same decode pipeline struct to know if + * chunk is changed size whether current buffer is large enough. + */ + unpacked_alloc_size: c.size_t, + + /** For deep or other non-image data: packed sample table + * (compressed, raw on disk representation). + */ + packed_sample_count_table: rawptr, + packed_sample_count_alloc_size: c.size_t, + + /** Usable, native sample count table. Depending on the flag set + * above, will be decoded to either a cumulative list (n, n+m, + * n+m+o, ...), or an individual table (n, m, o, ...). As an + * optimization, if the latter individual count table is chosen, + * an extra int32_t will be allocated at the end of the table to + * contain the total count of samples, so the table will be n+1 + * samples in size. + */ + sample_count_table: [^]i32, + sample_count_alloc_size: c.size_t, + + /** A scratch buffer of unpacked_size for intermediate results. + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + scratch_buffer_1: rawptr, + + /** Used when re-using the same decode pipeline struct to know if + * chunk is changed size whether current buffer is large enough. + */ + scratch_alloc_size_1: c.size_t, + + /** Some decompression routines may need a second scratch buffer (zlib). + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + scratch_buffer_2: rawptr, + + /** Used when re-using the same decode pipeline struct to know if + * chunk is changed size whether current buffer is large enough. + */ + scratch_alloc_size_2: c.size_t, + + /** Enable a custom allocator for the different buffers (if + * decoding on a GPU). If `NULL`, will use the allocator from the + * context. + */ + alloc_fn: proc "c" (transcoding_pipeline_buffer_id_t, c.size_t) -> rawptr, + + /** Enable a custom allocator for the different buffers (if + * decoding on a GPU). If `NULL`, will use the allocator from the + * context. + */ + free_fn: proc "c" (transcoding_pipeline_buffer_id_t, rawptr), + + /** Function chosen to read chunk data from the context. + * + * Initialized to a default generic read routine, may be updated + * based on channel information when + * exr_decoding_choose_default_routines() is called. This is done such that + * if the file is uncompressed and the output channel data is + * planar and the same type, the read function can read straight + * into the output channels, getting closer to a zero-copy + * operation. Otherwise a more traditional read, decompress, then + * unpack pipeline will be used with a default reader. + * + * This is allowed to be overridden, but probably is not necessary + * in most scenarios. + */ + read_fn: proc "c" (pipeline: ^decode_pipeline_t) -> result_t, + + /** Function chosen based on the compression type of the part to + * decompress data. + * + * If the user has a custom decompression method for the + * compression on this part, this can be changed after + * initialization. + * + * If only compressed data is desired, then assign this to `NULL` + * after initialization. + */ + decompress_fn: proc "c" (pipeline: ^decode_pipeline_t) -> result_t, + + /** Function which can be provided if you have bespoke handling for + * non-image data and need to re-allocate the data to handle the + * about-to-be unpacked data. + * + * If left `NULL`, will assume the memory pointed to by the channel + * pointers is sufficient. + */ + realloc_nonimage_data_fn: proc "c" (pipeline: ^decode_pipeline_t) -> result_t, + + /** Function chosen based on the output layout of the channels of the part to + * decompress data. + * + * This will be `NULL` after initialization, until the user + * specifies a custom routine, or initializes the channel data and + * calls exr_decoding_choose_default_routines(). + * + * If only compressed data is desired, then leave or assign this + * to `NULL` after initialization. + */ + unpack_and_convert_fn: proc "c" (pipeline: ^decode_pipeline_t) -> result_t, + + /** Small stash of channel info values. This is faster than calling + * malloc when the channel count in the part is small (RGBAZ), + * which is super common, however if there are a large number of + * channels, it will allocate space for that, so do not rely on + * this being used. + */ + _quick_chan_store: [5]coding_channel_info_t, +} + +DECODE_PIPELINE_INITIALIZER :: decode_pipeline_t{} + + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + /** Initialize the decoding pipeline structure with the channel info + * for the specified part, and the first block to be read. + * + * NB: The decode->unpack_and_convert_fn field will be `NULL` after this. If that + * stage is desired, initialize the channel output information and + * call exr_decoding_choose_default_routines(). + */ + decoding_initialize :: proc( + ctxt: const_context_t, + part_index: c.int, + cinfo: ^chunk_info_t, + decode: ^decode_pipeline_t) -> result_t --- + + /** Given an initialized decode pipeline, find appropriate functions + * to read and shuffle/convert data into the defined channel outputs. + * + * Calling this is not required if custom routines will be used, or if + * just the raw compressed data is desired. Although in that scenario, + * it is probably easier to just read the chunk directly using + * exr_read_chunk(). + */ + decoding_choose_default_routines :: proc( + ctxt: const_context_t, part_index: c.int, decode: ^decode_pipeline_t) -> result_t --- + + /** Given a decode pipeline previously initialized, update it for the + * new chunk to be read. + * + * In this manner, memory buffers can be re-used to avoid continual + * malloc/free calls. Further, it allows the previous choices for + * the various functions to be quickly re-used. + */ + decoding_update :: proc( + ctxt: const_context_t, + part_index: c.int, + cinfo: ^chunk_info_t, + decode: ^decode_pipeline_t) -> result_t --- + + /** Execute the decoding pipeline. */ + decoding_run :: proc( + ctxt: const_context_t, part_index: c.int, decode: ^decode_pipeline_t) -> result_t --- + + /** Free any intermediate memory in the decoding pipeline. + * + * This does *not* free any pointers referred to in the channel info + * areas, but rather only the intermediate buffers and memory needed + * for the structure itself. + */ + decoding_destroy :: proc(ctxt: const_context_t, decode: ^decode_pipeline_t) -> result_t --- +} \ No newline at end of file diff --git a/vendor/openexr/exr_encode.odin b/vendor/openexr/exr_encode.odin new file mode 100644 index 000000000..402aaba81 --- /dev/null +++ b/vendor/openexr/exr_encode.odin @@ -0,0 +1,319 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +import "core:c" + +/** Can be bit-wise or'ed into the decode_flags in the decode pipeline. + * + * Indicates that the sample count table should be encoded from an + * individual sample count list (n, m, o, ...), meaning it will have + * to compute the cumulative counts on the fly. + * + * Without this (i.e. a value of 0 in that bit), indicates the sample + * count table is already a cumulative list (n, n+m, n+m+o, ...), + * which is the on-disk representation. + */ +ENCODE_DATA_SAMPLE_COUNTS_ARE_INDIVIDUAL :: u16(1 << 0) + +/** Can be bit-wise or'ed into the decode_flags in the decode pipeline. + * + * Indicates that the data in the channel pointers to encode from is not + * a direct pointer, but instead is a pointer-to-pointers. In this + * mode, the user_pixel_stride and user_line_stride are used to + * advance the pointer offsets for each pixel in the output, but the + * user_bytes_per_element and user_data_type are used to put + * (successive) entries into each destination. + * + * So each channel pointer must then point to an array of + * chunk.width * chunk.height pointers. If an entry is + * `NULL`, 0 samples will be placed in the output. + * + * If this is NOT set (0), the default packing routine assumes the + * data will be planar and contiguous (each channel is a separate + * memory block), ignoring user_line_stride and user_pixel_stride and + * advancing only by the sample counts and bytes per element. + */ +ENCODE_NON_IMAGE_DATA_AS_POINTERS :: u16(1 << 1) + +/** Struct meant to be used on a per-thread basis for writing exr data. + * + * As should be obvious, this structure is NOT thread safe, but rather + * meant to be used by separate threads, which can all be accessing + * the same context concurrently. + */ + encode_pipeline_t :: struct { + /** The output channel information for this chunk. + * + * User is expected to fill the channel pointers for the input + * channels. For writing, all channels must be initialized prior + * to using exr_encoding_choose_default_routines(). If a custom pack routine + * is written, that is up to the implementor. + * + * Describes the channel information. This information is + * allocated dynamically during exr_encoding_initialize(). + */ + channels: [^]coding_channel_info_t, + channel_count: i16, + + /** Encode flags to control the behavior. */ + encode_flags: u16, + + /** Copy of the parameters given to the initialize/update for convenience. */ + part_index: c.int, + ctx: const_context_t, + chunk: chunk_info_t, + + /** Can be used by the user to pass custom context data through + * the encode pipeline. + */ + encoding_user_data: rawptr, + + /** The packed buffer where individual channels have been put into here. + * + * If `NULL`, will be allocated during the run of the pipeline. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + packed_buffer: rawptr, + + /** Differing from the allocation size, the number of actual bytes */ + packed_bytes: u64, + + /** Used when re-using the same encode pipeline struct to know if + * chunk is changed size whether current buffer is large enough + * + * If `NULL`, will be allocated during the run of the pipeline. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + packed_alloc_size: c.size_t, + + /** For deep data. NB: the members NOT const because we need to + * temporarily swap it to xdr order and restore it (to avoid a + * duplicate buffer allocation). + * + * Depending on the flag set above, will be treated either as a + * cumulative list (n, n+m, n+m+o, ...), or an individual table + * (n, m, o, ...). */ + sample_count_table: [^]i32, + + /** Allocated table size (to avoid re-allocations). Number of + * samples must always be width * height for the chunk. + */ + sample_count_alloc_size: c.size_t, + + /** Packed sample table (compressed, raw on disk representation) + * for deep or other non-image data. + */ + packed_sample_count_table: rawptr, + + /** Number of bytes to write (actual size) for the + * packed_sample_count_table. + */ + packed_sample_count_bytes: c.size_t, + + /** Allocated size (to avoid re-allocations) for the + * packed_sample_count_table. + */ + packed_sample_count_alloc_size: c.size_t, + + /** The compressed buffer, only needed for compressed files. + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + compressed_buffer: rawptr, + + /** Must be filled in as the pipeline runs to inform the writing + * software about the compressed size of the chunk (if it is an + * uncompressed file or the compression would make the file + * larger, it is expected to be the packed_buffer) + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to zero here. Be cognizant of any + * custom allocators. + */ + compressed_bytes: c.size_t, + + /** Used when re-using the same encode pipeline struct to know if + * chunk is changed size whether current buffer is large enough. + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to zero here. Be cognizant of any + * custom allocators. + */ + compressed_alloc_size: c.size_t, + + /** A scratch buffer for intermediate results. + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + scratch_buffer_1: rawptr, + + /** Used when re-using the same encode pipeline struct to know if + * chunk is changed size whether current buffer is large enough. + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + scratch_alloc_size_1: c.size_t, + + /** Some compression routines may need a second scratch buffer. + * + * If `NULL`, will be allocated during the run of the pipeline when + * needed. + * + * If the caller wishes to take control of the buffer, simple + * adopt the pointer and set it to `NULL` here. Be cognizant of any + * custom allocators. + */ + scratch_buffer_2: rawptr, + + /** Used when re-using the same encode pipeline struct to know if + * chunk is changed size whether current buffer is large enough. + */ + scratch_alloc_size_2: c.size_t, + + /** Enable a custom allocator for the different buffers (if + * encoding on a GPU). If `NULL`, will use the allocator from the + * context. + */ + alloc_fn: proc "c" (transcoding_pipeline_buffer_id_t, c.size_t) -> rawptr, + + /** Enable a custom allocator for the different buffers (if + * encoding on a GPU). If `NULL`, will use the allocator from the + * context. + */ + free_fn: proc "c" (transcoding_pipeline_buffer_id_t, rawptr), + + /** Function chosen based on the output layout of the channels of the part to + * decompress data. + * + * If the user has a custom method for the + * compression on this part, this can be changed after + * initialization. + */ + convert_and_pack_fn: proc "c" (pipeline: ^encode_pipeline_t) -> result_t, + + /** Function chosen based on the compression type of the part to + * compress data. + * + * If the user has a custom compression method for the compression + * type on this part, this can be changed after initialization. + */ + compress_fn: proc "c" (pipeline: ^encode_pipeline_t) -> result_t, + + /** This routine is used when waiting for other threads to finish + * writing previous chunks such that this thread can write this + * chunk. This is used for parts which have a specified chunk + * ordering (increasing/decreasing y) and the chunks can not be + * written randomly (as could be true for uncompressed). + * + * This enables the calling application to contribute thread time + * to other computation as needed, or just use something like + * pthread_yield(). + * + * By default, this routine will be assigned to a function which + * returns an error, failing the encode immediately. In this way, + * it assumes that there is only one thread being used for + * writing. + * + * It is up to the user to provide an appropriate routine if + * performing multi-threaded writing. + */ + yield_until_ready_fn: proc "c" (pipeline: ^encode_pipeline_t) -> result_t, + + /** Function chosen to write chunk data to the context. + * + * This is allowed to be overridden, but probably is not necessary + * in most scenarios. + */ + write_fn: proc "c" (pipeline: ^encode_pipeline_t) -> result_t, + + /** Small stash of channel info values. This is faster than calling + * malloc when the channel count in the part is small (RGBAZ), + * which is super common, however if there are a large number of + * channels, it will allocate space for that, so do not rely on + * this being used. + */ + _quick_chan_store: [5]coding_channel_info_t, +} + +ENCODE_PIPELINE_INITIALIZER :: encode_pipeline_t{} + + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + /** Initialize the encoding pipeline structure with the channel info + * for the specified part based on the chunk to be written. + * + * NB: The encode_pipe->pack_and_convert_fn field will be `NULL` after this. If that + * stage is desired, initialize the channel output information and + * call exr_encoding_choose_default_routines(). + */ + encoding_initialize :: proc( + ctxt: const_context_t, + part_index: c.int, + cinfo: ^chunk_info_t, + encode_pipe: ^encode_pipeline_t) -> result_t --- + + /** Given an initialized encode pipeline, find an appropriate + * function to shuffle and convert data into the defined channel + * outputs. + * + * Calling this is not required if a custom routine will be used, or + * if just the raw decompressed data is desired. + */ + encoding_choose_default_routines :: proc( + ctxt: const_context_t, + part_index: c.int, + encode_pipe: ^encode_pipeline_t) -> result_t --- + + /** Given a encode pipeline previously initialized, update it for the + * new chunk to be written. + * + * In this manner, memory buffers can be re-used to avoid continual + * malloc/free calls. Further, it allows the previous choices for + * the various functions to be quickly re-used. + */ + encoding_update :: proc( + ctxt: const_context_t, + part_index: c.int, + cinfo: ^chunk_info_t, + encode_pipe: ^encode_pipeline_t) -> result_t --- + + /** Execute the encoding pipeline. */ + encoding_run :: proc( + ctxt: const_context_t, + part_index: c.int, + encode_pipe: ^encode_pipeline_t) -> result_t --- + + /** Free any intermediate memory in the encoding pipeline. + * + * This does NOT free any pointers referred to in the channel info + * areas, but rather only the intermediate buffers and memory needed + * for the structure itself. + */ + encoding_destroy :: proc(ctxt: const_context_t, encode_pipe: ^encode_pipeline_t) -> result_t --- +} \ No newline at end of file diff --git a/vendor/openexr/exr_errors.odin b/vendor/openexr/exr_errors.odin new file mode 100644 index 000000000..cf2194756 --- /dev/null +++ b/vendor/openexr/exr_errors.odin @@ -0,0 +1,62 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +import "core:c" +#assert(size_of(c.int) == size_of(i32)) + +/** Error codes that may be returned by various functions. */ +error_code_t :: enum i32 { + SUCCESS = 0, + OUT_OF_MEMORY, + MISSING_CONTEXT_ARG, + INVALID_ARGUMENT, + ARGUMENT_OUT_OF_RANGE, + FILE_ACCESS, + FILE_BAD_HEADER, + NOT_OPEN_READ, + NOT_OPEN_WRITE, + HEADER_NOT_WRITTEN, + READ_IO, + WRITE_IO, + NAME_TOO_LONG, + MISSING_REQ_ATTR, + INVALID_ATTR, + NO_ATTR_BY_NAME, + ATTR_TYPE_MISMATCH, + ATTR_SIZE_MISMATCH, + SCAN_TILE_MIXEDAPI, + TILE_SCAN_MIXEDAPI, + MODIFY_SIZE_CHANGE, + ALREADY_WROTE_ATTRS, + BAD_CHUNK_LEADER, + CORRUPT_CHUNK, + INCORRECT_PART, + INCORRECT_CHUNK, + USE_SCAN_DEEP_WRITE, + USE_TILE_DEEP_WRITE, + USE_SCAN_NONDEEP_WRITE, + USE_TILE_NONDEEP_WRITE, + INVALID_SAMPLE_DATA, + FEATURE_NOT_IMPLEMENTED, + UNKNOWN, +} + +/** Return type for all functions. */ +result_t :: error_code_t + + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + /** @brief Return a static string corresponding to the specified error code. + * + * The string should not be freed (it is compiled into the binary). + */ + get_default_error_message :: proc(code: result_t) -> cstring --- + + /** @brief Return a static string corresponding to the specified error code. + * + * The string should not be freed (it is compiled into the binary). + */ + get_error_code_as_string :: proc(code: result_t) -> cstring --- +} diff --git a/vendor/openexr/exr_part.odin b/vendor/openexr/exr_part.odin new file mode 100644 index 000000000..24e1eb081 --- /dev/null +++ b/vendor/openexr/exr_part.odin @@ -0,0 +1,733 @@ +package vendor_openexr + +foreign import lib "exr.lib" + +import "core:c" + +attr_list_access_mode_t :: enum c.int { + FILE_ORDER, /**< Order they appear in the file */ + SORTED_ORDER, /**< Alphabetically sorted */ +} + +@(link_prefix="exr_", default_calling_convention="c") +foreign lib { + /** @brief Query how many parts are in the file. */ + get_count :: proc (ctxt: const_context_t, count: ^c.int) -> result_t --- + + /** @brief Query the part name for the specified part. + * + * NB: If this file is a single part file and name has not been set, this + * will return `NULL`. + */ + get_name :: proc(ctxt: const_context_t, part_index: c.int, out: ^cstring) -> result_t --- + + /** @brief Query the storage type for the specified part. */ + get_storage :: proc(ctxt: const_context_t, part_index: c.int, out: ^storage_t) -> result_t --- + + /** @brief Define a new part in the file. */ + add_part :: proc( + ctxt: context_t, + partname: rawptr, + type: storage_t, + new_index: ^c.int) -> result_t --- + + /** @brief Query how many levels are in the specified part. + * + * If the part is a tiled part, fill in how many tile levels are present. + * + * Return `ERR_SUCCESS` on success, an error otherwise (i.e. if the part + * is not tiled). + * + * It is valid to pass `NULL` to either of the @p levelsx or @p levelsy + * arguments, which enables testing if this part is a tiled part, or + * if you don't need both (i.e. in the case of a mip-level tiled + * image) + */ + get_tile_levels :: proc( + ctxt: const_context_t, + part_index: c.int, + levelsx: ^i32, + levelsy: ^i32) -> result_t --- + + /** @brief Query the tile size for a particular level in the specified part. + * + * If the part is a tiled part, fill in the tile size for the + * specified part/level. + * + * Return `ERR_SUCCESS` on success, an error otherwise (i.e. if the + * part is not tiled). + * + * It is valid to pass `NULL` to either of the @p tilew or @p tileh + * arguments, which enables testing if this part is a tiled part, or + * if you don't need both (i.e. in the case of a mip-level tiled + * image) + */ + get_tile_sizes :: proc( + ctxt: const_context_t, + part_index: c.int, + levelx: c.int, + levely: c.int, + tilew: ^i32, + tileh: ^i32) -> result_t --- + + /** @brief Query the data sizes for a particular level in the specified part. + * + * If the part is a tiled part, fill in the width/height for the + * specified levels. + * + * Return `ERR_SUCCESS` on success, an error otherwise (i.e. if the part + * is not tiled). + * + * It is valid to pass `NULL` to either of the @p levw or @p levh + * arguments, which enables testing if this part is a tiled part, or + * if you don't need both for some reason. + */ + get_level_sizes :: proc( + ctxt: const_context_t, + part_index: c.int, + levelx: c.int, + levely: c.int, + levw: ^i32, + levh: ^i32) -> result_t --- + + /** Return the number of chunks contained in this part of the file. + * + * As in the technical documentation for OpenEXR, the chunk is the + * generic term for a pixel data block. This is the atomic unit that + * this library uses to negotiate data to and from a context. + * + * This should be used as a basis for splitting up how a file is + * processed. Depending on the compression, a different number of + * scanlines are encoded in each chunk, and since those need to be + * encoded/decoded as a block, the chunk should be the basis for I/O + * as well. + */ + get_chunk_count :: proc(ctxt: const_context_t, part_index: c.int, out: ^i32) -> result_t --- + + /** Return the number of scanlines chunks for this file part. + * + * When iterating over a scanline file, this may be an easier metric + * for multi-threading or other access than only negotiating chunk + * counts, and so is provided as a utility. + */ + get_scanlines_per_chunk :: proc(ctxt: const_context_t, part_index: c.int, out: ^i32) -> result_t --- + + /** Return the maximum unpacked size of a chunk for the file part. + * + * This may be used ahead of any actual reading of data, so can be + * used to pre-allocate buffers for multiple threads in one block or + * whatever your application may require. + */ + get_chunk_unpacked_size :: proc(ctxt: const_context_t, part_index: c.int, out: ^u64) -> result_t --- + + /** @brief Retrieve the zip compression level used for the specified part. + * + * This only applies when the compression method involves using zip + * compression (zip, zips, some modes of DWAA/DWAB). + * + * This value is NOT persisted in the file, and only exists for the + * lifetime of the context, so will be at the default value when just + * reading a file. + */ + get_zip_compression_level :: proc(ctxt: const_context_t, part_index: c.int, level: ^c.int) -> result_t --- + + /** @brief Set the zip compression method used for the specified part. + * + * This only applies when the compression method involves using zip + * compression (zip, zips, some modes of DWAA/DWAB). + * + * This value is NOT persisted in the file, and only exists for the + * lifetime of the context, so this value will be ignored when + * reading a file. + */ + set_zip_compression_level :: proc(ctxt: context_t, part_index: c.int, level: c.int) -> result_t --- + + /** @brief Retrieve the dwa compression level used for the specified part. + * + * This only applies when the compression method is DWAA/DWAB. + * + * This value is NOT persisted in the file, and only exists for the + * lifetime of the context, so will be at the default value when just + * reading a file. + */ + get_dwa_compression_level :: proc(ctxt: const_context_t, part_index: c.int, level: ^f32) -> result_t --- + + /** @brief Set the dwa compression method used for the specified part. + * + * This only applies when the compression method is DWAA/DWAB. + * + * This value is NOT persisted in the file, and only exists for the + * lifetime of the context, so this value will be ignored when + * reading a file. + */ + set_dwa_compression_level :: proc(ctxt: context_t, part_index: c.int, level: f32) -> result_t --- + + /**************************************/ + + /** @defgroup PartMetadata Functions to get and set metadata for a particular part. + * @{ + * + */ + + /** @brief Query the count of attributes in a part. */ + get_attribute_count :: proc(ctxt: const_context_t, part_index: c.int, count: ^i32) -> result_t --- + + /** @brief Query a particular attribute by index. */ + get_attribute_by_index :: proc( + ctxt: const_context_t, + part_index: c.int, + mode: attr_list_access_mode_t, + idx: i32, + outattr: ^^attribute_t) -> result_t --- + + /** @brief Query a particular attribute by name. */ + get_attribute_by_name :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + outattr: ^^attribute_t) -> result_t --- + + /** @brief Query the list of attributes in a part. + * + * This retrieves a list of attributes currently defined in a part. + * + * If outlist is `NULL`, this function still succeeds, filling only the + * count. In this manner, the user can allocate memory for the list of + * attributes, then re-call this function to get the full list. + */ + get_attribute_list :: proc( + ctxt: const_context_t, + part_index: c.int, + mode: attr_list_access_mode_t, + count: ^i32, + outlist: ^[^]attribute_t) -> result_t --- + + /** Declare an attribute within the specified part. + * + * Only valid when a file is opened for write. + */ + attr_declare_by_type :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + type: cstring, + newattr: ^^attribute_t) -> result_t --- + + /** @brief Declare an attribute within the specified part. + * + * Only valid when a file is opened for write. + */ + attr_declare :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + type: attribute_type_t, + newattr: ^^attribute_t) -> result_t --- + + /** + * @defgroup RequiredAttributeHelpers Required Attribute Utililities + * + * @brief These are a group of functions for attributes that are + * required to be in every part of every file. + * + * @{ + */ + + /** @brief Initialize all required attributes for all files. + * + * NB: other file types do require other attributes, such as the tile + * description for a tiled file. + */ + initialize_required_attr :: proc( + ctxt: context_t, + part_index: c.int, + displayWindow: ^attr_box2i_t, + dataWindow: ^attr_box2i_t, + pixelaspectratio: f32, + screenWindowCenter: attr_v2f_t, + screenWindowWidth: f32, + lineorder: lineorder_t, + ctype: compression_t) -> result_t --- + + /** @brief Initialize all required attributes to default values: + * + * - `displayWindow` is set to (0, 0 -> @p width - 1, @p height - 1) + * - `dataWindow` is set to (0, 0 -> @p width - 1, @p height - 1) + * - `pixelAspectRatio` is set to 1.0 + * - `screenWindowCenter` is set to 0.f, 0.f + * - `screenWindowWidth` is set to 1.f + * - `lineorder` is set to `INCREASING_Y` + * - `compression` is set to @p ctype + */ + initialize_required_attr_simple :: proc( + ctxt: context_t, + part_index: c.int, + width: i32, + height: i32, + ctype: compression_t) -> result_t --- + + /** @brief Copy the attributes from one part to another. + * + * This allows one to quickly unassigned attributes from one source to another. + * + * If an attribute in the source part has not been yet set in the + * destination part, the item will be copied over. + * + * For example, when you add a part, the storage type and name + * attributes are required arguments to the definition of a new part, + * but channels has not yet been assigned. So by calling this with an + * input file as the source, you can copy the channel definitions (and + * any other unassigned attributes from the source). + */ + copy_unset_attributes :: proc( + ctxt: context_t, + part_index: c.int, + source: const_context_t, + src_part_index: c.int) -> result_t --- + + /** @brief Retrieve the list of channels. */ + get_channels :: proc(ctxt: const_context_t, part_index: c.int, chlist: ^^attr_chlist_t) -> result_t --- + + /** @brief Define a new channel to the output file part. + * + * The @p percept parameter is used for lossy compression techniques + * to indicate that the value represented is closer to linear (1) or + * closer to logarithmic (0). For r, g, b, luminance, this is normally + * 0. + */ + add_channel :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + ptype: pixel_type_t, + percept: perceptual_treatment_t, + xsamp: i32, + ysamp: i32) -> c.int --- + + /** @brief Copy the channels from another source. + * + * Useful if you are manually constructing the list or simply copying + * from an input file. + */ + set_channels :: proc(ctxt: context_t, part_index: c.int, channels: ^attr_chlist_t) -> result_t --- + + /** @brief Retrieve the compression method used for the specified part. */ + get_compression :: proc(ctxt: const_context_t, part_index: c.int, compression: ^compression_t) -> result_t --- + /** @brief Set the compression method used for the specified part. */ + set_compression :: proc(ctxt: context_t, part_index: c.int, ctype: compression_t) -> result_t --- + + /** @brief Retrieve the data window for the specified part. */ + get_data_window :: proc(ctxt: const_context_t, part_index: c.int, out: ^attr_box2i_t) -> result_t --- + /** @brief Set the data window for the specified part. */ + set_data_window :: proc(ctxt: context_t, part_index: c.int, dw: ^attr_box2i_t) -> c.int --- + + /** @brief Retrieve the display window for the specified part. */ + get_display_window :: proc(ctxt: const_context_t, part_index: c.int, out: ^attr_box2i_t) -> result_t --- + /** @brief Set the display window for the specified part. */ + set_display_window :: proc(ctxt: context_t, part_index: c.int, dw: ^attr_box2i_t) -> c.int --- + + /** @brief Retrieve the line order for storing data in the specified part (use 0 for single part images). */ + get_lineorder :: proc(ctxt: const_context_t, part_index: c.int, out: ^lineorder_t) -> result_t --- + /** @brief Set the line order for storing data in the specified part (use 0 for single part images). */ + set_lineorder :: proc(ctxt: context_t, part_index: c.int, lo: lineorder_t) -> result_t --- + + /** @brief Retrieve the pixel aspect ratio for the specified part (use 0 for single part images). */ + get_pixel_aspect_ratio :: proc(ctxt: const_context_t, part_index: c.int, par: ^f32) -> result_t --- + /** @brief Set the pixel aspect ratio for the specified part (use 0 for single part images). */ + set_pixel_aspect_ratio :: proc(ctxt: context_t, part_index: c.int, par: f32) -> result_t --- + + /** @brief Retrieve the screen oriented window center for the specified part (use 0 for single part images). */ + get_screen_window_center :: proc(ctxt: const_context_t, part_index: c.int, wc: ^attr_v2f_t) -> result_t --- + /** @brief Set the screen oriented window center for the specified part (use 0 for single part images). */ + set_screen_window_center :: proc(ctxt: context_t, part_index: c.int, wc: ^attr_v2f_t) -> c.int --- + + /** @brief Retrieve the screen oriented window width for the specified part (use 0 for single part images). */ + get_screen_window_width :: proc(ctxt: const_context_t, part_index: c.int, out: ^f32) -> result_t --- + /** @brief Set the screen oriented window width for the specified part (use 0 for single part images). */ + set_screen_window_width :: proc(ctxt: context_t, part_index: c.int, ssw: f32) -> result_t --- + + /** @brief Retrieve the tiling info for a tiled part (use 0 for single part images). */ + get_tile_descriptor :: proc( + ctxt: const_context_t, + part_index: c.int, + xsize: ^u32, + ysize: ^u32, + level: ^tile_level_mode_t, + round: ^tile_round_mode_t) -> result_t --- + + /** @brief Set the tiling info for a tiled part (use 0 for single part images). */ + set_tile_descriptor :: proc( + ctxt: context_t, + part_index: c.int, + x_size: u32, + y_size: u32, + level_mode: tile_level_mode_t, + round_mode: tile_round_mode_t) -> result_t --- + + set_name :: proc(ctxt: context_t, part_index: c.int, val: cstring) -> result_t --- + + get_version :: proc(ctxt: const_context_t, part_index: c.int, out: ^i32) -> result_t --- + + set_version :: proc(ctxt: context_t, part_index: c.int, val: i32) -> result_t --- + + set_chunk_count :: proc(ctxt: context_t, part_index: c.int, val: i32) -> result_t --- + + /** @} */ /* required attr group. */ + + /** + * @defgroup BuiltinAttributeHelpers Attribute utilities for builtin types + * + * @brief These are a group of functions for attributes that use the builtin types. + * + * @{ + */ + + attr_get_box2i :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + outval: ^attr_box2i_t) -> result_t --- + + attr_set_box2i :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + val: ^attr_box2i_t) -> result_t --- + + attr_get_box2f :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + outval: ^attr_box2f_t) -> result_t --- + + attr_set_box2f :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + val: ^attr_box2f_t) -> result_t --- + + /** @brief Zero-copy query of channel data. + * + * Do not free or manipulate the @p chlist data, or use + * after the lifetime of the context. + */ + attr_get_channels :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + chlist: ^^attr_chlist_t) -> result_t --- + + /** @brief This allows one to quickly copy the channels from one file + * to another. + */ + attr_set_channels :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + channels: ^attr_chlist_t) -> result_t --- + + attr_get_chromaticities :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + chroma: ^attr_chromaticities_t) -> result_t --- + + attr_set_chromaticities :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + chroma: ^attr_chromaticities_t) -> result_t --- + + attr_get_compression :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^compression_t) -> result_t --- + + attr_set_compression :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + comp: compression_t) -> result_t --- + + attr_get_double :: proc(ctxt: const_context_t, part_index: c.int, name: cstring, out: f64) -> result_t --- + + attr_set_double :: proc(ctxt: context_t, part_index: c.int, name: cstring, val: f64) -> result_t --- + + attr_get_envmap :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^envmap_t) -> result_t --- + + attr_set_envmap :: proc(ctxt: context_t, part_index: c.int, name: cstring, emap: envmap_t) -> result_t --- + + attr_get_float :: proc(ctxt: const_context_t, part_index: c.int, name: cstring, out: ^f32) -> result_t --- + + attr_set_float :: proc(ctxt: context_t, part_index: c.int, name: cstring, val: f32) -> result_t --- + + /** @brief Zero-copy query of float data. + * + * Do not free or manipulate the @p out data, or use after the + * lifetime of the context. + */ + attr_get_float_vector :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + sz: ^i32, + out: ^[^]f32) -> result_t --- + + attr_set_float_vector :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + sz: i32, + vals: [^]f32) -> result_t --- + + attr_get_int :: proc(ctxt: const_context_t, part_index: c.int, name: cstring, out: ^i32) -> result_t --- + + attr_set_int :: proc(ctxt: context_t, part_index: c.int, name: cstring, val: i32) -> result_t --- + + attr_get_keycode :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_keycode_t) -> result_t --- + + attr_set_keycode :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + kc: ^attr_keycode_t) -> result_t --- + + attr_get_lineorder :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^lineorder_t) -> result_t --- + + attr_set_lineorder :: proc(ctxt: context_t, part_index: c.int, name: cstring, lo: lineorder_t) -> result_t --- + + attr_get_m33f :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_m33f_t) -> result_t --- + + attr_set_m33f :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + m: ^attr_m33f_t) -> result_t --- + + attr_get_m33d :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_m33d_t) -> result_t --- + + attr_set_m33d :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + m: ^attr_m33d_t) -> result_t --- + + attr_get_m44f :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_m44f_t) -> result_t --- + + attr_set_m44f :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + m: ^attr_m44f_t) -> result_t --- + + attr_get_m44d :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_m44d_t) -> result_t --- + + attr_set_m44d :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + m: ^attr_m44d_t) -> result_t --- + + attr_get_preview :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_preview_t) -> result_t --- + + attr_set_preview :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + p: ^attr_preview_t) -> result_t --- + + attr_get_rational :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_rational_t) -> result_t --- + + attr_set_rational :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + r: ^attr_rational_t) -> result_t --- + + /** @brief Zero-copy query of string value. + * + * Do not modify the string pointed to by @p out, and do not use + * after the lifetime of the context. + */ + attr_get_string :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + length: ^i32, + out: ^cstring) -> result_t --- + + attr_set_string :: proc(ctxt: context_t, part_index: c.int, name: cstring, s: cstring) -> result_t --- + + /** @brief Zero-copy query of string data. + * + * Do not free the strings pointed to by the array. + * + * Must provide @p size. + * + * \p out must be a ``^cstring`` array large enough to hold + * the string pointers for the string vector when provided. + */ + attr_get_string_vector :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + size: ^i32, + out: ^cstring) -> result_t --- + + attr_set_string_vector :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + size: i32, + sv: ^cstring) -> result_t --- + + attr_get_tiledesc :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_tiledesc_t) -> result_t --- + + attr_set_tiledesc :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + td: ^attr_tiledesc_t) -> result_t --- + + attr_get_timecode :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_timecode_t) -> result_t --- + + attr_set_timecode :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + tc: ^attr_timecode_t) -> result_t --- + + attr_get_v2i :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_v2i_t) -> result_t --- + + attr_set_v2i :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + v: ^attr_v2i_t) -> result_t --- + + attr_get_v2f :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_v2f_t) -> result_t --- + + attr_set_v2f :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + v: ^attr_v2f_t) -> result_t --- + + attr_get_v2d :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_v2d_t) -> result_t --- + + attr_set_v2d :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + v: ^attr_v2d_t) -> result_t --- + + attr_get_v3i :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_v3i_t) -> result_t --- + + attr_set_v3i :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + v: ^attr_v3i_t) -> result_t --- + + attr_get_v3f :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_v3f_t) -> result_t --- + + attr_set_v3f :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + v: ^attr_v3f_t) -> result_t --- + + attr_get_v3d :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + out: ^attr_v3d_t) -> result_t --- + + attr_set_v3d :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + v: ^attr_v3d_t) -> result_t --- + + attr_get_user :: proc( + ctxt: const_context_t, + part_index: c.int, + name: cstring, + type: ^cstring, + size: ^i32, + out: ^rawptr) -> result_t --- + + attr_set_user :: proc( + ctxt: context_t, + part_index: c.int, + name: cstring, + type: cstring, + size: i32, + out: rawptr) -> result_t --- + +} \ No newline at end of file From 6985181961ec2ed8910ea4650d1b6898952084c8 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Mon, 2 May 2022 17:51:39 +0200 Subject: [PATCH 152/245] [xxhash] Add tests for large inputs Test XXH32, XXH64, XXH3-64 and XXH3-128 for large inputs, with both all-at-once and streaming APIs. XXH32_create_state and XXH64_create_state now implicitly call their "reset state" variants to simplify the streaming API to 3 steps: - create state / defer destroy - update - digest (finalize) These are tested with an array of 1, 2, 4, 8 and 16 megabytes worth of zeroes. All return the same hashes as do both the one-shot version, as well as that of the official xxhsum tool. 3778/3778 tests successful. --- core/hash/xxhash/xxhash_32.odin | 3 +- core/hash/xxhash/xxhash_64.odin | 1 + tests/core/hash/test_core_hash.odin | 86 +++++++++++++++++++++++- tests/core/hash/test_vectors_xxhash.odin | 72 +++++++++++++++++++- 4 files changed, 158 insertions(+), 4 deletions(-) diff --git a/core/hash/xxhash/xxhash_32.odin b/core/hash/xxhash/xxhash_32.odin index e63d998dd..5bc87c2c0 100644 --- a/core/hash/xxhash/xxhash_32.odin +++ b/core/hash/xxhash/xxhash_32.odin @@ -197,6 +197,7 @@ XXH32 :: proc(input: []u8, seed := XXH32_DEFAULT_SEED) -> (digest: XXH32_hash) { */ XXH32_create_state :: proc(allocator := context.allocator) -> (res: ^XXH32_state, err: Error) { state := new(XXH32_state, allocator) + XXH32_reset_state(state) return state, .None if state != nil else .Error } @@ -258,7 +259,7 @@ XXH32_update :: proc(state: ^XXH32_state, input: []u8) -> (err: Error) { v3 := state.v3 v4 := state.v4 - for len(buf) >= 15 { + for len(buf) >= 16 { #no_bounds_check v1 = XXH32_round(v1, XXH32_read32(buf, .Unaligned)); buf = buf[4:] #no_bounds_check v2 = XXH32_round(v2, XXH32_read32(buf, .Unaligned)); buf = buf[4:] #no_bounds_check v3 = XXH32_round(v3, XXH32_read32(buf, .Unaligned)); buf = buf[4:] diff --git a/core/hash/xxhash/xxhash_64.odin b/core/hash/xxhash/xxhash_64.odin index e95842168..9280e9c59 100644 --- a/core/hash/xxhash/xxhash_64.odin +++ b/core/hash/xxhash/xxhash_64.odin @@ -163,6 +163,7 @@ XXH64 :: proc(input: []u8, seed := XXH64_DEFAULT_SEED) -> (digest: XXH64_hash) { */ XXH64_create_state :: proc(allocator := context.allocator) -> (res: ^XXH64_state, err: Error) { state := new(XXH64_state, allocator) + XXH64_reset_state(state) return state, .None if state != nil else .Error } diff --git a/tests/core/hash/test_core_hash.odin b/tests/core/hash/test_core_hash.odin index 607642339..86c05fd44 100644 --- a/tests/core/hash/test_core_hash.odin +++ b/tests/core/hash/test_core_hash.odin @@ -31,8 +31,10 @@ when ODIN_TEST { main :: proc() { t := testing.T{} test_benchmark_runner(&t) - test_xxhash_vectors(&t) test_crc64_vectors(&t) + test_xxhash_vectors(&t) + test_xxhash_large(&t) + fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) if TEST_fail > 0 { os.exit(1) @@ -191,6 +193,88 @@ test_benchmark_runner :: proc(t: ^testing.T) { benchmark_print(name, options) } +@test +test_xxhash_large :: proc(t: ^testing.T) { + many_zeroes := make([]u8, 16 * 1024 * 1024) + defer delete(many_zeroes) + + // All at once. + for i, v in ZERO_VECTORS { + b := many_zeroes[:i] + + xxh32 := xxhash.XXH32(b) + xxh64 := xxhash.XXH64(b) + xxh3_64 := xxhash.XXH3_64(b) + xxh3_128 := xxhash.XXH3_128(b) + + xxh32_error := fmt.tprintf("[ XXH32(%03d) ] Expected: %08x. Got: %08x.", i, v.xxh_32, xxh32) + xxh64_error := fmt.tprintf("[ XXH64(%03d) ] Expected: %16x. Got: %16x.", i, v.xxh_64, xxh64) + xxh3_64_error := fmt.tprintf("[XXH3_64(%03d) ] Expected: %16x. Got: %16x.", i, v.xxh3_64, xxh3_64) + xxh3_128_error := fmt.tprintf("[XXH3_128(%03d) ] Expected: %32x. Got: %32x.", i, v.xxh3_128, xxh3_128) + + expect(t, xxh32 == v.xxh_32, xxh32_error) + expect(t, xxh64 == v.xxh_64, xxh64_error) + expect(t, xxh3_64 == v.xxh3_64, xxh3_64_error) + expect(t, xxh3_128 == v.xxh3_128, xxh3_128_error) + } + + // Streamed + for i, v in ZERO_VECTORS { + b := many_zeroes[:i] + + bytes_per_update := []int{1, 42, 13, 7, 16, 5, 23, 74, 1024, 511, 1023, 47} + update_size_idx: int + + xxh_32_state, xxh_32_err := xxhash.XXH32_create_state() + defer xxhash.XXH32_destroy_state(xxh_32_state) + expect(t, xxh_32_err == nil, "Problem initializing XXH_32 state.") + + xxh_64_state, xxh_64_err := xxhash.XXH64_create_state() + defer xxhash.XXH64_destroy_state(xxh_64_state) + expect(t, xxh_64_err == nil, "Problem initializing XXH_64 state.") + + xxh3_64_state, xxh3_64_err := xxhash.XXH3_create_state() + defer xxhash.XXH3_destroy_state(xxh3_64_state) + expect(t, xxh3_64_err == nil, "Problem initializing XXH3_64 state.") + + xxh3_128_state, xxh3_128_err := xxhash.XXH3_create_state() + defer xxhash.XXH3_destroy_state(xxh3_128_state) + expect(t, xxh3_128_err == nil, "Problem initializing XXH3_128 state.") + + // XXH3_128_update + + for len(b) > 0 { + update_size := min(len(b), bytes_per_update[update_size_idx % len(bytes_per_update)]) + update_size_idx += 1 + + xxhash.XXH32_update (xxh_32_state, b[:update_size]) + xxhash.XXH64_update (xxh_64_state, b[:update_size]) + + xxhash.XXH3_64_update (xxh3_64_state, b[:update_size]) + xxhash.XXH3_128_update(xxh3_128_state, b[:update_size]) + + b = b[update_size:] + } + + // Now finalize + xxh32 := xxhash.XXH32_digest(xxh_32_state) + xxh64 := xxhash.XXH64_digest(xxh_64_state) + + xxh3_64 := xxhash.XXH3_64_digest(xxh3_64_state) + xxh3_128 := xxhash.XXH3_128_digest(xxh3_128_state) + + xxh32_error := fmt.tprintf("[ XXH32(%03d) ] Expected: %08x. Got: %08x.", i, v.xxh_32, xxh32) + xxh64_error := fmt.tprintf("[ XXH64(%03d) ] Expected: %16x. Got: %16x.", i, v.xxh_64, xxh64) + xxh3_64_error := fmt.tprintf("[XXH3_64(%03d) ] Expected: %16x. Got: %16x.", i, v.xxh3_64, xxh3_64) + xxh3_128_error := fmt.tprintf("[XXH3_128(%03d) ] Expected: %32x. Got: %32x.", i, v.xxh3_128, xxh3_128) + + expect(t, xxh32 == v.xxh_32, xxh32_error) + expect(t, xxh64 == v.xxh_64, xxh64_error) + expect(t, xxh3_64 == v.xxh3_64, xxh3_64_error) + expect(t, xxh3_128 == v.xxh3_128, xxh3_128_error) + } +} + @test test_xxhash_vectors :: proc(t: ^testing.T) { fmt.println("Verifying against XXHASH_TEST_VECTOR_SEEDED:") diff --git a/tests/core/hash/test_vectors_xxhash.odin b/tests/core/hash/test_vectors_xxhash.odin index dccda5e53..6a37aef30 100644 --- a/tests/core/hash/test_vectors_xxhash.odin +++ b/tests/core/hash/test_vectors_xxhash.odin @@ -3,7 +3,7 @@ */ package test_core_hash -XXHASH_Test_Vectors_With_Seed :: struct #packed { +XXHASH_Test_Vectors :: struct #packed { /* Old hashes */ @@ -17,7 +17,75 @@ XXHASH_Test_Vectors_With_Seed :: struct #packed { xxh3_128: u128, } -XXHASH_TEST_VECTOR_SEEDED := map[u64][257]XXHASH_Test_Vectors_With_Seed{ +ZERO_VECTORS := map[int]XXHASH_Test_Vectors{ + 1024 * 1024 = { + /* + Old hashes + */ + xxh_32 = 0x9430f97f, // xxhsum -H0 + xxh_64 = 0x87d2a1b6e1163ef1, // xxhsum -H1 + + /* + XXH3 hashes + */ + xxh3_128 = 0xb6ef17a3448492b6918780b90550bf34, // xxhsum -H2 + xxh3_64 = 0x918780b90550bf34, // xxhsum -H3 + }, + 1024 * 2048 = { + /* + Old hashes + */ + xxh_32 = 0xeeb74ca1, // xxhsum -H0 + xxh_64 = 0xeb8a7322f88e23db, // xxhsum -H1 + + /* + XXH3 hashes + */ + xxh3_128 = 0x7b3e6abe1456fd0094e26d8e04364852, // xxhsum -H2 + xxh3_64 = 0x94e26d8e04364852, // xxhsum -H3 + }, + 1024 * 4096 = { + /* + Old hashes + */ + xxh_32 = 0xa59010b8, // xxhsum -H0 + xxh_64 = 0x639f9e1a7cbc9d28, // xxhsum -H1 + + /* + XXH3 hashes + */ + xxh3_128 = 0x34001ae2f947e773165f453a5f35c459, // xxhsum -H2 + xxh3_64 = 0x165f453a5f35c459, // xxhsum -H3 + }, + 1024 * 8192 = { + /* + Old hashes + */ + xxh_32 = 0xfed1d084, // xxhsum -H0 + xxh_64 = 0x86823cbc61f6df0f, // xxhsum -H1 + + /* + XXH3 hashes + */ + xxh3_128 = 0x9d6bf1a4e92df02ce881a25e37e37b19, // xxhsum -H2 + xxh3_64 = 0xe881a25e37e37b19, // xxhsum -H3 + }, + 1024 * 16384 = { + /* + Old hashes + */ + xxh_32 = 0x0ee4ebf9, // xxhsum -H0 + xxh_64 = 0x412f1e415ee2d80b, // xxhsum -H1 + + /* + XXH3 hashes + */ + xxh3_128 = 0x14d914cac1f4c1b1c4979470a1b529a1, // xxhsum -H2 + xxh3_64 = 0xc4979470a1b529a1, // xxhsum -H3 + }, +} + +XXHASH_TEST_VECTOR_SEEDED := map[u64][257]XXHASH_Test_Vectors{ 0 = { { // Length: 000 /* XXH32 with seed */ 0x02cc5d05, From b99940f33a50cf2ed5eaa39ffcdb00950f15ad27 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Mon, 2 May 2022 19:20:25 +0200 Subject: [PATCH 153/245] [xxhash] For the streaming tests, randomly select the size to use. Randomize size used with `update`. It'll print "Using user-selected seed {18109872483301276539,2000259725719371} for update size randomness." If a streaming test then fails, you can repeat it using: `odin run . -define:RAND_STATE=18109872483301276539 -define:RAND_INC=2000259725719371` --- core/hash/xxhash/streaming.odin | 4 +++- tests/core/hash/test_core_hash.odin | 28 +++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/core/hash/xxhash/streaming.odin b/core/hash/xxhash/streaming.odin index 68a4920a5..6f630b042 100644 --- a/core/hash/xxhash/streaming.odin +++ b/core/hash/xxhash/streaming.odin @@ -211,7 +211,9 @@ XXH3_update :: #force_inline proc( length := len(input) secret := state.custom_secret[:] if len(state.external_secret) == 0 else state.external_secret[:] - assert(len(input) > 0) + if len(input) == 0 { + return + } state.total_length += u64(length) assert(state.buffered_size <= XXH3_INTERNAL_BUFFER_SIZE) diff --git a/tests/core/hash/test_core_hash.odin b/tests/core/hash/test_core_hash.odin index 86c05fd44..e69490143 100644 --- a/tests/core/hash/test_core_hash.odin +++ b/tests/core/hash/test_core_hash.odin @@ -6,6 +6,8 @@ import "core:time" import "core:testing" import "core:fmt" import "core:os" +import "core:math/rand" +import "core:intrinsics" TEST_count := 0 TEST_fail := 0 @@ -202,6 +204,8 @@ test_xxhash_large :: proc(t: ^testing.T) { for i, v in ZERO_VECTORS { b := many_zeroes[:i] + fmt.printf("[test_xxhash_large] All at once. Size: %v\n", i) + xxh32 := xxhash.XXH32(b) xxh64 := xxhash.XXH64(b) xxh3_64 := xxhash.XXH3_64(b) @@ -218,12 +222,25 @@ test_xxhash_large :: proc(t: ^testing.T) { expect(t, xxh3_128 == v.xxh3_128, xxh3_128_error) } + when #config(RAND_STATE, -1) >= 0 && #config(RAND_INC, -1) >= 0 { + random_seed := rand.Rand{ + state = u64(#config(RAND_STATE, -1)), + inc = u64(#config(RAND_INC, -1)), + } + fmt.printf("Using user-selected seed {{%v,%v}} for update size randomness.\n", random_seed.state, random_seed.inc) + } else { + random_seed := rand.create(u64(intrinsics.read_cycle_counter())) + fmt.printf("Randonly selected seed {{%v,%v}} for update size randomness.\n", random_seed.state, random_seed.inc) + } + // Streamed for i, v in ZERO_VECTORS { b := many_zeroes[:i] - bytes_per_update := []int{1, 42, 13, 7, 16, 5, 23, 74, 1024, 511, 1023, 47} - update_size_idx: int + fmt.printf("[test_xxhash_large] Streamed. Size: %v\n", i) + + // bytes_per_update := []int{1, 42, 13, 7, 16, 5, 23, 74, 1024, 511, 1023, 47} + // update_size_idx: int xxh_32_state, xxh_32_err := xxhash.XXH32_create_state() defer xxhash.XXH32_destroy_state(xxh_32_state) @@ -244,9 +261,10 @@ test_xxhash_large :: proc(t: ^testing.T) { // XXH3_128_update for len(b) > 0 { - update_size := min(len(b), bytes_per_update[update_size_idx % len(bytes_per_update)]) - update_size_idx += 1 - + update_size := min(len(b), rand.int_max(8192, &random_seed)) + if update_size > 4096 { + update_size %= 73 + } xxhash.XXH32_update (xxh_32_state, b[:update_size]) xxhash.XXH64_update (xxh_64_state, b[:update_size]) From 8bac82320fbba53a440bf42b117c702e726db093 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 3 May 2022 11:44:55 +0200 Subject: [PATCH 154/245] Fix -opt: parsing. --- src/main.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 818a783e1..86c1544a4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -961,7 +961,26 @@ bool parse_build_flags(Array args) { bad_flags = true; break; } - build_context.optimization_level = cast(i32)big_int_to_i64(&value.value_integer); + // NOTE(Jeroen): We can't rely on `value.value_integer` here, because words will be returned as `0`. + // Meaning that -opt:speed will coerce to opt:0. That's not what the user intended. + // Instead we'll just compare 0..3 directly. + if (param == "0") { + build_context.optimization_level = 0; + } else if (param == "1") { + build_context.optimization_level = 1; + } else if (param == "2") { + build_context.optimization_level = 2; + } else if (param == "3") { + build_context.optimization_level = 3; + } else { + gb_printf_err("Invalid optimization level for -o:, got %.*s\n", LIT(param)); + gb_printf_err("Valid optimization levels:\n"); + gb_printf_err("\t0\n"); + gb_printf_err("\t1\n"); + gb_printf_err("\t2\n"); + gb_printf_err("\t3\n"); + bad_flags = true; + } break; } case BuildFlag_OptimizationMode: { From 59f55a21193ec7461205f4bb95303b69f3f7ce1c Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 3 May 2022 13:15:49 +0200 Subject: [PATCH 155/245] Make `big_int_from_string` return an error if not an integer. --- src/big_int.cpp | 30 +++++++++++++++++++++++++++--- src/exact_value.cpp | 6 +++++- src/main.cpp | 17 ++++------------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/big_int.cpp b/src/big_int.cpp index 20f940e8e..8203f0522 100644 --- a/src/big_int.cpp +++ b/src/big_int.cpp @@ -40,7 +40,7 @@ typedef mp_int BigInt; void big_int_from_u64(BigInt *dst, u64 x); void big_int_from_i64(BigInt *dst, i64 x); void big_int_init (BigInt *dst, BigInt const *src); -void big_int_from_string(BigInt *dst, String const &s); +void big_int_from_string(BigInt *dst, String const &s, bool &success); void big_int_dealloc(BigInt *dst) { mp_clear(dst); @@ -84,7 +84,7 @@ void big_int_quo_eq(BigInt *dst, BigInt const *x); void big_int_rem_eq(BigInt *dst, BigInt const *x); bool big_int_is_neg(BigInt const *x); - +void big_int_neg(BigInt *dst, BigInt const *x); void big_int_add_eq(BigInt *dst, BigInt const *x) { BigInt res = {}; @@ -169,7 +169,11 @@ BigInt big_int_make_i64(i64 x) { } -void big_int_from_string(BigInt *dst, String const &s) { +void big_int_from_string(BigInt *dst, String const &s, bool *success) { + *success = true; + + bool is_negative = false; + u64 base = 10; bool has_prefix = false; if (s.len > 2 && s[0] == '0') { @@ -197,11 +201,26 @@ void big_int_from_string(BigInt *dst, String const &s) { isize i = 0; for (; i < len; i++) { Rune r = cast(Rune)text[i]; + + if (r == '-') { + if (is_negative) { + // NOTE(Jeroen): Can't have a doubly negative number. + *success = false; + return; + } + is_negative = true; + continue; + } + if (r == '_') { continue; } u64 v = u64_digit_value(r); if (v >= base) { + // NOTE(Jeroen): Can still be a valid integer if the next character is an `e` or `E`. + if (r != 'e' && r != 'E') { + *success = false; + } break; } BigInt val = big_int_make_u64(v); @@ -225,6 +244,7 @@ void big_int_from_string(BigInt *dst, String const &s) { if (gb_char_is_digit(r)) { v = u64_digit_value(r); } else { + *success = false; break; } exp *= 10; @@ -234,6 +254,10 @@ void big_int_from_string(BigInt *dst, String const &s) { big_int_mul_eq(dst, &b); } } + + if (is_negative) { + big_int_neg(dst, dst); + } } diff --git a/src/exact_value.cpp b/src/exact_value.cpp index cedef48c4..175cb61f6 100644 --- a/src/exact_value.cpp +++ b/src/exact_value.cpp @@ -177,7 +177,11 @@ ExactValue exact_value_typeid(Type *type) { ExactValue exact_value_integer_from_string(String const &string) { ExactValue result = {ExactValue_Integer}; - big_int_from_string(&result.value_integer, string); + bool success; + big_int_from_string(&result.value_integer, string, &success); + if (!success) { + result = {ExactValue_Invalid}; + } return result; } diff --git a/src/main.cpp b/src/main.cpp index 86c1544a4..8bd6fc618 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -961,19 +961,10 @@ bool parse_build_flags(Array args) { bad_flags = true; break; } - // NOTE(Jeroen): We can't rely on `value.value_integer` here, because words will be returned as `0`. - // Meaning that -opt:speed will coerce to opt:0. That's not what the user intended. - // Instead we'll just compare 0..3 directly. - if (param == "0") { - build_context.optimization_level = 0; - } else if (param == "1") { - build_context.optimization_level = 1; - } else if (param == "2") { - build_context.optimization_level = 2; - } else if (param == "3") { - build_context.optimization_level = 3; - } else { - gb_printf_err("Invalid optimization level for -o:, got %.*s\n", LIT(param)); + + build_context.optimization_level = cast(i32)big_int_to_i64(&value.value_integer); + if (build_context.optimization_level < 0 || build_context.optimization_level > 3) { + gb_printf_err("Invalid optimization level for -o:, got %d\n", build_context.optimization_level); gb_printf_err("Valid optimization levels:\n"); gb_printf_err("\t0\n"); gb_printf_err("\t1\n"); From 47f637d23bf44b637041383b739780d9959331db Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 3 May 2022 13:37:07 +0200 Subject: [PATCH 156/245] Add deprecation warnings for -opt and flag=value insted of flag:value. --- src/main.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8bd6fc618..2633f8e55 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -825,11 +825,19 @@ bool parse_build_flags(Array args) { String name = substring(flag, 1, flag.len); isize end = 0; + bool have_equals = false; for (; end < name.len; end++) { if (name[end] == ':') break; - if (name[end] == '=') break; // IMPORTANT TODO(bill): DEPRECATE THIS!!!! + if (name[end] == '=') { + have_equals = true; + break; + } } name = substring(name, 0, end); + if (have_equals && name != "opt") { + gb_printf_err("`flag=value` has been deprecated and will be removed next release. Use `%.*s:` instead.\n", LIT(name), LIT(name)); + } + String param = {}; if (end < flag.len-1) param = substring(flag, 2+end, flag.len); @@ -903,35 +911,35 @@ bool parse_build_flags(Array args) { switch (bf.param_kind) { case BuildFlagParam_None: if (value.kind != ExactValue_Invalid) { - gb_printf_err("%.*s expected no value, got %.*s", LIT(name), LIT(param)); + gb_printf_err("%.*s expected no value, got %.*s\n", LIT(name), LIT(param)); bad_flags = true; ok = false; } break; case BuildFlagParam_Boolean: if (value.kind != ExactValue_Bool) { - gb_printf_err("%.*s expected a boolean, got %.*s", LIT(name), LIT(param)); + gb_printf_err("%.*s expected a boolean, got %.*s\n", LIT(name), LIT(param)); bad_flags = true; ok = false; } break; case BuildFlagParam_Integer: if (value.kind != ExactValue_Integer) { - gb_printf_err("%.*s expected an integer, got %.*s", LIT(name), LIT(param)); + gb_printf_err("%.*s expected an integer, got %.*s\n", LIT(name), LIT(param)); bad_flags = true; ok = false; } break; case BuildFlagParam_Float: if (value.kind != ExactValue_Float) { - gb_printf_err("%.*s expected a floating pointer number, got %.*s", LIT(name), LIT(param)); + gb_printf_err("%.*s expected a floating pointer number, got %.*s\n", LIT(name), LIT(param)); bad_flags = true; ok = false; } break; case BuildFlagParam_String: if (value.kind != ExactValue_String) { - gb_printf_err("%.*s expected a string, got %.*s", LIT(name), LIT(param)); + gb_printf_err("%.*s expected a string, got %.*s\n", LIT(name), LIT(param)); bad_flags = true; ok = false; } @@ -972,6 +980,9 @@ bool parse_build_flags(Array args) { gb_printf_err("\t3\n"); bad_flags = true; } + + // Deprecation warning. + gb_printf_err("`-opt` has been deprecated and will be removed next release. Use `-o:minimal`, etc.\n"); break; } case BuildFlag_OptimizationMode: { From d9b0c05acf72206d00068e708c1e2ebd872b2586 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Tue, 3 May 2022 13:47:13 +0200 Subject: [PATCH 157/245] Typo. --- src/big_int.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/big_int.cpp b/src/big_int.cpp index 8203f0522..5509545ca 100644 --- a/src/big_int.cpp +++ b/src/big_int.cpp @@ -40,7 +40,7 @@ typedef mp_int BigInt; void big_int_from_u64(BigInt *dst, u64 x); void big_int_from_i64(BigInt *dst, i64 x); void big_int_init (BigInt *dst, BigInt const *src); -void big_int_from_string(BigInt *dst, String const &s, bool &success); +void big_int_from_string(BigInt *dst, String const &s, bool *success); void big_int_dealloc(BigInt *dst) { mp_clear(dst); From 6e7a50c02f10a2a031687138f74172c95f3280c2 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 3 May 2022 14:11:26 +0100 Subject: [PATCH 158/245] Add .lib for `vendor:openexr` --- vendor/openexr/OpenEXRCore-3_1.lib | Bin 0 -> 1064780 bytes vendor/openexr/exr_base.odin | 2 +- vendor/openexr/exr_chunkio.odin | 2 +- vendor/openexr/exr_context.odin | 2 +- vendor/openexr/exr_debug.odin | 2 +- vendor/openexr/exr_decode.odin | 2 +- vendor/openexr/exr_encode.odin | 2 +- vendor/openexr/exr_errors.odin | 8 ++++---- vendor/openexr/exr_part.odin | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 vendor/openexr/OpenEXRCore-3_1.lib diff --git a/vendor/openexr/OpenEXRCore-3_1.lib b/vendor/openexr/OpenEXRCore-3_1.lib new file mode 100644 index 0000000000000000000000000000000000000000..f70938101ea9c0adaf29e80352fe296ccc15bdbe GIT binary patch literal 1064780 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
    V&OOqD|9@Ji9XqJ;e{Lpis1pzr%0?rvESB_H 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

    {qi%|T0)xLLl)&<)N`|(R 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