From 125ab13253800b6ea5da37214a275f6d9156b7d8 Mon Sep 17 00:00:00 2001 From: hybrid Date: Thu, 26 Feb 2009 14:14:52 +0000 Subject: [PATCH] Fix the extension handler code and add it to Makefile. git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2232 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/COGLESExtensionHandler.h | 20 ++++++++++---------- source/Irrlicht/Makefile | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/Irrlicht/COGLESExtensionHandler.h b/source/Irrlicht/COGLESExtensionHandler.h index e3760fed..2b9f2dca 100644 --- a/source/Irrlicht/COGLESExtensionHandler.h +++ b/source/Irrlicht/COGLESExtensionHandler.h @@ -115,7 +115,7 @@ namespace video bool withStencil); public: - void COGLES1ExtensionHandler::extGlBindFramebuffer(GLenum target, GLuint framebuffer) + void extGlBindFramebuffer(GLenum target, GLuint framebuffer) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlBindFramebufferOES) @@ -127,7 +127,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlDeleteFramebuffers(GLsizei n, const GLuint *framebuffers) + void extGlDeleteFramebuffers(GLsizei n, const GLuint *framebuffers) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlDeleteFramebuffersOES) @@ -139,7 +139,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlGenFramebuffers(GLsizei n, GLuint *framebuffers) + void extGlGenFramebuffers(GLsizei n, GLuint *framebuffers) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlGenFramebuffersOES) @@ -151,7 +151,7 @@ namespace video #endif } - GLenum COGLES1ExtensionHandler::extGlCheckFramebufferStatus(GLenum target) + GLenum extGlCheckFramebufferStatus(GLenum target) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlCheckFramebufferStatusOES) @@ -166,7 +166,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) + void extGlFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlFramebufferTexture2DOES) @@ -178,7 +178,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlBindRenderbuffer(GLenum target, GLuint renderbuffer) + void extGlBindRenderbuffer(GLenum target, GLuint renderbuffer) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlBindRenderbufferOES) @@ -190,7 +190,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) + void extGlDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlDeleteRenderbuffersOES) @@ -202,7 +202,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlGenRenderbuffers(GLsizei n, GLuint *renderbuffers) + void extGlGenRenderbuffers(GLsizei n, GLuint *renderbuffers) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlGenRenderbuffersOES) @@ -214,7 +214,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) + void extGlRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlRenderbufferStorageOES) @@ -226,7 +226,7 @@ namespace video #endif } - void COGLES1ExtensionHandler::extGlFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) + void extGlFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) { #ifdef _IRR_OGLES1_USE_EXTPOINTER_ if (pGlFramebufferRenderbufferOES) diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile index 88e89811..3d603b5f 100644 --- a/source/Irrlicht/Makefile +++ b/source/Irrlicht/Makefile @@ -28,7 +28,7 @@ IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \ IRROBJ = CBillboardSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctTreeSceneNode.o COctTreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CVolumeLightSceneNode.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o CParticleScaleAffector.o IRRANIMOBJ = CSceneNodeAnimatorCameraFPS.o CSceneNodeAnimatorCameraMaya.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o -IRRDRVROBJ = CNullDriver.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o COGLESDriver.o COGLESTexture.o +IRRDRVROBJ = CNullDriver.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o COGLESDriver.o COGLESTexture.o COGLESExtensionHandler.o IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o \ CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)