summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author0scar <qgt268@alumni.ku.dk>2024-08-25 17:33:09 +0000
committer0undefined <oscar@nelin.dk>2025-02-26 12:50:10 +0000
commitbbf3f577642b7d24695ece47252eff03ab2c308c (patch)
treeb7f500aed2ba2750a0a94d8e541a40b687aea8a9
parent34aa22651c34ad02ae4474057b1c3bce16d38aca (diff)
This commit works well with daw version e09c7858
-rw-r--r--CMakeLists.txt3
-rw-r--r--state_mainstate/src/mainstate.c12
2 files changed, 6 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3964473..1fe0b53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,6 @@ FetchContent_Declare(daw
GIT_TAG glfw
)
-add_compile_options(-Og -ggdb3 -fno-omit-frame-pointer)
-add_link_options(-Og -ggdb3 -fno-omit-frame-pointer)
-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_options(-D_DEBUG)
endif()
diff --git a/state_mainstate/src/mainstate.c b/state_mainstate/src/mainstate.c
index 43468fb..36cd57d 100644
--- a/state_mainstate/src/mainstate.c
+++ b/state_mainstate/src/mainstate.c
@@ -48,14 +48,14 @@ static f32 crate_normals[36*2];
#define COUNT(a) sizeof(a) / sizeof(a[0])
ShaderBuffer shaderbuf[] = {
- SHADERBUFFER_NEW(f32, COUNT(crate), 3, crate),
- SHADERBUFFER_NEW(f32, COUNT(crate_texture_coords), 2, crate_texture_coords),
- SHADERBUFFER_NEW(f32, COUNT(crate_normals), 2, crate_normals),
+ SHADERBUFFER_NEW(f32, COUNT(crate), 3, crate, 0),
+ SHADERBUFFER_NEW(f32, COUNT(crate_texture_coords), 2, crate_texture_coords, 0),
+ SHADERBUFFER_NEW(f32, COUNT(crate_normals), 2, crate_normals, 0),
};
ShaderBuffer shaderbuf2[] = {
- SHADERBUFFER_NEW(f32, COUNT(crate2), 3, crate2),
- SHADERBUFFER_NEW(f32, COUNT(crate_texture_coords), 2, crate_texture_coords),
- SHADERBUFFER_NEW(f32, COUNT(crate_normals), 2, crate_normals),
+ SHADERBUFFER_NEW(f32, COUNT(crate2), 3, crate2, 0),
+ SHADERBUFFER_NEW(f32, COUNT(crate_texture_coords), 2, crate_texture_coords, 0),
+ SHADERBUFFER_NEW(f32, COUNT(crate_normals), 2, crate_normals, 0),
};
#undef COUNT