ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228 from shuaDev/shwadev-packages

Browse Source 
Fix some core lib errors on packages branch
This commit is contained in:
gingerBill
2018-06-03 21:09:57 +01:00
committed by GitHub
parent b027b1d60f 7ed1d931cb
commit fa6f31186a
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/alloc.odin
+1 -1
View File
@@ -59,7 +59,7 @@ free_slice :: proc(array: $T/[]$E, loc := #caller_location) {
free_ptr(raw_data(array), loc); free_ptr(raw_data(array), loc);
} }
free_map :: proc(m: $T/map[$K]$V, loc := #caller_location) { free_map :: proc(m: $T/map[$K]$V, loc := #caller_location) {
raw := transmute(raw.Map)m; raw := transmute(Raw_Map)m;
free_dynamic_array(raw.hashes, loc); free_dynamic_array(raw.hashes, loc);
free_ptr(raw.entries.data, loc); free_ptr(raw.entries.data, loc);
} }
core/opengl/opengl.odin
+7 -6
View File
@@ -1,15 +1,16 @@
package opengl package opengl
when ODIN_OS == "windows" { import "core:os"
import "core:mem"
when os.OS == "windows" {
foreign import lib "system:opengl32.lib" foreign import lib "system:opengl32.lib"
import win32 "core:sys/win32" import win32 "core:sys/win32"
} else when ODIN_OS == "linux" { } else when os.OS == "linux" {
foreign import lib "system:gl" foreign import lib "system:gl"
} }
export "core:opengl_constants.odin" #assert(os.OS != "osx");
#assert(ODIN_OS != "osx");
@(default_calling_convention="c", link_prefix="gl") @(default_calling_convention="c", link_prefix="gl")
foreign lib { foreign lib {
@@ -48,7 +49,7 @@ get_gl_proc_address :: proc(name: string) -> rawptr {
name = name[..len(name)-1]; name = name[..len(name)-1];
} }
// NOTE(bill): null terminated // NOTE(bill): null terminated
assert((&name[0] + len(name))^ == 0); assert(mem.ptr_offset(&name[0], cast(uintptr)len(name))^ == 0);
res := win32.get_gl_proc_address(cstring(&name[0])); res := win32.get_gl_proc_address(cstring(&name[0]));
if res == nil { if res == nil {
res = win32.get_proc_address(_libgl, cstring(&name[0])); res = win32.get_proc_address(_libgl, cstring(&name[0]));