lauchmelder/yabgbe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Let ImGUI explicitely use GLAD to load OpenGL functionalities

Browse source
This commit is contained in:
hans 2021-10-29 00:53:46 +02:00
parent bc813ad9cd
commit 93cf23344d
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -9,7 +9,7 @@ target_sources(yabgbe PUBLIC ${OTHER_SOURCES})
target_include_directories(yabgbe target_include_directories(yabgbe
PUBLIC PUBLIC
"${CMAKE_SOURCE_DIR}/vendor/imgui/include" "${CMAKE_SOURCE_DIR}/vendor/imgui/include"
"${CMAKE_SOURCE_DIR}/vendor/glad/include" "${CMAKE_SOURCE_DIR}/vendor/glad/include/glad/"
SDL2 SDL2
) )

9
src/main.cpp
View file

@ -3,7 +3,9 @@
#include <iostream> #include <iostream>
#include <SDL.h> #include <SDL.h>
#include <imgui.h> #include <glad.h>
#define IMGUI_IMPL_OPENGL_LOADER_GLAD
#include <imgui_impl_opengl3.h>
#include <imgui_sdl.h> #include <imgui_sdl.h>
static BYTE colormap[4] = { 0b00000000, 0b00100101, 0b01001010, 0b10010011 }; static BYTE colormap[4] = { 0b00000000, 0b00100101, 0b01001010, 0b10010011 };
@ -37,6 +39,11 @@ int main(int argc, char** argv)
return -1; return -1;
} }
if(!gladLoadGL())
{
std::cerr << "Failed to load GL" << std::endl;
}
SDL_Event e; SDL_Event e;
// Initialize ImGui // Initialize ImGui

2
vendor/glad/src/glad.c vendored
View file

@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <glad/glad.h> #include "../glad/glad.h"
static void* get_proc(const char *namez); static void* get_proc(const char *namez);

5
vendor/imgui/include/imconfig.h vendored
View file

@ -8,6 +8,9 @@
#pragma once #pragma once
// This makes sure imgui uses glad
#define IMGUI_IMPL_OPENGL_LOADER_GLAD
//---- Define assertion handler. Defaults to calling assert(). //---- Define assertion handler. Defaults to calling assert().
// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement. // If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
//#define IM_ASSERT(_EXPR) MyAssert(_EXPR) //#define IM_ASSERT(_EXPR) MyAssert(_EXPR)
@ -99,4 +102,4 @@ namespace ImGui
{ {
void MyFunction(const char* name, const MyMatrix44& v); void MyFunction(const char* name, const MyMatrix44& v);
} }
*/ */