Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1275 Create an OpenGL ES driver

Browse source
This commit is contained in:
kervala 2012-05-12 20:56:37 +02:00
parent 3a40ef6d12
commit bfa731e39b
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -1313,7 +1313,7 @@ void CDriverGL::copyFrameBufferToTexture(ITexture *tex,
// setup texture mode, after activeTextureARB() // setup texture mode, after activeTextureARB()
CDriverGLStates::TTextureMode textureMode= CDriverGLStates::Texture2D; CDriverGLStates::TTextureMode textureMode= CDriverGLStates::Texture2D;
#ifdef GL_TEXTURE_RECTANGLE_NV #ifndef USE_OPENGLES
if(gltext->TextureMode == GL_TEXTURE_RECTANGLE_NV) if(gltext->TextureMode == GL_TEXTURE_RECTANGLE_NV)
textureMode = CDriverGLStates::TextureRect; textureMode = CDriverGLStates::TextureRect;
#endif #endif

2
code/nel/src/3d/driver/opengl/driver_opengl.h
View file

@ -765,6 +765,7 @@ private:
// Off-screen rendering in Dib section // Off-screen rendering in Dib section
HPBUFFERARB _PBuffer; HPBUFFERARB _PBuffer;
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
NSOpenGLContext* _ctx;
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
GLXContext _ctx; GLXContext _ctx;
#endif #endif
@ -787,7 +788,6 @@ private:
friend NSApplicationTerminateReply applicationShouldTerminate(CDriverGL*); friend NSApplicationTerminateReply applicationShouldTerminate(CDriverGL*);
NLMISC::CCocoaEventEmitter _EventEmitter; NLMISC::CCocoaEventEmitter _EventEmitter;
NSOpenGLContext* _ctx;
CocoaOpenGLView* _glView; CocoaOpenGLView* _glView;
NSAutoreleasePool* _autoreleasePool; NSAutoreleasePool* _autoreleasePool;
uint16 _backBufferHeight; uint16 _backBufferHeight;

4
code/nel/src/3d/driver/opengl/driver_opengl_extension.h
View file

@ -152,11 +152,7 @@ public:
EXTTextureFilterAnisotropic = false; EXTTextureFilterAnisotropic = false;
EXTTextureFilterAnisotropicMaximum = 1.f; EXTTextureFilterAnisotropicMaximum = 1.f;
ARBTextureRectangle = false; ARBTextureRectangle = false;
#ifdef USE_OPENGLES
ARBTextureNonPowerOfTwo = true;
#else
ARBTextureNonPowerOfTwo = false; ARBTextureNonPowerOfTwo = false;
#endif
ARBMultisample = false; ARBMultisample = false;
NVOcclusionQuery = false; NVOcclusionQuery = false;
FrameBufferObject = false; FrameBufferObject = false;

2
code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
View file

@ -1335,7 +1335,7 @@ bool CDriverGL::uploadTexture (ITexture& tex, CRect& rect, uint8 nNumMipMap)
_DriverGLStates.activeTextureARB (0); _DriverGLStates.activeTextureARB (0);
CDriverGLStates::TTextureMode textureMode= CDriverGLStates::Texture2D; CDriverGLStates::TTextureMode textureMode= CDriverGLStates::Texture2D;
#ifdef GL_TEXTURE_RECTANGLE_NV #ifndef USE_OPENGLES
if(gltext->TextureMode == GL_TEXTURE_RECTANGLE_NV) if(gltext->TextureMode == GL_TEXTURE_RECTANGLE_NV)
textureMode = CDriverGLStates::TextureRect; textureMode = CDriverGLStates::TextureRect;
#endif #endif