Fix compile warnings.
Change-Id: I95aff944b1d38c297b3ece475717db4c77b3274d
Reviewed-on: https://swiftshader-review.googlesource.com/4736
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/common/Image.hpp b/src/OpenGL/common/Image.hpp
index 632e360..feabae9 100644
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -58,8 +58,8 @@
// Native EGL image
Image(GLsizei width, GLsizei height, GLenum format, GLenum type, int pitchP)
- : sw::Surface(nullptr, width, height, depth, SelectInternalFormat(format, type), true, true, pitchP),
- width(width), height(height), format(format), type(type), internalFormat(SelectInternalFormat(format, type)), depth(depth),
+ : sw::Surface(nullptr, width, height, 1, SelectInternalFormat(format, type), true, true, pitchP),
+ width(width), height(height), format(format), type(type), internalFormat(SelectInternalFormat(format, type)), depth(1),
parentTexture(nullptr)
{
shared = true;
diff --git a/src/OpenGL/libGLESv2/libGLESv3.cpp b/src/OpenGL/libGLESv2/libGLESv3.cpp
index dcea67b..bb72b0f 100644
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -1145,7 +1145,7 @@
return error(GL_INVALID_OPERATION);
}
- for(int i = 0; i < n; ++i)
+ for(unsigned int i = 0; i < (unsigned)n; i++)
{
switch(bufs[i])
{
@@ -1542,7 +1542,7 @@
{
TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLuint texture = %d, GLint level = %d, GLint layer = %d)",
target, attachment, texture, level, layer);
-
+
// GLES 3.0.4 spec, p.209, section 4.4.2
// If texture is zero, any image or array of images attached to the attachment point
// named by attachment is detached. Any additional parameters(level, textarget,
@@ -2427,7 +2427,7 @@
{
TRACE("(GLint location = %d, GLsizei count = %d, const GLuint *value = %p)",
location, count, value);
-
+
if(count < 0)
{
return error(GL_INVALID_VALUE);
