trying to get everything to work
This commit is contained in:
@@ -18,6 +18,7 @@ find_package(fastgltf REQUIRED)
|
||||
find_package(spdlog REQUIRED)
|
||||
find_package(glm REQUIRED)
|
||||
find_package(glfw3 REQUIRED)
|
||||
find_package(shaderc REQUIRED)
|
||||
|
||||
file(GLOB_RECURSE SRC_FILES "src/*.cpp")
|
||||
file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")
|
||||
@@ -57,7 +58,7 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC
|
||||
X11
|
||||
yaml-cpp::yaml-cpp
|
||||
nfd
|
||||
shaderc_combined
|
||||
shaderc::shaderc
|
||||
glslang
|
||||
glslang-default-resource-limits
|
||||
SPIRV
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
#ifndef PCH_HPP
|
||||
#define PCH_HPP
|
||||
|
||||
#include "open_engine/logging.hpp"
|
||||
#include <open_engine/logging.hpp>
|
||||
#include <shaderc/shaderc.hpp>
|
||||
|
||||
#include <functional>
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#define SHADER_HPP
|
||||
|
||||
#include <open_engine/ref_scope.hpp>
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#include <core.hpp>
|
||||
#include <opengl/opengl_shader.hpp>
|
||||
#include <shaderc/shaderc.h>
|
||||
#include <instrumentor.hpp>
|
||||
#include <core/time.hpp>
|
||||
#include <logging.hpp>
|
||||
@@ -13,7 +12,6 @@
|
||||
#include <glm/glm.hpp>
|
||||
#include <filesystem>
|
||||
#include <glad/glad.h>
|
||||
//#include <alloca.h>
|
||||
|
||||
namespace OpenEngine {
|
||||
|
||||
@@ -30,7 +28,7 @@ namespace OpenEngine {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static shaderc_shader_kind GLShaderStageToShaderC(GLenum stage)
|
||||
static ::shaderc_shader_kind GLShaderStageToShaderC(GLenum stage)
|
||||
{
|
||||
switch (stage)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user