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

- Minor improvements is OpenGL ES driver. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4243 dfc29bdd-3216-0410-991c-e03cc46cb475
master
nadro 2012-07-13 18:24:34 +00:00
parent dbc2c053ed
commit 6fc41cf8c0
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/IMaterialRenderer.h
View File

@ -68,8 +68,10 @@ public:
example if he doesn't support the specified vertex type. This is
actually done in D3D8 and D3D9 when using a normal mapped material with
a vertex type other than EVT_TANGENTS. */
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true; }
virtual bool PostRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true;};
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true; }
//! Called every time after an each bunch of geometry was drawed.
virtual bool PostRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true; }
//! Called by the IVideoDriver to unset this material.
/** Called during the IVideoDriver::setMaterial() call before the new

14
source/Irrlicht/COGLESTexture.cpp
View File

@ -171,13 +171,13 @@ void COGLES1Texture::uploadTexture(bool newTexture, void* mipmapData, u32 level)
return;
}
#ifndef GL_BGRA
// whoa, pretty badly implemented extension...
if (Driver->FeatureAvailable[COGLES1ExtensionHandler::IRR_IMG_texture_format_BGRA8888] || Driver->FeatureAvailable[COGLES1ExtensionHandler::IRR_EXT_texture_format_BGRA8888])
GL_BGRA=0x80E1;
else
GL_BGRA=GL_RGBA;
#endif
#ifndef GL_BGRA
// whoa, pretty badly implemented extension...
if (Driver->FeatureAvailable[COGLES1ExtensionHandler::IRR_IMG_texture_format_BGRA8888] || Driver->FeatureAvailable[COGLES1ExtensionHandler::IRR_EXT_texture_format_BGRA8888])
GL_BGRA=0x80E1;
else
GL_BGRA=GL_RGBA;
#endif
GLenum oldInternalFormat = InternalFormat;
void(*convert)(const void*, s32, void*)=0;