fix warning from "normalized" cast

TRAC #11556 * Restore warning C4800. * Compare GLboolean normalized against GL_TRUE per the spec. Signed-off-by: Daniel Koch Author: Andrew Lewycky git-svn-id: https://angleproject.googlecode.com/svn/trunk@73 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent f8b58a0c
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
DisableSpecificWarnings="4800"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -126,7 +125,6 @@ ...@@ -126,7 +125,6 @@
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
DisableSpecificWarnings="4800"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
......
...@@ -4001,7 +4001,7 @@ void __stdcall glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLbo ...@@ -4001,7 +4001,7 @@ void __stdcall glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLbo
context->vertexAttribute[index].mBoundBuffer = context->arrayBuffer; context->vertexAttribute[index].mBoundBuffer = context->arrayBuffer;
context->vertexAttribute[index].mSize = size; context->vertexAttribute[index].mSize = size;
context->vertexAttribute[index].mType = type; context->vertexAttribute[index].mType = type;
context->vertexAttribute[index].mNormalized = normalized; context->vertexAttribute[index].mNormalized = (normalized == GL_TRUE);
context->vertexAttribute[index].mStride = stride; context->vertexAttribute[index].mStride = stride;
context->vertexAttribute[index].mPointer = ptr; context->vertexAttribute[index].mPointer = ptr;
} }
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4" DebugInformationFormat="4"
DisableSpecificWarnings="4800"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -126,7 +125,6 @@ ...@@ -126,7 +125,6 @@
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="false" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
DisableSpecificWarnings="4800"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
......
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