MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make shader path for ogles2 configurable via define. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3561 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2011-01-14 17:30:24 +00:00
parent de2e004b83
commit 9b277bea38
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/IrrCompileConfig.h
View File

@ -172,6 +172,9 @@ it should be usually the only HW accelerated one. OpenGL is currently disabled
if using this driver, to avoid problems with the ogl-es emulators.
*/
//#define _IRR_COMPILE_WITH_OGLES1_
#ifdef NO_IRR_COMPILE_WITH_OGLES1_
#undef _IRR_COMPILE_WITH_OGLES1_
#endif
//! Define _IRR_COMPILE_WITH_OGLES2_ to compile the Irrlicht engine with OpenGL-ES 2.x.
/** If you do not wish the engine to be compiled with OpenGL-ES 2.x, comment
@ -181,6 +184,12 @@ it should be usually the only HW accelerated one. OpenGL is currently disabled
if using this driver, to avoid problems with the ogl-es emulators.
*/
//#define _IRR_COMPILE_WITH_OGLES2_
#ifdef NO_IRR_COMPILE_WITH_OGLES2_
#undef _IRR_COMPILE_WITH_OGLES2_
#endif
#ifndef IRR_OGLES2_SHADER_PATH
#define IRR_OGLES2_SHADER_PATH "../../media/Shaders/"
#endif
//! Define _IRR_COMPILE_WITH_SOFTWARE_ to compile the Irrlicht engine with software driver
/** If you do not need the software driver, or want to use Burning's Video instead,

4
source/Irrlicht/COGLES2FixedPipelineShader.cpp
View File

@ -57,8 +57,8 @@ namespace irr
0
};
const c8 VertexShaderFile[] = "../../media/Shaders/COGLES2FixedPipeline.vsh";
const c8 FragmentShaderFile[] = "../../media/Shaders/COGLES2FixedPipeline.fsh";
const c8 VertexShaderFile[] = IRR_OGLES2_SHADER_PATH "COGLES2FixedPipeline.vsh";
const c8 FragmentShaderFile[] = IRR_OGLES2_SHADER_PATH "COGLES2FixedPipeline.fsh";
COGLES2FixedPipelineShader::COGLES2FixedPipelineShader( video::COGLES2Driver *driver, io::IFileSystem* fs )
: COGLES2SLMaterialRenderer( driver, fs, 0, 0, sBuiltInShaderUniformNames, UNIFORM_COUNT ), Normalize( 0 ), AlphaTest( 0 ), AlphaValue( 0.f ),

4
source/Irrlicht/COGLES2NormalMapRenderer.cpp
View File

@ -32,8 +32,8 @@ namespace irr
};
// Irrlicht Engine OGLES2 render path normal map vertex shader
const c8 VertexShaderFile[] = "../../media/Shaders/COGLES2NormalMap.vsh";
const c8 FragmentShaderFile[] = "../../media/Shaders/COGLES2NormalMap.fsh";
const c8 VertexShaderFile[] = IRR_OGLES2_SHADER_PATH "COGLES2NormalMap.vsh";
const c8 FragmentShaderFile[] = IRR_OGLES2_SHADER_PATH "COGLES2NormalMap.fsh";
//! Constructor

4
source/Irrlicht/COGLES2ParallaxMapRenderer.cpp
View File

@ -35,8 +35,8 @@ namespace irr
};
// Irrlicht Engine OGLES2 render path normal map vertex shader
const c8 VertexShaderFile[] = "../../media/Shaders/COGLES2ParallaxMap.vsh";
const c8 FragmentShaderFile[] = "../../media/Shaders/COGLES2ParallaxMap.fsh";
const c8 VertexShaderFile[] = IRR_OGLES2_SHADER_PATH "COGLES2ParallaxMap.vsh";
const c8 FragmentShaderFile[] = IRR_OGLES2_SHADER_PATH "COGLES2ParallaxMap.fsh";
//! Constructor
COGLES2ParallaxMapRenderer::COGLES2ParallaxMapRenderer( video::COGLES2Driver* driver,

4
source/Irrlicht/COGLES2Renderer2D.cpp
View File

@ -22,8 +22,8 @@ namespace irr
0
};
static const char* vertexShaderFile = "../../media/Shaders/COGLES2Renderer2D.vsh";
static const char* fragmentShaderFile = "../../media/Shaders/COGLES2Renderer2D.fsh";
static const char* vertexShaderFile = IRR_OGLES2_SHADER_PATH "COGLES2Renderer2D.vsh";
static const char* fragmentShaderFile = IRR_OGLES2_SHADER_PATH "COGLES2Renderer2D.fsh";
COGLES2Renderer2d::COGLES2Renderer2d( irr::video::COGLES2Driver *driver, irr::io::IFileSystem *fs )
: COGLES2SLMaterialRenderer( driver, fs, 0, 0, sBuiltInShaderUniformNames, UNIFORM_COUNT )