HomeWildfire Games

Adds #include directive support to shaders

Description

Adds #include directive support to shaders

Comments By: Stan, wraitii
Tested By: Freagarach, Stan

Differential Revision: https://code.wildfiregames.com/D3030

Event Timeline

test_Preprocessor.cpp
In file included from ../../../source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.cpp:17:
/media/freagarach/0AD/SVN/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h: In lambda function:
/media/freagarach/0AD/SVN/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:203:17: warning: unused parameter ‘includePath’ [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
     ~~~~~~~~~~~~^~~~~~~~~~~
/media/freagarach/0AD/SVN/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h: In lambda function:
/media/freagarach/0AD/SVN/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:220:17: warning: unused parameter ‘includePath’ [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
     ~~~~~~~~~~~~^~~~~~~~~~~
/media/freagarach/0AD/SVN/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:220:36: warning: unused parameter ‘out’ [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
/media/freagarach/0AD/SVN/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h: In lambda function:
/media/freagarach/0AD/SVN/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:234:17: warning: unused parameter ‘includePath’ [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
     ~~~~~~~~~~~~^~~~~~~~~~~
Stan raised a concern with this commit.Jan 15 2021, 11:59 AM
Stan added a subscriber: Stan.

This commit broke --without-pch. While at it, please fix the warnings.

/ps/trunk/source/graphics/PreprocessorWrapper.cpp
23

Missing

#include "ps/Profile.h"
/ps/trunk/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h
21

Missing

#include "lib/timer.h"
This commit now has outstanding concerns.Jan 15 2021, 11:59 AM
vladislavbelov requested verification of this commit.Jan 15 2021, 12:22 PM
vladislavbelov marked 2 inline comments as done.
This commit now requires verification by auditors.Jan 15 2021, 12:22 PM
Stan resigned from this commit.Jan 15 2021, 12:23 PM
This commit no longer requires audit.Jan 15 2021, 12:23 PM