diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-02-05 07:03:01 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-02-05 07:03:01 +0000 |
| commit | d8b46657425c6b806584d10fa50b11d49ba03850 (patch) | |
| tree | 55f9262ea7554ef93318f8ddcc18c709e46590ea | |
| parent | cac45ae6553e0e3950a6826047cda11e8ecf91ac (diff) | |
Add GLAD
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/engine.c | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47625f3..5aa7ba1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,11 +80,12 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" ENGINE_BUILD_TYPE) ## Packages find_package(glfw3 3.3 REQUIRED) -find_package(GLEW 2.2 REQUIRED) +find_package(OpenGL REQUIRED) FetchContent_Declare(cglm GIT_REPOSITORY https://github.com/recp/cglm.git GIT_TAG v0.9.2 ) + FetchContent_MakeAvailable(cglm) ## Compilation information @@ -114,12 +115,12 @@ add_library(daw ${ENGINE_SOURCES}) target_include_directories(daw PUBLIC - include ${CMAKE_BINARY_DIR}/include ${ENGINE_INCLUDE}) + include extern/glad/include ${CMAKE_BINARY_DIR}/include ${ENGINE_INCLUDE}) target_link_libraries(${PROJECT_NAME} SDL2 SDL2_image SDL2_ttf glfw - GLEW + OpenGL::GL cglm $<$<NOT:$<PLATFORM_ID:Windows>>:m> $<$<BOOL:${DAW_BUILD_HOTRELOAD}>:dl> diff --git a/src/engine.c b/src/engine.c index 5401bd1..4c4f0cb 100644 --- a/src/engine.c +++ b/src/engine.c @@ -264,11 +264,7 @@ struct glfw_ctx initialize_GLFW( glfwMakeContextCurrent(window); - glewExperimental = true; - if (glewInit() != GLEW_OK) { - ERROR("failed to initialize glew!\n"); - exit(EXIT_FAILURE); - } + gladLoadGL(glfwGetProcAddress); // TODO: Replace with callback //glfwSetInputMode(window, GLFW_STICKY_KEYS, GL_TRUE); @@ -298,7 +294,7 @@ Platform* engine_init(const char* windowtitle, v2_i32 windowsize, const Asset_TextureSpec* textures[]) { #ifdef BENCHMARK - u32 init_start = glfwGetTime(); + u32 init_start = SDL_GetTicks(); #endif #if defined(__linux) || defined(__linux__) || defined(linux) |