Skip to content

Commit 2a5986d

Browse files
committed
Merge branch 'main' of github.com:benjamaan476/egakeru
2 parents fe1aaea + 5cce35f commit 2a5986d

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

engine/platform/windows/platform_windows.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ namespace egkr
186186
return { (uint32_t)width_, (uint32_t)height_ };
187187
}
188188

189-
std::optional<platform::dynamic_library internal_platform::load_library(const std::string& library_name)
189+
std::optional<platform::dynamic_library> internal_platform::load_library(const std::string& library_name)
190190
{
191191
if(library_name.empty())
192192
{
@@ -232,7 +232,7 @@ namespace egkr
232232
return false;
233233
}
234234

235-
FARPROC addr = GetProcAddress((HMODULE)library.interal_data, function_name.c_str());
235+
FARPROC addr = GetProcAddress((HMODULE)library.internal_data, function_name.c_str());
236236
if(!addr)
237237
{
238238
LOG_ERROR("Could not load function {} from {}", function_name, library.library_name);

engine/platform/windows/platform_windows.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ namespace egkr
2828
[[nodiscard]] void* get_window() const override;
2929
uint2 get_framebuffer_size() final;
3030
[[nodiscard]] static std::optional<dynamic_library> load_library(const std::string& library_name);
31-
bool unload_library(dynamic_library& library);
32-
bool load_function(const std::string& function_name, dynamic_library& library);
31+
static bool unload_library(dynamic_library& library);
32+
static bool load_function(const std::string& function_name, dynamic_library& library);
3333

3434
private:
3535

engine/plugins/renderer/vulkan/renderer_vulkan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ namespace egkr
182182
requirements.transfer = true;
183183
requirements.sampler_anisotropy = true;
184184

185-
requirements.discrete_gpu = true;
185+
requirements.discrete_gpu = false;
186186

187187
physical_device_queue_family_info queue_info{};
188188

engine/renderer/passes/scene_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ namespace egkr::pass
127127
{
128128
const auto& model = world->get_world();
129129
shader_system::set_uniform(terrain_shader_locations.model, &model);
130-
};
130+
}
131131
}
132132

133133
if (data.terrain.front().is_winding_reversed)

engine/systems/font_system.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ namespace egkr
309309
}
310310
variant.glyphs.reserve(codepoint_count);
311311

312-
for(const auto& [i, pc] : packed_chars | std::views::enumerate)
312+
for(const auto[i, pc] : packed_chars | std::views::enumerate)
313313
{
314314
const font::glyph glyph
315315
{
@@ -342,7 +342,7 @@ namespace egkr
342342
return {};
343343
}
344344

345-
for(const auto& [table, kern] : std::views::zip(kerning_table, variant.kernings))
345+
for(const auto [table, kern] : std::views::zip(kerning_table, variant.kernings))
346346
{
347347
kern.codepoint_0 = table.glyph1;
348348
kern.codepoint_1 = table.glyph2;

engine/systems/geometry_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ template <typename vertex> [[maybe_unused]] static void generate_tangents(egkr::
7171
}
7272
}
7373

74-
template <typename vertex> static void generate_normals(egkr::vector<vertex>& vertices, const egkr::vector<uint32_t>& indices)
74+
template <typename vertex> [[maybe_unused]] static void generate_normals(egkr::vector<vertex>& vertices, const egkr::vector<uint32_t>& indices)
7575
{
7676
for (auto i{0U}; i < indices.size(); i += 3)
7777
{

0 commit comments

Comments
 (0)