Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use simple include paths #571

Merged
merged 1 commit into from
Jul 5, 2019
Merged

Use simple include paths #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/dxc_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

// clang-format off
// The order here matters, so don't reformat.
#include "third_party/dxc/include/dxc/Support/WinAdapter.h"
#include "third_party/dxc/include/dxc/Support/WinIncludes.h"
#include "third_party/dxc/include/dxc/Support/Global.h"
#include "third_party/dxc/include/dxc/Support/HLSLOptions.h"
#include "third_party/dxc/include/dxc/Support/dxcapi.use.h"
#include "third_party/dxc/include/dxc/dxcapi.h"
#include "dxc/Support/WinAdapter.h"
#include "dxc/Support/WinIncludes.h"
#include "dxc/Support/Global.h"
#include "dxc/Support/HLSLOptions.h"
#include "dxc/Support/dxcapi.use.h"
#include "dxc/dxcapi.h"
// clang-format on

#if AMBER_PLATFORM_WINDOWS
Expand Down
2 changes: 1 addition & 1 deletion src/shader_compiler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#pragma clang diagnostic ignored "-Wold-style-cast"
#pragma clang diagnostic ignored "-Wshadow-uncaptured-local"
#pragma clang diagnostic ignored "-Wweak-vtables"
#include "third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp"
#include "shaderc/shaderc.hpp"
#pragma clang diagnostic pop
#endif // AMBER_ENABLE_SHADERC

Expand Down