Merge branch 'master' into sysinfo

This commit is contained in:
Jeroen van Rijn
2022-09-03 17:00:14 +02:00
6 changed files with 22 additions and 11 deletions
+13 -1
View File
@@ -50,7 +50,19 @@ config_darwin() {
}
config_freebsd() {
: ${LLVM_CONFIG=/usr/local/bin/llvm-config11}
: ${LLVM_CONFIG=}
if [ ! "$LLVM_CONFIG" ]; then
if which llvm-config11 > /dev/null 2>&1; then
LLVM_CONFIG=llvm-config11
elif which llvm-config12 > /dev/null 2>&1; then
LLVM_CONFIG=llvm-config12
elif which llvm-config13 > /dev/null 2>&1; then
LLVM_CONFIG=llvm-config13
else
panic "Unable to find LLVM-config"
fi
fi
CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)"
LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)"
+1 -1
View File
@@ -596,7 +596,7 @@ absolute_path_from_handle :: proc(fd: Handle) -> (string, Errno) {
return "", Errno(get_last_error())
}
path := strings.clone_from_cstring(cstring(&buf[0]), context.temp_allocator)
path := strings.clone_from_cstring(cstring(&buf[0]))
return path, ERROR_NONE
}
+4 -7
View File
@@ -1400,7 +1400,7 @@ bool check_expr_is_stack_variable(Ast *expr) {
expr = unparen_expr(expr);
Entity *e = entity_of_node(expr);
if (e && e->kind == Entity_Variable) {
if (e->flags & (EntityFlag_Static|EntityFlag_Using)) {
if (e->flags & (EntityFlag_Static|EntityFlag_Using|EntityFlag_ImplicitReference|EntityFlag_ForValue)) {
// okay
} else if (e->Variable.thread_local_model.len != 0) {
// okay
@@ -1941,13 +1941,10 @@ void check_stmt_internal(CheckerContext *ctx, Ast *node, u32 flags) {
}
if (found == nullptr) {
entity = alloc_entity_variable(ctx->scope, token, type, EntityState_Resolved);
entity->flags |= EntityFlag_ForValue;
entity->flags |= EntityFlag_Value;
if (i == addressable_index) {
if (use_by_reference_for_value) {
entity->flags &= ~EntityFlag_Value;
} else {
entity->flags |= EntityFlag_ForValue;
}
if (i == addressable_index && use_by_reference_for_value) {
entity->flags &= ~EntityFlag_Value;
}
if (is_soa) {
if (i == 0) {
+2
View File
@@ -1,5 +1,7 @@
package odin_gl
GL_DEBUG :: #config(GL_DEBUG, ODIN_DEBUG)
FALSE :: false
TRUE :: true
+1 -1
View File
@@ -46,7 +46,7 @@ get_last_error_message :: proc() -> (compile_message: string, compile_type: Shad
// Shader checking and linking checking are identical
// except for calling differently named GL functions
// it's a bit ugly looking, but meh
when ODIN_DEBUG {
when GL_DEBUG {
import "core:runtime"
@private
+1 -1
View File
@@ -2,7 +2,7 @@ package odin_gl
#assert(size_of(bool) == size_of(u8))
when !ODIN_DEBUG {
when !GL_DEBUG {
// VERSION_1_0
CullFace :: proc "c" (mode: u32) { impl_CullFace(mode) }
FrontFace :: proc "c" (mode: u32) { impl_FrontFace(mode) }