diff --git a/core/thread/thread_unix.odin b/core/thread/thread_unix.odin index f78d8f66f..cee278c7a 100644 --- a/core/thread/thread_unix.odin +++ b/core/thread/thread_unix.odin @@ -76,6 +76,9 @@ _create :: proc(procedure: Thread_Proc, priority := Thread_Priority.Normal) -> ^ return nil } thread.creation_allocator = context.allocator + + sync.mutex_init(&thread.start_mutex) + sync.condition_init(&thread.start_gate, &thread.start_mutex) // Set thread priority. policy: i32 @@ -96,12 +99,13 @@ _create :: proc(procedure: Thread_Proc, priority := Thread_Priority.Normal) -> ^ if unix.pthread_create(&thread.unix_thread, &attrs, __linux_thread_entry_proc, thread) != 0 { free(thread, thread.creation_allocator) + + sync.condition_destroy(&thread.start_gate) + sync.mutex_destroy(&thread.start_mutex) return nil } thread.procedure = procedure - sync.mutex_init(&thread.start_mutex) - sync.condition_init(&thread.start_gate, &thread.start_mutex) return thread } diff --git a/examples/all/all_vendor.odin b/examples/all/all_vendor.odin index 1ca04380f..777c184f9 100644 --- a/examples/all/all_vendor.odin +++ b/examples/all/all_vendor.odin @@ -11,6 +11,7 @@ import SDLNet "vendor:sdl2/net" import MIX "vendor:sdl2/mixer" import TTF "vendor:sdl2/ttf" import vk "vendor:vulkan" +import ENet "vendor:ENet" _ :: glfw _ :: gl @@ -21,4 +22,5 @@ _ :: IMG _ :: SDLNet _ :: MIX _ :: TTF -_ :: vk \ No newline at end of file +_ :: vk +_ :: ENet \ No newline at end of file diff --git a/src/llvm_backend_const.cpp b/src/llvm_backend_const.cpp index 49c3207fa..e3e43a31e 100644 --- a/src/llvm_backend_const.cpp +++ b/src/llvm_backend_const.cpp @@ -99,7 +99,7 @@ LLVMValueRef llvm_const_cast(LLVMValueRef val, LLVMTypeRef dst) { return LLVMConstNull(dst); } - GB_ASSERT_MSG(LLVMSizeOf(dst) == LLVMSizeOf(src), "%s vs %s", LLVMPrintTypeToString(dst), LLVMPrintTypeToString(src)); + GB_ASSERT_MSG(lb_sizeof(dst) == lb_sizeof(src), "%s vs %s", LLVMPrintTypeToString(dst), LLVMPrintTypeToString(src)); LLVMTypeKind kind = LLVMGetTypeKind(dst); switch (kind) { case LLVMPointerTypeKind: diff --git a/src/llvm_backend_expr.cpp b/src/llvm_backend_expr.cpp index ad2c609ef..c9827ae3a 100644 --- a/src/llvm_backend_expr.cpp +++ b/src/llvm_backend_expr.cpp @@ -3111,11 +3111,7 @@ lbValue lb_build_expr(lbProcedure *p, Ast *expr) { } LLVMTypeRef func_type = LLVMGetElementType(lb_type(p->module, t)); - LLVMValueRef the_asm = LLVMGetInlineAsm(func_type, - cast(char *)asm_string.text, cast(size_t)asm_string.len, - cast(char *)constraints_string.text, cast(size_t)constraints_string.len, - ia->has_side_effects, ia->is_align_stack, dialect - ); + LLVMValueRef the_asm = llvm_get_inline_asm(func_type, asm_string, constraints_string, ia->has_side_effects, ia->has_side_effects, dialect); GB_ASSERT(the_asm != nullptr); return {the_asm, t}; case_end; diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index 96bbbcee6..15689da36 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -1382,22 +1382,12 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, if (build_context.metrics.arch == TargetArch_386 || build_context.metrics.arch == TargetArch_amd64) { LLVMTypeRef func_type = LLVMFunctionType(LLVMVoidTypeInContext(p->module->ctx), nullptr, 0, false); - LLVMValueRef the_asm = LLVMGetInlineAsm(func_type, - cast(char *)"pause", 5, - cast(char *)"", 0, - /*HasSideEffects*/true, /*IsAlignStack*/false, - LLVMInlineAsmDialectATT - ); + LLVMValueRef the_asm = llvm_get_inline_asm(func_type, str_lit("pause"), {}); GB_ASSERT(the_asm != nullptr); LLVMBuildCall2(p->builder, func_type, the_asm, nullptr, 0, ""); } else if (build_context.metrics.arch == TargetArch_arm64) { LLVMTypeRef func_type = LLVMFunctionType(LLVMVoidTypeInContext(p->module->ctx), nullptr, 0, false); - LLVMValueRef the_asm = LLVMGetInlineAsm(func_type, - cast(char *)"yield", 5, - cast(char *)"", 0, - /*HasSideEffects*/true, /*IsAlignStack*/false, - LLVMInlineAsmDialectATT - ); + LLVMValueRef the_asm = llvm_get_inline_asm(func_type, str_lit("yield"), {}); GB_ASSERT(the_asm != nullptr); LLVMBuildCall2(p->builder, func_type, the_asm, nullptr, 0, ""); } @@ -2008,10 +1998,8 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, constraints = gb_string_appendc(constraints, regs[i]); constraints = gb_string_appendc(constraints, "}"); } - size_t asm_string_size = gb_strlen(asm_string); - size_t constraints_size = gb_string_length(constraints); - inline_asm = LLVMGetInlineAsm(func_type, asm_string, asm_string_size, constraints, constraints_size, true, false, LLVMInlineAsmDialectATT); + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; case TargetArch_386: @@ -2042,10 +2030,7 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, constraints = gb_string_appendc(constraints, ",rm"); } - size_t asm_string_size = gb_strlen(asm_string); - size_t constraints_size = gb_string_length(constraints); - - inline_asm = LLVMGetInlineAsm(func_type, asm_string, asm_string_size, constraints, constraints_size, true, false, LLVMInlineAsmDialectATT); + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; case TargetArch_arm64: @@ -2068,10 +2053,8 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, constraints = gb_string_appendc(constraints, regs[i]); constraints = gb_string_appendc(constraints, "}"); } - size_t asm_string_size = gb_strlen(asm_string); - size_t constraints_size = gb_string_length(constraints); - - inline_asm = LLVMGetInlineAsm(func_type, asm_string, asm_string_size, constraints, constraints_size, true, false, LLVMInlineAsmDialectATT); + + inline_asm = llvm_get_inline_asm(func_type, make_string_c(asm_string), make_string_c(constraints)); } break; default: diff --git a/src/llvm_backend_utility.cpp b/src/llvm_backend_utility.cpp index 9bb22b50b..e2249171c 100644 --- a/src/llvm_backend_utility.cpp +++ b/src/llvm_backend_utility.cpp @@ -1483,8 +1483,6 @@ lbValue lb_soa_struct_cap(lbProcedure *p, lbValue value) { return lb_emit_struct_ev(p, value, cast(i32)n); } - - lbValue lb_emit_mul_add(lbProcedure *p, lbValue a, lbValue b, lbValue c, Type *t) { lbModule *m = p->module; @@ -1675,4 +1673,16 @@ LLVMValueRef llvm_vector_mul_add(lbProcedure *p, LLVMValueRef a, LLVMValueRef b, LLVMValueRef y = llvm_vector_add(p, x, c); return y; } -} \ No newline at end of file +} + +LLVMValueRef llvm_get_inline_asm(LLVMTypeRef func_type, String const &str, String const &clobbers, bool has_side_effects=true, bool is_align_stack=false, LLVMInlineAsmDialect dialect=LLVMInlineAsmDialectATT) { + return LLVMGetInlineAsm(func_type, + cast(char *)str.text, cast(size_t)str.len, + cast(char *)clobbers.text, cast(size_t)clobbers.len, + /*HasSideEffects*/true, /*IsAlignStack*/false, + dialect + #if LLVM_VERSION_MAJOR >= 13 + , /*CanThrow*/false + #endif + ); +} diff --git a/vendor/ENet/LICENSE b/vendor/ENet/LICENSE new file mode 100644 index 000000000..6906f8eb0 --- /dev/null +++ b/vendor/ENet/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2002-2020 Lee Salzman + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/ENet/callbacks.odin b/vendor/ENet/callbacks.odin new file mode 100644 index 000000000..444c191d6 --- /dev/null +++ b/vendor/ENet/callbacks.odin @@ -0,0 +1,7 @@ +package ENet + +Callbacks :: struct { + malloc: proc "c" (size: uint) -> rawptr, + free: proc "c" (memory: rawptr), + no_memory: proc "c" (), +} \ No newline at end of file diff --git a/vendor/ENet/enet.odin b/vendor/ENet/enet.odin new file mode 100644 index 000000000..8d068fbfc --- /dev/null +++ b/vendor/ENet/enet.odin @@ -0,0 +1,400 @@ +package ENet + +when ODIN_OS == "windows" { + when ODIN_ARCH == "amd64" { + foreign import ENet { + "lib/enet64.lib", + "system:Ws2_32.lib", + "system:Winmm.lib", + } + } else { + foreign import ENet { + "lib/enet.lib", + "system:Ws2_32.lib", + "system:Winmm.lib", + } + } +} else { + foreign import ENet "system:enet" +} + +VERSION_MAJOR :: u8(1) +VERSION_MINOR :: u8(3) +VERSION_PATCH :: u8(17) + +VERSION_CREATE :: #force_inline proc(major, minor, patch: u8) -> u32 { + return (u32(major) << 16) | (u32(minor) << 8) | u32(patch) +} + +VERSION_GET_MAJOR :: #force_inline proc(version: u32) -> u8 { + return u8((version >> 16) & 0xff) +} +VERSION_GET_MINOR :: #force_inline proc(version: u32) -> u8 { + return u8((version >> 8) & 0xff) +} +VERSION_GET_PATCH :: #force_inline proc(version: u32) -> u8 { + return u8(version & 0xff) +} + +// Odin does not have "macros" or compile-time evaluation of functions, so the +// following is just the same as. +// VERSION :: VERSION_CREATE(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); +VERSION :: (u32(VERSION_MAJOR) << 16) | (u32(VERSION_MINOR) << 8) | u32(VERSION_PATCH) + +// Network byte order is always Big Endian. Instead of using the method ENet +// uses (leveraging {n,h}to{n,h}{s,l}), we can just use Odin's endianess types +// to get the correct byte swaps, if any. +HOST_TO_NET_16 :: #force_inline proc(value: u16) -> u16 { + return transmute(u16)u16be(value) +} + +HOST_TO_NET_32 :: #force_inline proc(value: u32) -> u32 { + return transmute(u32)u32be(value) +} + +NET_TO_HOST_16 :: #force_inline proc(value: u16) -> u16 { + return u16(transmute(u16be)value) +} + +NET_TO_HOST_32 :: #force_inline proc(value: u32) -> u32 { + return u32(transmute(u32be)value) +} + +Version :: u32 + +SocketType :: enum i32 { + STREAM = 1, + DATAGRAM = 2, +} + +SocketWait :: enum i32 { + NONE = 0, + SEND = 1 << 0, + RECEIVE = 1 << 1, + INTERRUPT = 1 << 2, +} + +SocketOption :: enum i32 { + NONBLOCK = 1, + BROADCAST = 2, + RCVBUF = 3, + SNDBUF = 4, + REUSEADDR = 5, + RCVTIMEO = 6, + SNDTIMEO = 7, + ERROR = 8, + NODELAY = 9, +} + +SocketShutdown :: enum i32 { + READ = 0, + WRITE = 1, + READ_WRITE = 2, +} + +HOST_ANY :: u32(0) +HOST_BROADCAST :: u32(0xffffffff) +PORT_ANY :: u16(0) + +Address :: struct { + host: u32, + port: u16, +} + +PacketFlag :: enum i32 { + RELIABLE = 1 << 0, + UNSEQUENCED = 1 << 1, + NO_ALLOCATE = 1 << 2, + UNRELIABLE_FRAGMENT = 1 << 3, + FLAG_SENT = 1 << 8, +} + +PacketFreeCallback :: proc "c" (packet: ^Packet) + +Packet :: struct { + referenceCount: uint, + flags: u32, + data: [^]u8, + dataLength: uint, + freeCallback: PacketFreeCallback, + userData: rawptr, +} + +Acknowledgment :: struct { + acknowledgementList: ListNode, + sentTime: u32, + command: Protocol, +} + +OutgoingCommand :: struct { + outgoingCommandList: ListNode, + reliableSequenceNumber: u16, + unreliableSequenceNumber: u16, + sentTime: u32, + roundTripTimeout: u32, + roundTripTimeoutLimit: u32, + fragmentOffset: u32, + fragmentLength: u16, + sendAttempts: u16, + command: Protocol, + packet: ^Packet, +} + +IncomingCommand :: struct { + incomingCommandList: ListNode, + reliableSequenceNumber: u16, + unreliableSequenceNumber: u16, + command: Protocol, + fragmentCount: u32, + fragmentsRemaining: u32, + fragments: [^]u32, + packet: ^Packet, +} + +PeerState :: enum i32 { + DISCONNECTED, + CONNECTING, + ACKNOWLEDGING_CONNECT, + CONNECTION_PENDING, + CONNECTION_SUCCEEDED, + CONNECTED, + DISCONNECT_LATER, + DISCONNECTING, + ACKNOWLEDGING_DISCONNECT, + ZOMBIE, +} + +BUFFER_MAXIMUM :: (1 + 2 * PROTOCOL_MAXIMUM_PACKET_COMMANDS) + +HOST_RECEIVE_BUFFER_SIZE :: 256 * 1024 +HOST_SEND_BUFFER_SIZE :: 256 * 1024 +HOST_BANDWIDTH_THROTTLE_INTERVAL :: 1000 +HOST_DEFAULT_MTU :: 1400 +HOST_DEFAULT_MAXIMUM_PACKET_SIZE :: 32 * 1024 * 1024 +HOST_DEFAULT_MAXIMUM_WAITING_DATA :: 32 * 1024 * 1024 + +PEER_DEFAULT_ROUND_TRIP_TIME :: 500 +PEER_DEFAULT_PACKET_THROTTLE :: 32 +PEER_PACKET_THROTTLE_SCALE :: 32 +PEER_PACKET_THROTTLE_COUNTER :: 7 +PEER_PACKET_THROTTLE_ACCELERATION :: 2 +PEER_PACKET_THROTTLE_DECELERATION :: 2 +PEER_PACKET_THROTTLE_INTERVAL :: 5000 +PEER_PACKET_LOSS_SCALE :: 1 << 16 +PEER_PACKET_LOSS_INTERVAL :: 10000 +PEER_WINDOW_SIZE_SCALE :: 64 * 1024 +PEER_TIMEOUT_LIMIT :: 32 +PEER_TIMEOUT_MINIMUM :: 5000 +PEER_TIMEOUT_MAXIMUM :: 30000 +PEER_PING_INTERVAL :: 500 +PEER_UNSEQUENCED_WINDOWS :: 64 +PEER_UNSEQUENCED_WINDOW_SIZE :: 1024 +PEER_FREE_UNSEQUENCED_WINDOWS :: 32 +PEER_RELIABLE_WINDOWS :: 16 +PEER_RELIABLE_WINDOW_SIZE :: 0x1000 +PEER_FREE_RELIABLE_WINDOWS :: 8 + +Channel :: struct { + outgoingReliableSequenceNumber: u16, + outgoingUnreliableSequenceNumber: u16, + usedReliableWindows: u16, + reliableWindows: [PEER_RELIABLE_WINDOWS]u16, + incomingReliableSequenceNumber: u16, + incomingUnreliableSequenceNumber: u16, + incomingReliableCommands: List, + incomingUnreliableCommands: List, +} + +PeerFlag :: enum i32 { + NEEDS_DISPATCH, +} + +Peer :: struct { + dispatchList: ListNode, + host: ^Host, + outgoingPeerID: u16, + incomingPeerID: u16, + connectID: u32, + outgoingSessionID: u8, + incomingSessionID: u8, + address: Address, + data: rawptr, + state: PeerState, + channels: [^]Channel, + channelCount: uint, + incomingBandwidth: u32, + outgoingBandwidth: u32, + incomingBandwidthThrottleEpoch: u32, + outgoingBandwidthThrottleEpoch: u32, + incomingDataTotal: u32, + outgoingDataTotal: u32, + lastSendTime: u32, + lastReceiveTime: u32, + nextTimeout: u32, + earliestTimeout: u32, + packetLossEpoch: u32, + packetsSent: u32, + packetsLost: u32, + packetLoss: u32, + packetLossVariance: u32, + packetThrottle: u32, + packetThrottleLimit: u32, + packetThrottleCounter: u32, + packetThrottleEpoch: u32, + packetThrottleAcceleration: u32, + packetThrottleDeceleration: u32, + packetThrottleInterval: u32, + pingInterval: u32, + timeoutLimit: u32, + timeoutMinimum: u32, + timeoutMaximum: u32, + lastRoundTripTime: u32, + lowestRoundTripTime: u32, + lastRoundTripTimeVariance: u32, + highestRoundTripTimeVariance: u32, + roundTripTime: u32, + roundTripTimeVariance: u32, + mtu: u32, + windowSize: u32, + reliableDataInTransit: u32, + outgoingReliableSequenceNumber: u16, + acknowledgements: List, + sentReliableCommands: List, + sentUnreliableCommands: List, + outgoingCommands: List, + dispatchedCommands: List, + flags: u16, + reserved: u16, + incomingUnsequencedGroup: u16, + outgoingUnsequencedGroup: u16, + unsequencedWindow: [PEER_UNSEQUENCED_WINDOW_SIZE / 32]u32, + eventData: u32, + totalWaitingData: uint, +} + +Compressor :: struct { + context_: rawptr, + compress: proc "c" (context_: rawptr, inBuffers: [^]Buffer, inBufferCount: uint, inLimit: uint, outData: [^]u8, outLimit: uint) -> uint, + decompress: proc "c" (context_: rawptr, inData: [^]u8, inLimit: uint, outData: [^]u8, outLimit: uint) -> uint, + destroy: proc "c" (context_: rawptr), +} + +ChecksumCallback :: proc "c" (buffers: [^]Buffer, bufferCount: uint) -> u32 +InterceptCallback :: proc "c" (host: ^Host, event: ^Event) -> i32 + +Host :: struct { + socket: Socket, + address: Address, + incomingBandwidth: u32, + outgoingBandwidth: u32, + bandwidthThrottleEpoch: u32, + mtu: u32, + randomSeed: u32, + recalculateBandwidthLimits: i32, + peers: [^]Peer, + peerCount: uint, + channelLimit: uint, + serviceTime: u32, + dispatchQueue: List, + continueSending: i32, + packetSize: uint, + headerFlags: u16, + commands: [PROTOCOL_MAXIMUM_PACKET_COMMANDS]Protocol, + commandCount: uint, + buffers: [BUFFER_MAXIMUM]Buffer, + bufferCount: uint, + checksum: ChecksumCallback, + compressor: Compressor, + packetData: [2][PROTOCOL_MAXIMUM_MTU]u8, + receivedAddress: Address, + receivedData: [^]u8, + receivedDataLength: uint, + totalSentData: u32, + totalSentPackets: u32, + totalReceivedData: u32, + totalReceivedPackets: u32, + intercept: InterceptCallback, + connectedPeers: uint, + bandwidthLimitedPeers: uint, + duplicatePeers: uint, + maximumPacketSize: uint, + maximumWaitingData: uint, +} + +EventType :: enum i32 { + NONE = 0, + CONNECT = 1, + DISCONNECT = 2, + RECEIVE = 3, +} + +Event :: struct { + type: EventType, + peer: ^Peer, + channelID: u8, + data: u32, + packet: ^Packet, +} + +@(default_calling_convention="c", link_prefix="enet_") +foreign ENet { + initialize :: proc() -> i32 --- + initialize_with_callbacks :: proc(version: Version, inits: ^Callbacks) -> i32 --- + deinitialize :: proc() --- + linked_version :: proc() -> Version --- + time_get :: proc() -> u32 --- + time_set :: proc(u32) --- + + socket_create :: proc(SocketType) -> Socket --- + socket_bind :: proc(Socket, ^Address) -> i32 --- + socket_get_address :: proc(Socket, ^Address) -> i32 --- + socket_listen :: proc(Socket, i32) -> i32 --- + socket_accept :: proc(Socket, ^Address) -> Socket --- + socket_connect :: proc(Socket, ^Address) -> i32 --- + socket_send :: proc(Socket, ^Address, ^Buffer, uint) -> i32 --- + socket_receive :: proc(Socket, ^Address, ^Buffer, uint) -> i32 --- + socket_wait :: proc(Socket, ^u32, u32) -> i32 --- + socket_set_option :: proc(Socket, SocketOption, i32) -> i32 --- + socket_get_option :: proc(Socket, SocketOption, ^i32) -> i32 --- + socket_shutdown :: proc(Socket, SocketShutdown) -> i32 --- + socket_destroy :: proc(Socket) --- + socketset_select :: proc(Socket, ^SocketSet, ^SocketSet, u32) -> i32 --- + + address_set_host_ip :: proc(address: ^Address, hostName: cstring) -> i32 --- + address_set_host :: proc(address: ^Address, hostName: cstring) -> i32 --- + address_get_host_ip :: proc(address: ^Address, hostName: [^]u8, nameLength: uint) -> i32 --- + address_get_host :: proc(address: ^Address, hostName: [^]u8, nameLength: uint) -> i32 --- + + packet_create :: proc(rawptr, uint, u32) -> ^Packet --- + packet_destroy :: proc(^Packet) --- + packet_resize :: proc(^Packet, uint) -> i32 --- + crc32 :: proc(^Buffer, uint) -> u32 --- + + host_create :: proc(^Address, uint, uint, u32, u32) -> ^Host --- + host_destroy :: proc(^Host) --- + host_connect :: proc(^Host, ^Address, uint, u32) -> ^Peer --- + host_check_events :: proc(^Host, ^Event) -> i32 --- + host_service :: proc(^Host, ^Event, u32) -> i32 --- + host_flush :: proc(^Host) --- + host_broadcast :: proc(^Host, u8, ^Packet) --- + host_compress :: proc(^Host, ^Compressor) --- + host_compress_with_range_coder :: proc(^Host) -> i32 --- + host_channel_limit :: proc(^Host, uint) --- + host_bandwidth_limit :: proc(^Host, u32, u32) --- + + peer_send :: proc(^Peer, u8, ^Packet) -> i32 --- + peer_receive :: proc(^Peer, ^u8) -> ^Packet --- + peer_ping :: proc(^Peer) --- + peer_ping_interval :: proc(^Peer, u32) --- + peer_timeout :: proc(^Peer, u32, u32, u32) --- + peer_reset :: proc(^Peer) --- + peer_disconnect :: proc(^Peer, u32) --- + peer_disconnect_now :: proc(^Peer, u32) --- + peer_disconnect_later :: proc(^Peer, u32) --- + peer_throttle_configure :: proc(^Peer, u32, u32, u32) --- + + range_coder_create :: proc() -> rawptr --- + range_coder_destroy :: proc(rawptr) --- + range_coder_compress :: proc(rawptr, [^]Buffer, uint, uint, [^]u8, uint) -> uint --- + range_coder_decompress :: proc(rawptr, [^]u8, uint, [^]u8, uint) -> uint --- +} \ No newline at end of file diff --git a/vendor/ENet/lib/enet.lib b/vendor/ENet/lib/enet.lib new file mode 100644 index 000000000..f713886a8 Binary files /dev/null and b/vendor/ENet/lib/enet.lib differ diff --git a/vendor/ENet/lib/enet64.lib b/vendor/ENet/lib/enet64.lib new file mode 100644 index 000000000..21e4edf4a Binary files /dev/null and b/vendor/ENet/lib/enet64.lib differ diff --git a/vendor/ENet/list.odin b/vendor/ENet/list.odin new file mode 100644 index 000000000..891f734df --- /dev/null +++ b/vendor/ENet/list.odin @@ -0,0 +1,10 @@ +package ENet + +ListNode :: struct { + next: ^ListNode, + previous: ^ListNode, +} + +List :: struct { + sentinel: ListNode, +} \ No newline at end of file diff --git a/vendor/ENet/protocol.odin b/vendor/ENet/protocol.odin new file mode 100644 index 000000000..e6cef3e4e --- /dev/null +++ b/vendor/ENet/protocol.odin @@ -0,0 +1,164 @@ +package ENet + +PROTOCOL_MINIMUM_MTU :: 576 +PROTOCOL_MAXIMUM_MTU :: 4096 +PROTOCOL_MAXIMUM_PACKET_COMMANDS :: 32 +PROTOCOL_MINIMUM_WINDOW_SIZE :: 4096 +PROTOCOL_MAXIMUM_WINDOW_SIZE :: 65536 +PROTOCOL_MINIMUM_CHANNEL_COUNT :: 1 +PROTOCOL_MAXIMUM_CHANNEL_COUNT :: 255 +PROTOCOL_MAXIMUM_PEER_ID :: 0xFFF +PROTOCOL_MAXIMUM_FRAGMENT_COUNT :: 1024 * 1024 + +ProtocolCommand :: enum i32 { + NONE = 0, + ACKNOWLEDGE = 1, + CONNECT = 2, + VERIFY_CONNECT = 3, + DISCONNECT = 4, + PING = 5, + SEND_RELIABLE = 6, + SEND_UNRELIABLE = 7, + SEND_FRAGMENT = 8, + SEND_UNSEQUENCED = 9, + BANDWIDTH_LIMIT = 10, + THROTTLE_CONFIGURE = 11, + SEND_UNRELIABLE_FRAGMENT = 12, + COUNT = 13, + MASK = 0x0F, +} + +ProtocolFlag :: enum i32 { + COMMAND_ACKNOWLEDGE = 1 << 7, + COMMAND_UNSEQUENCED = 1 << 6, + HEADER_COMPRESSED = 1 << 14, + HEADER_SENT_TIME = 1 << 15, + HEADER_MASK = HEADER_COMPRESSED | HEADER_SENT_TIME, + HEADER_SESSION_MASK = 3 << 12, + HEADER_SESSION_SHIFT = 12, +} + +ProtocolHeader :: struct #packed { + peerID: u16, + sentTime: u16, +} + +ProtocolCommandHeader :: struct #packed { + command: u8, + channelID: u8, + reliableSequenceNumber: u16, +} + +ProtocolAcknowledge :: struct #packed { + header: ProtocolCommandHeader, + outgoingPeerID: u16, + incomingSessionID: u8, + outgoingSessionID: u8, + mtu: u32, + windowSize: u32, + channelCount: u32, + incomingBandwidth: u32, + outgoingBandwidth: u32, + packetThrottleInterval: u32, + packetThrottleAcceleration: u32, + packetThrottleDeceleration: u32, + connectID: u32, + data: u32, +} + +ProtocolConnect :: struct #packed { + header: ProtocolCommandHeader, + outgoingPeerID: u16, + incomingSessionID: u8, + outgoingSessionID: u8, + mtu: u32, + windowSize: u32, + channelCount: u32, + incomingBandwidth: u32, + outgoingBandwidth: u32, + packetThrottleInterval: u32, + packetThrottleAcceleration: u32, + packetThrottleDeceleration: u32, + connectID: u32, + data: u32, +} + +ProtocolVerifyConnect :: struct #packed { + header: ProtocolCommandHeader, + outgoingPeerID: u16, + incomingSessionID: u8, + outgoingSessionID: u8, + mtu: u32, + windowSize: u32, + channelCount: u32, + incomingBandwidth: u32, + outgoingBandwidth: u32, + packetThrottleInterval: u32, + packetThrottleAcceleration: u32, + packetThrottleDeceleration: u32, + connectID: u32, +} + +ProtocolBandwidthLimit :: struct #packed { + header: ProtocolCommandHeader, + incomingBandwidth: u32, + outgoingBandwidth: u32, +} + +ProtocolThrottleConfigure :: struct #packed { + header: ProtocolCommandHeader, + packetThrottleInterval: u32, + packetThrottleAcceleration: u32, + packetThrottleDeceleration: u32, +} + +ProtocolDisconnect :: struct #packed { + header: ProtocolCommandHeader, + data: u32, +} + +ProtocolPing :: struct #packed { + header: ProtocolCommandHeader, +} + +ProtocolSendReliable :: struct #packed { + header: ProtocolCommandHeader, + dataLength: u16, +} + +ProtocolSendUnreliable :: struct #packed { + header: ProtocolCommandHeader, + unreliableSequenceNumber: u16, + dataLength: u16, +} + +ProtocolSendUnsequenced :: struct #packed { + header: ProtocolCommandHeader, + unsequencedGroup: u16, + dataLength: u16, +} + +ProtocolSendFragment :: struct #packed { + header: ProtocolCommandHeader, + startSequenceNumber: u16, + dataLength: u16, + fragmentCount: u32, + fragmentNumber: u32, + totalLength: u32, + fragmentOffset: u32, +} + +Protocol :: struct #raw_union { + header: ProtocolCommandHeader, + acknowledge: ProtocolAcknowledge, + connect: ProtocolConnect, + verifyConnect: ProtocolVerifyConnect, + disconnect: ProtocolDisconnect, + ping: ProtocolPing, + sendReliable: ProtocolSendReliable, + sendUnreliable: ProtocolSendUnreliable, + sendUnsequenced: ProtocolSendUnsequenced, + sendFragment: ProtocolSendFragment, + bandwidthLimit: ProtocolBandwidthLimit, + throttleConfigure: ProtocolThrottleConfigure, +} \ No newline at end of file diff --git a/vendor/ENet/time.odin b/vendor/ENet/time.odin new file mode 100644 index 000000000..87cef0bec --- /dev/null +++ b/vendor/ENet/time.odin @@ -0,0 +1,23 @@ +package ENet + +TIME_OVERFLOW :: u32(86400000) + +TIME_LESS :: #force_inline proc(a, b: u32) -> bool { + return a - b >= TIME_OVERFLOW +} + +TIME_GREATER :: #force_inline proc(a, b: u32) -> bool { + return b - a >= TIME_OVERFLOW +} + +TIME_LESS_EQUAL :: #force_inline proc(a, b: u32) -> bool { + return !TIME_GREATER(a, b) +} + +TIME_GREATER_EQUAL :: #force_inline proc(a, b: u32) -> bool { + return TIME_LESS(a, b) +} + +TIME_DIFFERENCE :: #force_inline proc(a, b: u32) -> u32 { + return a - b >= TIME_OVERFLOW ? b - a : a - b +} \ No newline at end of file diff --git a/vendor/ENet/unix.odin b/vendor/ENet/unix.odin new file mode 100644 index 000000000..ea6b84199 --- /dev/null +++ b/vendor/ENet/unix.odin @@ -0,0 +1,59 @@ +//+build linux, darwin, freebsd +package ENet + +// When we implement the appropriate bindings for Unix, the section separated +// by `{` and `}` here can be removed in favor of using the bindings. +// { +import "core:c" + +@(private="file") FD_SETSIZE :: 1024 + +@(private="file") fd_set :: struct { + fds_bits: [FD_SETSIZE / 8 / size_of(c.long)]c.ulong, +} + +@(private="file") FD_ZERO :: #force_inline proc(s: ^fd_set) { + for i := size_of(fd_set) / size_of(c.long); i != 0; i -= 1 { + s.fds_bits[i] = 0; + } +} + +@(private="file") FD_SET :: #force_inline proc(d: i32, s: ^fd_set) { + s.fds_bits[d / (8 * size_of(c.long))] |= c.ulong(1) << (c.ulong(d) % (8 * size_of(c.ulong))) +} + +@(private="file") FD_CLR :: #force_inline proc(d: i32, s: ^fd_set) { + s.fds_bits[d / (8 * size_of(c.long))] &= ~(c.ulong(1) << (c.ulong(d) % (8 * size_of(c.ulong)))) +} + +@(private="file") FD_ISSET :: #force_inline proc(d: i32, s: ^fd_set) -> bool { + return (s.fds_bits[d / (8 * size_of(c.long))] & c.ulong(1) << (c.ulong(d) % (8 * size_of(c.ulong)))) != 0 +} +// } + +Socket :: distinct i32 + +SOCKET_NULL :: Socket(-1) + +Buffer :: struct { + data: rawptr, + dataLength: uint, +} + +SocketSet :: distinct fd_set + +SOCKETSET_EMPTY :: #force_inline proc(sockset: ^SocketSet) { + FD_ZERO(cast(^fd_set)sockset) +} + +SOCKETSET_ADD :: #force_inline proc(sockset: ^SocketSet, socket: Socket) { + FD_SET(i32(socket), cast(^fd_set)sockset) +} + +SOCKETSET_REMOVE :: #force_inline proc(sockset: ^SocketSet, socket: Socket) { + FD_CLR(i32(socket), cast(^fd_set)sockset) +} + +SOCKSET_CHECK :: #force_inline proc(sockset: ^SocketSet, socket: Socket) -> bool { + return FD_ISSET(i32(socket), cast(^fd_set)sockset) +} \ No newline at end of file diff --git a/vendor/ENet/win32.odin b/vendor/ENet/win32.odin new file mode 100644 index 000000000..1df35ee45 --- /dev/null +++ b/vendor/ENet/win32.odin @@ -0,0 +1,81 @@ +//+build windows +package ENet + +// When we implement the appropriate bindings for Windows, the section separated +// by `{` and `}` here can be removed in favor of using the bindings. +// { +foreign import WinSock2 "system:Ws2_32.lib" + +@(private="file", default_calling_convention="c") +foreign WinSock2 { + __WSAFDIsSet :: proc(fd: SOCKET, s: ^fd_set) -> i32 --- +} + +@(private="file") SOCKET :: uintptr + +@(private="file") FD_SETSIZE :: 64 + +@(private="file") fd_set :: struct { + fd_count: u32, + fd_array: [FD_SETSIZE]SOCKET, +} + +@(private="file") FD_CLR :: proc(fd: SOCKET, s: ^fd_set) { + for i := u32(0); i < s.fd_count; i += 1 { + if s.fd_array[i] == fd { + for i < s.fd_count - 1 { + s.fd_array[i] = s.fd_array[i + 1] + i += 1 + } + s.fd_count -= 1 + break + } + } +} + +@(private="file") FD_SET :: proc(fd: SOCKET, s: ^fd_set) { + for i := u32(0); i < s.fd_count; i += 1 { + if s.fd_array[i] == fd { + return + } + } + if s.fd_count >= FD_SETSIZE do return + s.fd_array[s.fd_count] = fd + s.fd_count += 1 +} + +@(private="file") FD_ZERO :: #force_inline proc (s: ^fd_set) { + s.fd_count = 0 +} + +@(private="file") FD_ISSET :: #force_inline proc (fd: SOCKET, s: ^fd_set) -> bool { + return __WSAFDIsSet(fd, s) != 0 +} +// } + +Socket :: distinct SOCKET + +SOCKET_NULL :: Socket(~uintptr(0)) + +Buffer :: struct { + data: rawptr, + dataLength: uint, +} + +SocketSet :: distinct fd_set + +SOCKETSET_EMPTY :: #force_inline proc(sockset: ^SocketSet) { + FD_ZERO(cast(^fd_set)sockset) +} + +SOCKETSET_ADD :: #force_inline proc(sockset: ^SocketSet, socket: Socket) { + FD_SET(SOCKET(socket), cast(^fd_set)sockset) +} + +SOCKETSET_REMOVE :: #force_inline proc(sockset: ^SocketSet, socket: Socket) { + FD_CLR(SOCKET(socket), cast(^fd_set)sockset) +} + +SOCKSET_CHECK :: #force_inline proc(sockset: ^SocketSet, socket: Socket) -> bool { + return FD_ISSET(SOCKET(socket), cast(^fd_set)sockset) +} \ No newline at end of file diff --git a/vendor/README.md b/vendor/README.md index aced06b3c..31751f8c7 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -109,3 +109,12 @@ See also LICENSE.txt in the `glfw` directory itself. `portmidi_s.lib` is available under PortMidi's [MIT](https://sourceforge.net/projects/portmedia/) license. See also LICENSE.txt in the `portmidi` directory itself. + + +## ENet + +[ENet](http://enet.bespin.org/) Reliable UDP networking library. + +`enet.lib` and `enet64.lib` are available under ENet's [MIT](http://enet.bespin.org/License.html) license. + +See also LICENSE in the `ENet` directory itself. \ No newline at end of file diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin index e65e9b2fc..90d5a0f9e 100644 --- a/vendor/glfw/bindings/bindings.odin +++ b/vendor/glfw/bindings/bindings.odin @@ -46,7 +46,7 @@ foreign glfw { WindowHint :: proc(hint, value: c.int) --- DefaultWindowHints :: proc() --- WindowHintString :: proc(hint: c.int, value: cstring) --- - WindowShouldClose :: proc(window: WindowHandle) -> c.int --- + WindowShouldClose :: proc(window: WindowHandle) -> b32 --- SwapInterval :: proc(interval: c.int) --- SwapBuffers :: proc(window: WindowHandle) --- diff --git a/vendor/glfw/wrapper.odin b/vendor/glfw/wrapper.odin index 2eed82efe..2c09731ca 100644 --- a/vendor/glfw/wrapper.odin +++ b/vendor/glfw/wrapper.odin @@ -228,4 +228,4 @@ SetErrorCallback :: glfw.SetErrorCallback // Used by vendor:OpenGL gl_set_proc_address :: proc(p: rawptr, name: cstring) { (^rawptr)(p)^ = GetProcAddress(name) -} \ No newline at end of file +}