commit 46c70930c7aafe5e265e6943c84b5c2f8593850f
author Greg Hartman <ghartman@google.com> Fri Apr 17 17:29:14 2015 -0700
committer Nicolas Capens <capn@google.com> Fri Apr 24 21:05:28 2015 +0000
tree 04e2ab6482c5bfa03fe43d4c63722c7bffd407cf
parent e56b300aac5198d6814bedd3abc354ccf838e417

Fix several compilation warnings.

Change-Id: I6525eab19ebe5a90e8f0fbfbef3d3e2ba2170da9
Reviewed-on: https://swiftshader-review.googlesource.com/2944
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/libEGL/Image.hpp

diff --git a/src/OpenGL/libEGL/Image.hpp b/src/OpenGL/libEGL/Image.hpp
index 38b479f..0b48442 100644
--- a/src/OpenGL/libEGL/Image.hpp
+++ b/src/OpenGL/libEGL/Image.hpp
@@ -28,8 +28,8 @@
 {

 public:

 	Image(sw::Resource *resource, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, sw::Format internalFormat)

-		: width(width), height(height), format(format), type(type), internalFormat(internalFormat), depth(depth)

-		, sw::Surface(resource, width, height, depth, internalFormat, true, true)

+		: sw::Surface(resource, width, height, depth, internalFormat, true, true),

+		  width(width), height(height), format(format), type(type), internalFormat(internalFormat), depth(depth)

 	{

 		shared = false;

 

@@ -40,8 +40,8 @@
 	}

 

 	Image(sw::Resource *resource, int width, int height, int depth, sw::Format internalFormat, bool lockable, bool renderTarget)

-		: width(width), height(height), format(0 /*GL_NONE*/), type(0 /*GL_NONE*/), internalFormat(internalFormat), depth(depth)

-		, sw::Surface(resource, width, height, depth, internalFormat, lockable, renderTarget)

+		: sw::Surface(resource, width, height, depth, internalFormat, lockable, renderTarget),

+		  width(width), height(height), format(0 /*GL_NONE*/), type(0 /*GL_NONE*/), internalFormat(internalFormat), depth(depth)

 	{

 		shared = false;

 

src/OpenGL/libEGL/libEGL.cpp

diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index 0dd14b7..1b8229b 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -490,7 +490,7 @@
 	case EGL_SWAP_BEHAVIOR:

 		if(value == EGL_BUFFER_PRESERVED)

 		{

-			if(!(eglSurface->getSurfaceType() && EGL_SWAP_BEHAVIOR_PRESERVED_BIT))

+			if(!(eglSurface->getSurfaceType() & EGL_SWAP_BEHAVIOR_PRESERVED_BIT))

 			{

 				return error(EGL_BAD_MATCH, EGL_FALSE);

 			}

src/OpenGL/libGLES_CM/libGLES_CM.hpp

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.hpp b/src/OpenGL/libGLES_CM/libGLES_CM.hpp
index 300140d..77e8eec 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.hpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.hpp
@@ -92,4 +92,4 @@
 	LibGLES_CMexports *libGLES_CMexports;
 };
 
-#endif libGLES_CM_hpp
+#endif   // libGLES_CM_hpp

src/Renderer/TextureStage.hpp

diff --git a/src/Renderer/TextureStage.hpp b/src/Renderer/TextureStage.hpp
index a195263..7186b77 100644
--- a/src/Renderer/TextureStage.hpp
+++ b/src/Renderer/TextureStage.hpp
@@ -193,4 +193,4 @@
 	};

 }

 

-#endif sw_TextureStage_hpp

+#endif  // sw_TextureStage_hpp