From fb006492c56c88cf8bb5936768713f2a4271f8ea Mon Sep 17 00:00:00 2001 From: water Date: Mon, 9 Aug 2021 22:05:07 -0400 Subject: [PATCH] build fix --- game/graphics/opengl_renderer/Shader.h | 10 ++++++---- game/kernel/kboot.cpp | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/game/graphics/opengl_renderer/Shader.h b/game/graphics/opengl_renderer/Shader.h index 200afa19a3..629628b801 100644 --- a/game/graphics/opengl_renderer/Shader.h +++ b/game/graphics/opengl_renderer/Shader.h @@ -2,6 +2,8 @@ #include +#include "common/common_types.h" + class Shader { public: static constexpr char shader_folder[] = "game/graphics/opengl_renderer/shaders/"; @@ -9,12 +11,12 @@ class Shader { Shader() = default; void activate(); bool okay() const { return m_is_okay; } - uint id() const { return m_program; } + u64 id() const { return m_program; } private: - uint m_frag_shader = 0; - uint m_vert_shader = 0; - uint m_program = 0; + u64 m_frag_shader = 0; + u64 m_vert_shader = 0; + u64 m_program = 0; bool m_is_okay = false; }; diff --git a/game/kernel/kboot.cpp b/game/kernel/kboot.cpp index eb793d1f76..197c346e97 100644 --- a/game/kernel/kboot.cpp +++ b/game/kernel/kboot.cpp @@ -184,7 +184,6 @@ void KernelCheckAndDispatch() { if (time_ms < 4) { std::this_thread::sleep_for(std::chrono::microseconds(1000)); } - } }