Fix compilation warnings.

Issue=95 TRAC #16568 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@645 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 2ff573c6
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 644 #define BUILD_REVISION 645
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -729,7 +729,7 @@ void Context::setDepthMask(bool mask) ...@@ -729,7 +729,7 @@ void Context::setDepthMask(bool mask)
} }
} }
void Context::setActiveSampler(int active) void Context::setActiveSampler(unsigned int active)
{ {
mState.activeSampler = active; mState.activeSampler = active;
} }
...@@ -2943,12 +2943,12 @@ int Context::getMaximumVaryingVectors() const ...@@ -2943,12 +2943,12 @@ int Context::getMaximumVaryingVectors() const
return mSupportsShaderModel3 ? MAX_VARYING_VECTORS_SM3 : MAX_VARYING_VECTORS_SM2; return mSupportsShaderModel3 ? MAX_VARYING_VECTORS_SM3 : MAX_VARYING_VECTORS_SM2;
} }
int Context::getMaximumVertexTextureImageUnits() const unsigned int Context::getMaximumVertexTextureImageUnits() const
{ {
return mSupportsVertexTexture ? MAX_VERTEX_TEXTURE_IMAGE_UNITS_VTF : 0; return mSupportsVertexTexture ? MAX_VERTEX_TEXTURE_IMAGE_UNITS_VTF : 0;
} }
int Context::getMaximumCombinedTextureImageUnits() const unsigned int Context::getMaximumCombinedTextureImageUnits() const
{ {
return MAX_TEXTURE_IMAGE_UNITS + getMaximumVertexTextureImageUnits(); return MAX_TEXTURE_IMAGE_UNITS + getMaximumVertexTextureImageUnits();
} }
......
...@@ -206,7 +206,7 @@ struct State ...@@ -206,7 +206,7 @@ struct State
bool colorMaskAlpha; bool colorMaskAlpha;
bool depthMask; bool depthMask;
int activeSampler; // Active texture unit selector - GL_TEXTURE0 unsigned int activeSampler; // Active texture unit selector - GL_TEXTURE0
BindingPointer<Buffer> arrayBuffer; BindingPointer<Buffer> arrayBuffer;
BindingPointer<Buffer> elementArrayBuffer; BindingPointer<Buffer> elementArrayBuffer;
GLuint readFramebuffer; GLuint readFramebuffer;
...@@ -323,7 +323,7 @@ class Context ...@@ -323,7 +323,7 @@ class Context
void setColorMask(bool red, bool green, bool blue, bool alpha); void setColorMask(bool red, bool green, bool blue, bool alpha);
void setDepthMask(bool mask); void setDepthMask(bool mask);
void setActiveSampler(int active); void setActiveSampler(unsigned int active);
GLuint getReadFramebufferHandle() const; GLuint getReadFramebufferHandle() const;
GLuint getDrawFramebufferHandle() const; GLuint getDrawFramebufferHandle() const;
...@@ -426,8 +426,8 @@ class Context ...@@ -426,8 +426,8 @@ class Context
bool supportsShaderModel3() const; bool supportsShaderModel3() const;
int getMaximumVaryingVectors() const; int getMaximumVaryingVectors() const;
int getMaximumVertexTextureImageUnits() const; unsigned int getMaximumVertexTextureImageUnits() const;
int getMaximumCombinedTextureImageUnits() const; unsigned int getMaximumCombinedTextureImageUnits() const;
int getMaximumFragmentUniformVectors() const; int getMaximumFragmentUniformVectors() const;
int getMaximumRenderbufferDimension() const; int getMaximumRenderbufferDimension() const;
int getMaximumTextureDimension() const; int getMaximumTextureDimension() const;
......
...@@ -195,7 +195,7 @@ int Program::getSemanticIndex(int attributeIndex) ...@@ -195,7 +195,7 @@ int Program::getSemanticIndex(int attributeIndex)
// index (0-15 for the pixel shader and 0-3 for the vertex shader). // index (0-15 for the pixel shader and 0-3 for the vertex shader).
GLint Program::getSamplerMapping(SamplerType type, unsigned int samplerIndex) GLint Program::getSamplerMapping(SamplerType type, unsigned int samplerIndex)
{ {
GLint logicalTextureUnit = -1; GLuint logicalTextureUnit = -1;
switch (type) switch (type)
{ {
...@@ -2863,7 +2863,7 @@ bool Program::validateSamplers(bool logErrors) ...@@ -2863,7 +2863,7 @@ bool Program::validateSamplers(bool logErrors)
// texture image unit, and this is the current program, then ValidateProgram will fail, and // texture image unit, and this is the current program, then ValidateProgram will fail, and
// DrawArrays and DrawElements will issue the INVALID_OPERATION error. // DrawArrays and DrawElements will issue the INVALID_OPERATION error.
const int maxCombinedTextureImageUnits = getContext()->getMaximumCombinedTextureImageUnits(); const unsigned int maxCombinedTextureImageUnits = getContext()->getMaximumCombinedTextureImageUnits();
TextureType textureUnitType[MAX_COMBINED_TEXTURE_IMAGE_UNITS_VTF]; TextureType textureUnitType[MAX_COMBINED_TEXTURE_IMAGE_UNITS_VTF];
for (unsigned int i = 0; i < MAX_COMBINED_TEXTURE_IMAGE_UNITS_VTF; ++i) for (unsigned int i = 0; i < MAX_COMBINED_TEXTURE_IMAGE_UNITS_VTF; ++i)
...@@ -2875,9 +2875,9 @@ bool Program::validateSamplers(bool logErrors) ...@@ -2875,9 +2875,9 @@ bool Program::validateSamplers(bool logErrors)
{ {
if (mSamplersPS[i].active) if (mSamplersPS[i].active)
{ {
int unit = mSamplersPS[i].logicalTextureUnit; unsigned int unit = mSamplersPS[i].logicalTextureUnit;
if (unit < 0 || unit >= maxCombinedTextureImageUnits) if (unit >= maxCombinedTextureImageUnits)
{ {
if (logErrors) if (logErrors)
{ {
...@@ -2910,9 +2910,9 @@ bool Program::validateSamplers(bool logErrors) ...@@ -2910,9 +2910,9 @@ bool Program::validateSamplers(bool logErrors)
{ {
if (mSamplersVS[i].active) if (mSamplersVS[i].active)
{ {
int unit = mSamplersVS[i].logicalTextureUnit; unsigned int unit = mSamplersVS[i].logicalTextureUnit;
if (unit < 0 || unit >= maxCombinedTextureImageUnits) if (unit >= maxCombinedTextureImageUnits)
{ {
if (logErrors) if (logErrors)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment