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

Compiles with ogl-es 1.x again 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4499 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2013-04-05 12:53:10 +00:00
parent 0dae377265
commit f73be97aac
6 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/08.SpecialFX/main.cpp
View File

@ -34,8 +34,8 @@ int main()
void android_main(struct android_app* app)
#endif
{
app_dummy();
#ifdef _IRR_ANDROID_PLATFORM_
app_dummy();
const bool shadows = false;
video::E_DRIVER_TYPE driverType=video::EDT_OGLES1;
#else

3
examples/11.PerPixelLighting/main.cpp
View File

@ -171,9 +171,6 @@ int main()
{
// ask user for driver
video::E_DRIVER_TYPE driverType=driverChoiceConsole();
if (driverType==video::EDT_COUNT)
return 1;
video::E_DRIVER_TYPE driverType=driverChoiceConsole();
if (driverType==video::EDT_COUNT)
return 1;

67
source/Irrlicht/COGLESDriver.cpp
View File

@ -2855,6 +2855,46 @@ ECOLOR_FORMAT COGLES1Driver::getColorFormat() const
}
//! Get a vertex shader constant index.
s32 COGLES1Driver::getVertexShaderConstantID(const c8* name)
{
return getPixelShaderConstantID(name);
}
//! Get a pixel shader constant index.
s32 COGLES1Driver::getPixelShaderConstantID(const c8* name)
{
os::Printer::log("Error: Please call services->getPixelShaderConstantID(), not VideoDriver->getPixelShaderConstantID().");
return -1;
}
//! Sets a constant for the vertex shader based on an index.
bool COGLES1Driver::setVertexShaderConstant(s32 index, const f32* floats, int count)
{
//pass this along, as in GLSL the same routine is used for both vertex and fragment shaders
return setPixelShaderConstant(index, floats, count);
}
//! Int interface for the above.
bool COGLES1Driver::setVertexShaderConstant(s32 index, const s32* ints, int count)
{
return setPixelShaderConstant(index, ints, count);
}
//! Sets a constant for the pixel shader based on an index.
bool COGLES1Driver::setPixelShaderConstant(s32 index, const f32* floats, int count)
{
os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
return false;
}
//! Int interface for the above.
bool COGLES1Driver::setPixelShaderConstant(s32 index, const s32* ints, int count)
{
os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
return false;
}
//! Sets a vertex shader constant.
void COGLES1Driver::setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount)
{
@ -2873,33 +2913,6 @@ void COGLES1Driver::setPixelShaderConstant(const f32* data, s32 startRegister, s
#endif
}
//! Sets a constant for the vertex shader based on a name.
bool COGLES1Driver::setVertexShaderConstant(const c8* name, const f32* floats, int count)
{
//pass this along, as in GLSL the same routine is used for both vertex and fragment shaders
return setPixelShaderConstant(name, floats, count);
}
//! Int interface for the above.
bool COGLES1Driver::setVertexShaderConstant(const c8* name, const s32* ints, int count)
{
return setPixelShaderConstant(name, ints, count);
}
//! Sets a constant for the pixel shader based on a name.
bool COGLES1Driver::setPixelShaderConstant(const c8* name, const f32* floats, int count)
{
os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
return false;
}
//! Int interface for the above.
bool COGLES1Driver::setPixelShaderConstant(const c8* name, const s32* ints, int count)
{
os::Printer::log("Error: Please call services->setPixelShaderConstant(), not VideoDriver->setPixelShaderConstant().");
return false;
}
//! Adds a new material renderer to the VideoDriver, using pixel and/or
//! vertex shaders to render geometry.

30
source/Irrlicht/COGLESDriver.h
View File

@ -227,24 +227,30 @@ namespace video
virtual void setBasicRenderStates(const SMaterial& material, const SMaterial& lastmaterial,
bool resetAllRenderstates);
//! Get a vertex shader constant index.
virtual s32 getVertexShaderConstantID(const c8* name);
//! Get a pixel shader constant index.
virtual s32 getPixelShaderConstantID(const c8* name);
//! Sets a constant for the vertex shader based on an index.
virtual bool setVertexShaderConstant(s32 index, const f32* floats, int count);
//! Int interface for the above.
virtual bool setVertexShaderConstant(s32 index, const s32* ints, int count);
//! Sets a constant for the pixel shader based on an index.
virtual bool setPixelShaderConstant(s32 index, const f32* floats, int count);
//! Int interface for the above.
virtual bool setPixelShaderConstant(s32 index, const s32* ints, int count);
//! Sets a vertex shader constant.
virtual void setVertexShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1);
//! Sets a pixel shader constant.
virtual void setPixelShaderConstant(const f32* data, s32 startRegister, s32 constantAmount=1);
//! Sets a constant for the vertex shader based on a name.
virtual bool setVertexShaderConstant(const c8* name, const f32* floats, int count);
//! Int interface for the above.
virtual bool setVertexShaderConstant(const c8* name, const s32* ints, int count);
//! Sets a constant for the pixel shader based on a name.
virtual bool setPixelShaderConstant(const c8* name, const f32* floats, int count);
//! Int interface for the above.
virtual bool setPixelShaderConstant(const c8* name, const s32* ints, int count);
//! sets the current Texture
bool setActiveTexture(u32 stage, const video::ITexture* texture);

6
source/Irrlicht/Irrlicht10.0.vcxproj
View File

@ -289,7 +289,7 @@
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Static lib - Release - Fast FPU|x64'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Static lib - Release|Win32'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Static lib - Release|x64'">$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
<ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_PCEMULATION_2.07.27.0484\Builds\OGLES2\WindowsPC\Lib;$(ExecutablePath)</ExecutablePath>
<ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Imagination Technologies\POWERVR SDK\OGLES_WINDOWS_X86EMULATION_2.08.28.0634\Builds\OGLES\WindowsX86\Lib;C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_PCEMULATION_2.07.27.0484\Builds\OGLES2\WindowsPC\Lib;$(ExecutablePath)</ExecutablePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Imagination Technologies\POWERVR SDK\OGLES_WINDOWS_X86EMULATION_2.08.28.0634\Builds\OGLES\WindowsX86\Lib;C:\Imagination Technologies\POWERVR SDK\OGLES2_WINDOWS_X86EMULATION_2.08.28.0634\Builds\OGLES2\WindowsX86\Lib;$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release - Fast FPU|Win32'">$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
@ -1002,11 +1002,9 @@
<ClInclude Include="COGLES2Driver.h" />
<ClInclude Include="COGLES2ExtensionHandler.h" />
<ClInclude Include="COGLES2FixedPipelineRenderer.h" />
<ClInclude Include="COGLES2MaterialRenderer.h" />
<ClInclude Include="COGLES2NormalMapRenderer.h" />
<ClInclude Include="COGLES2ParallaxMapRenderer.h" />
<ClInclude Include="COGLES2Renderer2D.h" />
<ClInclude Include="COGLES2MaterialRenderer.h" />
<ClInclude Include="COGLES2Texture.h" />
<ClInclude Include="COGLESDriver.h" />
<ClInclude Include="COGLESExtensionHandler.h" />
@ -1581,4 +1579,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

5
source/Irrlicht/Irrlicht10.0.vcxproj.filters
View File

@ -1309,9 +1309,6 @@
<ClInclude Include="COGLES2FixedPipelineRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2MaterialRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
<ClInclude Include="COGLES2NormalMapRenderer.h">
<Filter>Irrlicht\video\OpenGL-ES 2.x</Filter>
</ClInclude>
@ -2331,4 +2328,4 @@
<ItemGroup>
<ResourceCompile Include="Irrlicht.rc" />
</ItemGroup>
</Project>
</Project>