Fixed some warnings on GCC

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1392
+#define BUILD_REVISION 1393
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/UnfoldShortCircuit.cpp

@@ -95,9 +95,9 @@ bool UnfoldShortCircuit::visitBinary(Visit visit, TIntermBinary *node)
             mTemporaryIndex = i + 1;
         }
         return false;
+      default:
+        return true;
     }
-
-    return true;
 }
 
 bool UnfoldShortCircuit::visitSelection(Visit visit, TIntermSelection *node)

src/libEGL/Display.cpp

@@ -257,7 +257,7 @@ bool Display::initialize()
 
         ConfigSet configSet;
 
-        for (int formatIndex = 0; formatIndex < sizeof(renderTargetFormats) / sizeof(D3DFORMAT); formatIndex++)
+        for (unsigned int formatIndex = 0; formatIndex < sizeof(renderTargetFormats) / sizeof(D3DFORMAT); formatIndex++)
         {
             D3DFORMAT renderTargetFormat = renderTargetFormats[formatIndex];
 
@@ -265,7 +265,7 @@ bool Display::initialize()
 
             if (SUCCEEDED(result))
             {
-                for (int depthStencilIndex = 0; depthStencilIndex < sizeof(depthStencilFormats) / sizeof(D3DFORMAT); depthStencilIndex++)
+                for (unsigned int depthStencilIndex = 0; depthStencilIndex < sizeof(depthStencilFormats) / sizeof(D3DFORMAT); depthStencilIndex++)
                 {
                     D3DFORMAT depthStencilFormat = depthStencilFormats[depthStencilIndex];
                     HRESULT result = D3D_OK;

src/libGLESv2/Blit.cpp

@@ -43,7 +43,7 @@ const size_t g_shaderSize[] =
 namespace gl
 {
 Blit::Blit(Context *context)
-  : mContext(context), mQuadVertexBuffer(NULL), mQuadVertexDeclaration(NULL), mSavedRenderTarget(NULL), mSavedDepthStencil(NULL), mSavedStateBlock(NULL)
+  : mContext(context), mQuadVertexBuffer(NULL), mQuadVertexDeclaration(NULL), mSavedStateBlock(NULL), mSavedRenderTarget(NULL), mSavedDepthStencil(NULL)
 {
     initGeometry();
     memset(mCompiledShaders, 0, sizeof(mCompiledShaders));

src/libGLESv2/Context.cpp

@@ -289,7 +289,7 @@ void Context::makeCurrent(egl::Display *display, egl::Surface *surface)
         };
 
         int max = 0;
-        for (int i = 0; i < sizeof(renderBufferFormats) / sizeof(D3DFORMAT); ++i)
+        for (unsigned int i = 0; i < sizeof(renderBufferFormats) / sizeof(D3DFORMAT); ++i)
         {
             bool *multisampleArray = new bool[D3DMULTISAMPLE_16_SAMPLES + 1];
             mDisplay->getMultiSampleSupport(renderBufferFormats[i], multisampleArray);
@@ -1683,7 +1683,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
         break;
       case GL_TEXTURE_BINDING_2D:
         {
-            if (mState.activeSampler < 0 || mState.activeSampler > getMaximumCombinedTextureImageUnits() - 1)
+            if (mState.activeSampler > getMaximumCombinedTextureImageUnits() - 1)
             {
                 error(GL_INVALID_OPERATION);
                 return false;
@@ -1694,7 +1694,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
         break;
       case GL_TEXTURE_BINDING_CUBE_MAP:
         {
-            if (mState.activeSampler < 0 || mState.activeSampler > getMaximumCombinedTextureImageUnits() - 1)
+            if (mState.activeSampler > getMaximumCombinedTextureImageUnits() - 1)
             {
                 error(GL_INVALID_OPERATION);
                 return false;
@@ -3185,7 +3185,7 @@ void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid
     applyShaders();
     applyTextures();
 
-    if (!getCurrentProgramBinary()->validateSamplers(false))
+    if (!getCurrentProgramBinary()->validateSamplers(NULL))
     {
         return error(GL_INVALID_OPERATION);
     }

src/libGLESv2/ProgramBinary.cpp

@@ -1044,7 +1044,7 @@ ID3D10Blob *ProgramBinary::compileToBinary(InfoLog &infoLog, const char *hlsl, c
         return NULL;
     }
 
-    DWORD result = NOERROR;
+    HRESULT result = S_OK;
     UINT flags = 0;
     std::string sourceText;
     if (perfActive())

src/libGLESv2/Shader.cpp

@@ -315,7 +315,7 @@ void Shader::uncompile()
 void Shader::compileToHLSL(void *compiler)
 {
     // ensure we don't pass a NULL source to the compiler
-    char *source = "\0";
+    const char *source = "\0";
     if (mSource)
     {
         source = mSource;
@@ -504,7 +504,7 @@ void VertexShader::uncompile()
 
     // set by ParseAttributes
     mAttributes.clear();
-};
+}
 
 void VertexShader::compile()
 {

src/libGLESv2/Texture.cpp

@@ -230,7 +230,7 @@ void Image::createSurface()
         GLsizei requestHeight = mHeight;
         MakeValidSize(true, IsCompressed(mInternalFormat), &requestWidth, &requestHeight, &levelToFetch);
 
-        HRESULT result = getDevice()->CreateTexture(requestWidth, requestHeight, levelToFetch + 1, NULL, d3dFormat,
+        HRESULT result = getDevice()->CreateTexture(requestWidth, requestHeight, levelToFetch + 1, 0, d3dFormat,
                                                     poolToUse, &newTexture, NULL);
 
         if (FAILED(result))
@@ -1265,10 +1265,10 @@ void GenerateMip(IDirect3DSurface9 *destSurface, IDirect3DSurface9 *sourceSurfac
 }
 
 TextureStorage::TextureStorage(DWORD usage)
-    : mD3DUsage(usage),
+    : mLodOffset(0),
+      mD3DUsage(usage),
       mD3DPool(getDisplay()->getTexturePool(usage)),
-      mTextureSerial(issueTextureSerial()),
-      mLodOffset(0)
+      mTextureSerial(issueTextureSerial())
 {
 }
 

src/libGLESv2/utilities.h

@@ -116,6 +116,6 @@ inline bool isDeviceLostError(HRESULT errorCode)
       default:
         return false;
     }
-};
+}
 
 #endif  // LIBGLESV2_UTILITIES_H