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

- Improved OpenGL optimized calls organization. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4412 dfc29bdd-3216-0410-991c-e03cc46cb475
master
nadro 2012-12-23 04:14:49 +00:00
parent dd15cecd50
commit 42c92aa53b
4 changed files with 218 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

341
source/Irrlicht/COpenGLDriver.cpp
View File

@ -43,9 +43,7 @@ COpenGLDriver::COpenGLDriver(const irr::SIrrlichtCreationParameters& params,
CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
AntiAlias(params.AntiAlias), RenderTargetTexture(0),
CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
CurrentTarget(ERT_FRAME_BUFFER), Params(params),
IsDepthTestEnabled(false), IsTexture2DEnabled(false), DepthMask(true),
CurrentMatrixMode(0), CurrentActiveTexture(0),
CurrentTarget(ERT_FRAME_BUFFER), Params(params), BridgeCalls(0),
HDc(0), Window(static_cast<HWND>(params.WindowId)), Win32Device(device),
DeviceType(EIDT_WIN32)
{
@ -481,9 +479,7 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
AntiAlias(params.AntiAlias), RenderTargetTexture(0),
CurrentRendertargetSize(0,0), ColorFormat(ECF_R8G8B8),
CurrentTarget(ERT_FRAME_BUFFER), Params(params),
IsDepthTestEnabled(false), IsTexture2DEnabled(false), DepthMask(true),
CurrentMatrixMode(0), CurrentActiveTexture(0),
CurrentTarget(ERT_FRAME_BUFFER), Params(params), BridgeCalls(0),
OSXDevice(device), DeviceType(EIDT_OSX)
{
#ifdef _DEBUG
@ -511,9 +507,7 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
Transformation3DChanged(true), AntiAlias(params.AntiAlias),
RenderTargetTexture(0), CurrentRendertargetSize(0,0),
ColorFormat(ECF_R8G8B8), CurrentTarget(ERT_FRAME_BUFFER), Params(params),
IsDepthTestEnabled(false), IsTexture2DEnabled(false), DepthMask(true),
CurrentMatrixMode(0), CurrentActiveTexture(0),
X11Device(device), DeviceType(EIDT_X11)
BridgeCalls(0), X11Device(device), DeviceType(EIDT_X11)
{
#ifdef _DEBUG
setDebugName("COpenGLDriver");
@ -606,9 +600,7 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params,
Transformation3DChanged(true), AntiAlias(params.AntiAlias),
RenderTargetTexture(0), CurrentRendertargetSize(0,0),
ColorFormat(ECF_R8G8B8), CurrentTarget(ERT_FRAME_BUFFER), Params(params),
IsDepthTestEnabled(false), IsTexture2DEnabled(false), DepthMask(true),
CurrentMatrixMode(0), CurrentActiveTexture(0),
SDLDevice(device), DeviceType(EIDT_SDL)
BridgeCalls(0), SDLDevice(device), DeviceType(EIDT_SDL)
{
#ifdef _DEBUG
setDebugName("COpenGLDriver");
@ -631,6 +623,9 @@ COpenGLDriver::~COpenGLDriver()
if (CgContext)
cgDestroyContext(CgContext);
#endif
if (BridgeCalls)
delete BridgeCalls;
RequestedLights.clear();
@ -688,6 +683,10 @@ bool COpenGLDriver::genericDriverInit()
CurrentTexture.clear();
// load extensions
initExtensions(Params.Stencilbuffer);
if (!BridgeCalls)
BridgeCalls = new COpenGLCallBridge(this);
if (queryFeature(EVDF_ARB_GLSL))
{
char buf[32];
@ -890,11 +889,9 @@ void COpenGLDriver::clearBuffers(bool backBuffer, bool zBuffer, bool stencilBuff
if (zBuffer)
{
if (!DepthMask)
glDepthMask(GL_TRUE);
BridgeCalls->setDepthMask(true);
LastMaterial.ZWriteEnable=true;
DepthMask = true;
mask |= GL_DEPTH_BUFFER_BIT;
}
@ -962,7 +959,7 @@ void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matri
case ETS_WORLD:
{
// OpenGL only has a model matrix, view and world is not existent. so lets fake these two.
setGlMatrixMode(GL_MODELVIEW);
BridgeCalls->setMatrixMode(GL_MODELVIEW);
// first load the viewing transformation for user clip planes
glLoadMatrixf((Matrices[ETS_VIEW]).pointer());
@ -978,7 +975,7 @@ void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matri
break;
case ETS_PROJECTION:
{
setGlMatrixMode(GL_PROJECTION);
BridgeCalls->setMatrixMode(GL_PROJECTION);
glLoadMatrixf(mat.pointer());
}
break;
@ -992,9 +989,9 @@ void COpenGLDriver::setTransform(E_TRANSFORMATION_STATE state, const core::matri
const bool isRTT = Material.getTexture(i) && Material.getTexture(i)->isRenderTarget();
setGlActiveTexture(GL_TEXTURE0_ARB + i);
BridgeCalls->setActiveTexture(GL_TEXTURE0_ARB + i);
setGlMatrixMode(GL_TEXTURE);
BridgeCalls->setMatrixMode(GL_TEXTURE);
if (!isRTT && mat.isIdentity() )
glLoadIdentity();
else
@ -1797,8 +1794,8 @@ void COpenGLDriver::draw2DVertexPrimitiveList(const void* vertices, u32 vertexCo
else
setRenderStates2DMode(Material.MaterialType==EMT_TRANSPARENT_VERTEX_ALPHA, (Material.getTexture(0) != 0), Material.MaterialType==EMT_TRANSPARENT_ALPHA_CHANNEL);
if (MultiTextureExtension)
extGlClientActiveTexture(GL_TEXTURE0_ARB);
if (MultiTextureExtension)
extGlClientActiveTexture(GL_TEXTURE0_ARB);
glEnableClientState(GL_COLOR_ARRAY);
glEnableClientState(GL_VERTEX_ARRAY);
@ -2469,16 +2466,7 @@ bool COpenGLDriver::disableTextures(u32 fromStage)
for (u32 i=fromStage; i<MaxSupportedTextures; ++i)
{
result &= setActiveTexture(i, 0);
if(DriverStage.getTexture(i) != 0 || !DriverStage.getTextureFixedPipeline(i))
{
setGlActiveTexture(GL_TEXTURE0_ARB + i);
glDisable(GL_TEXTURE_2D);
DriverStage.setTexture(i, 0);
DriverStage.setTextureFixedPipeline(i, true);
}
BridgeCalls->setTexture(i, true);
}
return result;
}
@ -2581,10 +2569,10 @@ void COpenGLDriver::setRenderStates3DMode()
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
// switch back the matrices
setGlMatrixMode(GL_MODELVIEW);
BridgeCalls->setMatrixMode(GL_MODELVIEW);
glLoadMatrixf((Matrices[ETS_VIEW] * Matrices[ETS_WORLD]).pointer());
setGlMatrixMode(GL_PROJECTION);
BridgeCalls->setMatrixMode(GL_PROJECTION);
glLoadMatrixf(Matrices[ETS_PROJECTION].pointer());
ResetRenderStates = true;
@ -2876,30 +2864,13 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
if (!CurrentTexture[i])
{
if(DriverStage.getTexture(i) != 0 || !DriverStage.getTextureFixedPipeline(i))
{
setGlActiveTexture(GL_TEXTURE0_ARB + i);
glDisable(GL_TEXTURE_2D);
DriverStage.setTexture(i, 0);
DriverStage.setTextureFixedPipeline(i, true);
}
BridgeCalls->setTexture(i, fixedPipeline);
continue;
}
else
{
if(DriverStage.getTexture(i) != CurrentTexture[i] || !DriverStage.getTextureFixedPipeline(i))
{
setGlActiveTexture(GL_TEXTURE0_ARB + i);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, tmpTexture->getOpenGLTextureName());
DriverStage.setTexture(i, CurrentTexture[i]);
DriverStage.setTextureFixedPipeline(i, true);
}
BridgeCalls->setTexture(i, fixedPipeline);
setTransform ((E_TRANSFORMATION_STATE) (ETS_TEXTURE_0 + i), material.getTextureMatrix(i));
}
@ -2908,14 +2879,7 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
{
if (CurrentTexture[i])
{
if(DriverStage.getTexture(i) != CurrentTexture[i])
{
setGlActiveTexture(GL_TEXTURE0_ARB + i);
glBindTexture(GL_TEXTURE_2D, tmpTexture->getOpenGLTextureName());
DriverStage.setTexture(i, CurrentTexture[i]);
DriverStage.setTextureFixedPipeline(i, false);
}
BridgeCalls->setTexture(i, fixedPipeline);
}
else
continue;
@ -3038,90 +3002,28 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
switch (material.ZBuffer)
{
case ECFN_NEVER:
{
if(IsDepthTestEnabled)
{
glDisable(GL_DEPTH_TEST);
IsDepthTestEnabled = false;
}
}
BridgeCalls->setDepthFunc(0);
break;
case ECFN_LESSEQUAL:
{
if(!IsDepthTestEnabled)
{
glEnable(GL_DEPTH_TEST);
IsDepthTestEnabled = true;
}
glDepthFunc(GL_LEQUAL);
}
BridgeCalls->setDepthFunc(GL_LEQUAL);
break;
case ECFN_EQUAL:
{
if(!IsDepthTestEnabled)
{
glEnable(GL_DEPTH_TEST);
IsDepthTestEnabled = true;
}
glDepthFunc(GL_EQUAL);
}
BridgeCalls->setDepthFunc(GL_EQUAL);
break;
case ECFN_LESS:
{
if(!IsDepthTestEnabled)
{
glEnable(GL_DEPTH_TEST);
IsDepthTestEnabled = true;
}
glDepthFunc(GL_LESS);
}
BridgeCalls->setDepthFunc(GL_LESS);
break;
case ECFN_NOTEQUAL:
{
if(!IsDepthTestEnabled)
{
glEnable(GL_DEPTH_TEST);
IsDepthTestEnabled = true;
}
glDepthFunc(GL_NOTEQUAL);
}
BridgeCalls->setDepthFunc(GL_NOTEQUAL);
break;
case ECFN_GREATEREQUAL:
{
if(!IsDepthTestEnabled)
{
glEnable(GL_DEPTH_TEST);
IsDepthTestEnabled = true;
}
glDepthFunc(GL_GEQUAL);
}
BridgeCalls->setDepthFunc(GL_GEQUAL);
break;
case ECFN_GREATER:
{
if(!IsDepthTestEnabled)
{
glEnable(GL_DEPTH_TEST);
IsDepthTestEnabled = true;
}
glDepthFunc(GL_GREATER);
}
BridgeCalls->setDepthFunc(GL_GREATER);
break;
case ECFN_ALWAYS:
{
if(!IsDepthTestEnabled)
{
glEnable(GL_DEPTH_TEST);
IsDepthTestEnabled = true;
}
glDepthFunc(GL_ALWAYS);
}
BridgeCalls->setDepthFunc(GL_ALWAYS);
break;
}
}
@ -3130,21 +3032,9 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
// if (resetAllRenderStates || lastmaterial.ZWriteEnable != material.ZWriteEnable)
{
if (material.ZWriteEnable && (AllowZWriteOnTransparent || !material.isTransparent()))
{
if (!DepthMask)
{
glDepthMask(GL_TRUE);
DepthMask = true;
}
}
BridgeCalls->setDepthMask(true);
else
{
if (DepthMask)
{
glDepthMask(GL_FALSE);
DepthMask = false;
}
}
BridgeCalls->setDepthMask(false);
}
// back face culling
@ -3367,7 +3257,7 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
// be sure to leave in texture stage 0
if (fixedPipeline)
setGlActiveTexture(GL_TEXTURE0_ARB);
BridgeCalls->setActiveTexture(GL_TEXTURE0_ARB);
}
@ -3385,7 +3275,7 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
{
bool BindedTexture = false;
setGlActiveTexture(GL_TEXTURE0_ARB);
BridgeCalls->setActiveTexture(GL_TEXTURE0_ARB);
if (CurrentRenderMode != ERM_2D || Transformation3DChanged)
{
@ -3397,7 +3287,7 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
}
if (Transformation3DChanged)
{
setGlMatrixMode(GL_PROJECTION);
BridgeCalls->setMatrixMode(GL_PROJECTION);
const core::dimension2d<u32>& renderTargetSize = getCurrentRenderTargetSize();
core::matrix4 m(core::matrix4::EM4CONST_NOTHING);
@ -3405,12 +3295,12 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
m.setTranslation(core::vector3df(-1,1,0));
glLoadMatrixf(m.pointer());
setGlMatrixMode(GL_MODELVIEW);
BridgeCalls->setMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glTranslatef(0.375f, 0.375f, 0.0f);
// Make sure we set first texture matrix
setGlActiveTexture(GL_TEXTURE0_ARB);
BridgeCalls->setActiveTexture(GL_TEXTURE0_ARB);
Transformation3DChanged = false;
}
@ -3453,18 +3343,7 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
if (texture)
{
if(!BindedTexture && CurrentTexture[0])
{
if(DriverStage.getTexture(0) != CurrentTexture[0] || !DriverStage.getTextureFixedPipeline(0))
{
setGlActiveTexture(GL_TEXTURE0_ARB);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, static_cast<const COpenGLTexture*>(CurrentTexture[0])->getOpenGLTextureName());
DriverStage.setTexture(0, CurrentTexture[0]);
DriverStage.setTextureFixedPipeline(0, true);
}
}
BridgeCalls->setTexture(0, true);
if (!OverrideMaterial2DEnabled)
{
@ -3786,9 +3665,9 @@ void COpenGLDriver::drawStencilShadowVolume(const core::array<core::vector3df>&
glDisable(GL_LIGHTING);
glDisable(GL_FOG);
glDepthFunc(GL_LESS);
glDepthMask(GL_FALSE); // no depth buffer writing
DepthMask = false;
BridgeCalls->setDepthFunc(GL_LESS);
BridgeCalls->setDepthMask(false);
if (debugDataVisible & scene::EDS_MESH_WIRE_OVERLAY)
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
if (!(debugDataVisible & (scene::EDS_SKELETON|scene::EDS_MESH_WIRE_OVERLAY)))
@ -3918,8 +3797,7 @@ void COpenGLDriver::drawStencilShadow(bool clearStencilBuffer, video::SColor lef
glDisable(GL_LIGHTING);
glDisable(GL_FOG);
glDepthMask(GL_FALSE);
DepthMask = false;
BridgeCalls->setDepthMask(false);
glShadeModel(GL_FLAT);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@ -3932,10 +3810,10 @@ void COpenGLDriver::drawStencilShadow(bool clearStencilBuffer, video::SColor lef
glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
// draw a shadow rectangle covering the entire screen using stencil buffer
setGlMatrixMode(GL_MODELVIEW);
BridgeCalls->setMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
setGlMatrixMode(GL_PROJECTION);
BridgeCalls->setMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
@ -3959,7 +3837,7 @@ void COpenGLDriver::drawStencilShadow(bool clearStencilBuffer, video::SColor lef
// restore settings
glPopMatrix();
setGlMatrixMode(GL_MODELVIEW);
BridgeCalls->setMatrixMode(GL_MODELVIEW);
glPopMatrix();
glPopAttrib();
}
@ -4342,7 +4220,7 @@ bool COpenGLDriver::setRenderTarget(video::ITexture* texture, bool clearBackBuff
if ((RenderTargetTexture != texture) ||
(CurrentTarget==ERT_MULTI_RENDER_TEXTURES))
{
setGlActiveTexture(GL_TEXTURE0_ARB);
BridgeCalls->setActiveTexture(GL_TEXTURE0_ARB);
ResetRenderStates=true;
if (RenderTargetTexture!=0)
{
@ -4931,31 +4809,118 @@ GLenum COpenGLDriver::getZBufferBits() const
}
return bits;
}
void COpenGLDriver::setGlMatrixMode(GLenum mode)
COpenGLCallBridge* COpenGLDriver::getBridgeCalls() const
{
if (CurrentMatrixMode != mode)
{
glMatrixMode(mode);
CurrentMatrixMode = mode;
}
return BridgeCalls;
}
void COpenGLDriver::setGlActiveTexture(GLenum texture)
{
if (MultiTextureExtension && CurrentActiveTexture != texture)
{
extGlActiveTexture(texture);
CurrentActiveTexture = texture;
}
}
#ifdef _IRR_COMPILE_WITH_CG_
const CGcontext& COpenGLDriver::getCgContext()
{
return CgContext;
return CgContext;
}
#endif
COpenGLCallBridge::COpenGLCallBridge(COpenGLDriver* driver) : Driver(driver),
DepthMask(false), DepthFunc(0), DepthTest(false), MatrixMode(GL_MODELVIEW),
ActiveTexture(GL_TEXTURE0_ARB)
{
for (u32 i = 0; i < MATERIAL_MAX_TEXTURES; ++i)
{
Texture[i] = 0;
TextureFixedPipeline[i] = true;
}
glDepthMask(GL_FALSE);
glDisable(GL_DEPTH_TEST);
glMatrixMode(GL_MODELVIEW);
if(Driver->MultiTextureExtension)
Driver->extGlActiveTexture(GL_TEXTURE0_ARB);
}
void COpenGLCallBridge::setDepthMask(bool enabled)
{
if(DepthMask != enabled)
{
if (enabled)
glDepthMask(GL_TRUE);
else
glDepthMask(GL_FALSE);
DepthMask = enabled;
}
}
void COpenGLCallBridge::setDepthFunc(GLenum mode)
{
if(DepthFunc != mode)
{
if(mode == 0)
{
if(DepthTest)
{
glDisable(GL_DEPTH_TEST);
DepthTest = false;
}
}
else
{
if(!DepthTest)
{
glEnable(GL_DEPTH_TEST);
DepthTest = true;
}
glDepthFunc(mode);
}
DepthFunc = mode;
}
}
void COpenGLCallBridge::setMatrixMode(GLenum mode)
{
if (MatrixMode != mode)
{
glMatrixMode(mode);
MatrixMode = mode;
}
}
void COpenGLCallBridge::setActiveTexture(GLenum texture)
{
if (Driver->MultiTextureExtension && ActiveTexture != texture)
{
Driver->extGlActiveTexture(texture);
ActiveTexture = texture;
}
}
void COpenGLCallBridge::setTexture(u32 stage, bool fixedPipeline)
{
if (stage < MATERIAL_MAX_TEXTURES)
{
if((fixedPipeline && TextureFixedPipeline[stage] != fixedPipeline) || Texture[stage] != Driver->CurrentTexture[stage])
{
setActiveTexture(GL_TEXTURE0_ARB + stage);
if(Driver->CurrentTexture[stage])
{
if(fixedPipeline)
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, static_cast<const COpenGLTexture*>(Driver->CurrentTexture[stage])->getOpenGLTextureName());
}
else if(fixedPipeline)
glDisable(GL_TEXTURE_2D);
TextureFixedPipeline[stage] = fixedPipeline;
Texture[stage] = Driver->CurrentTexture[stage];
}
}
}
} // end namespace

112
source/Irrlicht/COpenGLDriver.h
View File

@ -33,10 +33,12 @@ namespace irr
namespace video
{
class COpenGLCallBridge;
class COpenGLTexture;
class COpenGLDriver : public CNullDriver, public IMaterialRendererServices, public COpenGLExtensionHandler
{
friend class COpenGLCallBridge;
friend class COpenGLTexture;
public:
@ -411,12 +413,9 @@ namespace video
//! Get ZBuffer bits.
GLenum getZBufferBits() const;
//! Set the gl matrix mode, if not set already
void setGlMatrixMode(GLenum mode);
//! Set active texture, if not set already
void setGlActiveTexture(GLenum texture);
//! Get bridge calls.
COpenGLCallBridge* getBridgeCalls() const;
//! Get Cg context
#ifdef _IRR_COMPILE_WITH_CG_
@ -424,8 +423,8 @@ namespace video
#endif
private:
// Bridge calls.
COpenGLCallBridge* BridgeCalls;
//! clears the zbuffer and color buffer
void clearBuffers(bool backBuffer, bool zBuffer, bool stencilBuffer, SColor color);
@ -557,56 +556,6 @@ namespace video
};
STextureStageCache CurrentTexture;
class SDriverStageCache
{
public:
SDriverStageCache()
{
for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
{
CurrentTexture[i] = 0;
CurrentTextureFixedPipeline[i] = true;
}
}
~SDriverStageCache()
{
}
const ITexture* getTexture(u32 stage) const
{
if ((u32)stage < MATERIAL_MAX_TEXTURES)
return CurrentTexture[stage];
else
return 0;
}
void setTexture(u32 stage, const ITexture* tex)
{
if (stage < MATERIAL_MAX_TEXTURES)
CurrentTexture[stage] = tex;
}
bool getTextureFixedPipeline(u32 stage) const
{
if ((u32)stage < MATERIAL_MAX_TEXTURES)
return CurrentTextureFixedPipeline[stage];
else
return true;
}
void setTextureFixedPipeline(u32 stage, bool texFixedPipeline)
{
if (stage < MATERIAL_MAX_TEXTURES)
CurrentTextureFixedPipeline[stage] = texFixedPipeline;
}
private:
const ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
bool CurrentTextureFixedPipeline[MATERIAL_MAX_TEXTURES];
};
SDriverStageCache DriverStage;
core::array<ITexture*> DepthTextures;
struct SUserClipPlane
{
@ -630,14 +579,6 @@ namespace video
SIrrlichtCreationParameters Params;
bool IsDepthTestEnabled;
bool IsTexture2DEnabled;
bool DepthMask;
GLenum CurrentMatrixMode;
GLenum CurrentActiveTexture;
//! All the lights that have been requested; a hardware limited
//! number of them will be used at once.
struct RequestedLight
@ -675,6 +616,45 @@ namespace video
E_DEVICE_TYPE DeviceType;
};
//! This bridge between Irlicht pseudo OpenGL calls
//! and true OpenGL calls.
class COpenGLCallBridge
{
public:
COpenGLCallBridge(COpenGLDriver* driver);
// Depth calls.
void setDepthMask(bool enabled);
void setDepthFunc(GLenum mode);
// Matrix calls.
void setMatrixMode(GLenum mode);
// Texture calls.
void setActiveTexture(GLenum texture);
void setTexture(u32 stage, bool fixedPipeline);
private:
COpenGLDriver* Driver;
bool DepthMask;
GLenum DepthFunc;
bool DepthTest;
GLenum MatrixMode;
GLenum ActiveTexture;
const ITexture* Texture[MATERIAL_MAX_TEXTURES];
bool TextureFixedPipeline[MATERIAL_MAX_TEXTURES];
};
} // end namespace video
} // end namespace irr

32
source/Irrlicht/COpenGLMaterialRenderer.h
View File

@ -269,7 +269,7 @@ public:
{
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
#ifdef GL_ARB_texture_env_combine
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_REPLACE);
@ -297,14 +297,14 @@ public:
{
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
#ifdef GL_ARB_texture_env_combine
glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB_ARB, GL_SRC_COLOR);
#else
glTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB_EXT, GL_SRC_COLOR);
#endif
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
}
}
};
@ -625,7 +625,7 @@ public:
{
// lightmap
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
#ifdef GL_ARB_texture_env_combine
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
@ -679,7 +679,7 @@ public:
glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.0f);
#endif
}
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
}
}
}
@ -688,14 +688,14 @@ public:
{
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
#ifdef GL_ARB_texture_env_combine
glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1.f );
#else
glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 1.f );
#endif
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
}
}
@ -724,7 +724,7 @@ public:
// detail map on second layer
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
#ifdef GL_ARB_texture_env_combine
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_ADD_SIGNED_ARB);
@ -744,9 +744,9 @@ public:
{
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
}
}
};
@ -806,7 +806,7 @@ public:
{
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
#ifdef GL_ARB_texture_env_combine
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
@ -830,14 +830,14 @@ public:
{
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
}
glDisable(GL_TEXTURE_GEN_S);
glDisable(GL_TEXTURE_GEN_T);
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
}
}
};
@ -876,7 +876,7 @@ public:
#endif
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
#ifdef GL_ARB_texture_env_combine
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);
@ -907,14 +907,14 @@ public:
{
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE1_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE1_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
}
glDisable(GL_TEXTURE_GEN_S);
glDisable(GL_TEXTURE_GEN_T);
if (Driver->queryFeature(EVDF_MULTITEXTURE))
{
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
}
glDisable(GL_BLEND);
}

6
source/Irrlicht/COpenGLTexture.cpp
View File

@ -316,7 +316,7 @@ void COpenGLTexture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
if (!newTexture)
InternalFormat=oldInternalFormat;
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, TextureName);
@ -654,7 +654,7 @@ void COpenGLTexture::bindRTT()
//! Unbind Render Target Texture
void COpenGLTexture::unbindRTT()
{
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, TextureName);
@ -708,7 +708,7 @@ COpenGLFBOTexture::COpenGLFBOTexture(const core::dimension2d<u32>& size,
// generate color texture
glGenTextures(1, &TextureName);
Driver->setGlActiveTexture(GL_TEXTURE0_ARB);
Driver->getBridgeCalls()->setActiveTexture(GL_TEXTURE0_ARB);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, TextureName);