--- a/hostsupport/hostopengles11/src/GLESContext.cpp Mon Oct 18 18:24:13 2010 +0100
+++ b/hostsupport/hostopengles11/src/GLESContext.cpp Tue Oct 26 14:14:43 2010 +0100
@@ -32,9 +32,9 @@
#include "GLESTexture.h"
GLESContext::GLESContext(void* nativeContext) :
+ m_initialized(false),
m_nativeContext(nativeContext),
- m_texCoordArray(NULL),
- m_initialized(false)
+ m_texCoordArray(NULL)
{
}
@@ -84,7 +84,7 @@
// The maximum number of texture units supported by the wrapper depends on the number
// of bits in the array state variable (four bits are used by vertex, normal, color
// and point size arrays).
- m_maxTextureUnits = GLES_MIN(maxTextureUnits, sizeof(m_enabledArrays) * 8 - 4);
+ m_maxTextureUnits = GLES_MIN(maxTextureUnits, (int)(sizeof(m_enabledArrays) * 8 - 4));
m_maxClipPlanes = maxClipPlanes;
m_maxLights = maxLights;
@@ -338,4 +338,4 @@
{
void* context = EGLtoGLESInterface::GetEGLInterface()->GetGLESContext();
return context;
-}
\ No newline at end of file
+}