Skip to content

Commit 5e34838

Browse files
author
Konstantin Zverev
committed
Merge remote-tracking branch 'github/baikal-next' into baikal
2 parents d00e46e + 2919056 commit 5e34838

File tree

7 files changed

+610
-772
lines changed

7 files changed

+610
-772
lines changed

App/CLW/clw_scene_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace Baikal
3131

3232
m_api->SetOption("acc.type", "fatbvh");
3333
m_api->SetOption("bvh.builder", "sah");
34-
m_api->SetOption("bvh.sah.num_bins", 16.f);
34+
m_api->SetOption("bvh.sah.num_bins", 64.f);
3535
}
3636

3737
Material const* ClwSceneController::GetDefaultMaterial() const

App/ImGUI/imgui_impl_glfw_gl3.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
#ifdef __APPLE__
1313
#include <OpenCL/OpenCL.h>
14-
#include <OpenGL/gl3.h>
14+
#define GLFW_INCLUDE_GLCOREARB
15+
#define GLFW_NO_GLU
1516
#include "GLFW/glfw3.h"
1617
#elif WIN32
1718
#define NOMINMAX

0 commit comments

Comments
 (0)