- Fixed compilation errors related to issues in COGLCoreCacheHandler.h.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5166 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
d6a197b5a8
commit
6911048335
|
@ -9,8 +9,8 @@
|
|||
|
||||
#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
|
||||
|
||||
#include "EDriverTypes.h"
|
||||
#include "SMaterial.h"
|
||||
#include "ITexture.h"
|
||||
|
||||
namespace irr
|
||||
{
|
||||
|
@ -454,7 +454,6 @@ public:
|
|||
if (FrameBufferID != frameBufferID)
|
||||
{
|
||||
Driver->irrGlBindFramebuffer(GL_FRAMEBUFFER, frameBufferID);
|
||||
|
||||
FrameBufferID = frameBufferID;
|
||||
}
|
||||
}
|
||||
|
@ -465,7 +464,7 @@ public:
|
|||
{
|
||||
if (ProgramID != programID)
|
||||
{
|
||||
glUseProgram(programID);
|
||||
Driver->irrGlUseProgram(programID);
|
||||
ProgramID = programID;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,8 +11,6 @@
|
|||
|
||||
#include "IRenderTarget.h"
|
||||
|
||||
#include "dimension2d.h"
|
||||
|
||||
namespace irr
|
||||
{
|
||||
namespace video
|
||||
|
|
|
@ -18,7 +18,7 @@ namespace video
|
|||
|
||||
COpenGLCacheHandler::COpenGLCacheHandler(COpenGLDriver* driver) :
|
||||
COGLCoreCacheHandler<COpenGLDriver, COpenGLTexture>(driver), AlphaMode(GL_ALWAYS), AlphaRef(0.f), AlphaTest(false),
|
||||
DepthTest(false), MatrixMode(GL_MODELVIEW), ClientActiveTexture(GL_TEXTURE0_ARB), ClientStateVertex(false),
|
||||
DepthTest(false), MatrixMode(GL_MODELVIEW), ClientActiveTexture(GL_TEXTURE0), ClientStateVertex(false),
|
||||
ClientStateNormal(false), ClientStateColor(false), ClientStateTexCoord0(false)
|
||||
{
|
||||
// Initial OpenGL values from specification.
|
||||
|
|
|
@ -1218,7 +1218,7 @@ class COpenGLExtensionHandler
|
|||
// that handleARB and uint are the same type
|
||||
void extGlLinkProgram(GLuint program);
|
||||
void extGlUseProgramObject(GLhandleARB prog);
|
||||
void extGlUseProgram(GLuint prog);
|
||||
void irrGlUseProgram(GLuint prog);
|
||||
void extGlDeleteObject(GLhandleARB object);
|
||||
void extGlDeleteProgram(GLuint object);
|
||||
void extGlDeleteShader(GLuint shader);
|
||||
|
@ -1733,7 +1733,7 @@ inline void COpenGLExtensionHandler::extGlUseProgramObject(GLhandleARB prog)
|
|||
#endif
|
||||
}
|
||||
|
||||
inline void COpenGLExtensionHandler::extGlUseProgram(GLuint prog)
|
||||
inline void COpenGLExtensionHandler::irrGlUseProgram(GLuint prog)
|
||||
{
|
||||
#ifdef _IRR_OPENGL_USE_EXTPOINTER_
|
||||
if (pGlUseProgram)
|
||||
|
|
|
@ -238,7 +238,7 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
|
|||
if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
|
||||
{
|
||||
if (Program2)
|
||||
Driver->extGlUseProgram(Program2);
|
||||
Driver->irrGlUseProgram(Program2);
|
||||
else if (Program)
|
||||
Driver->extGlUseProgramObject(Program);
|
||||
}
|
||||
|
@ -290,7 +290,7 @@ void COpenGLSLMaterialRenderer::OnUnsetMaterial()
|
|||
if (Program)
|
||||
Driver->extGlUseProgramObject(0);
|
||||
if (Program2)
|
||||
Driver->extGlUseProgram(0);
|
||||
Driver->irrGlUseProgram(0);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue