Use unsigned enum base types to use them as state bitfields.
BUG=17878699
Change-Id: Ib112ddf399ebd22676a775cdb6e6927e8f8ce25f
Reviewed-on: https://swiftshader-review.googlesource.com/1202
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Renderer/VertexProcessor.cpp b/src/Renderer/VertexProcessor.cpp
index ce8feda..dec0e9c 100644
--- a/src/Renderer/VertexProcessor.cpp
+++ b/src/Renderer/VertexProcessor.cpp
@@ -292,7 +292,7 @@
context->fogEnable = fogEnable;
}
- void VertexProcessor::setVertexFogMode(Context::FogMode fogMode)
+ void VertexProcessor::setVertexFogMode(FogMode fogMode)
{
context->vertexFogMode = fogMode;
}
@@ -302,22 +302,22 @@
context->setColorVertexEnable(colorVertexEnable);
}
- void VertexProcessor::setDiffuseMaterialSource(Context::MaterialSource diffuseMaterialSource)
+ void VertexProcessor::setDiffuseMaterialSource(MaterialSource diffuseMaterialSource)
{
context->setDiffuseMaterialSource(diffuseMaterialSource);
}
- void VertexProcessor::setSpecularMaterialSource(Context::MaterialSource specularMaterialSource)
+ void VertexProcessor::setSpecularMaterialSource(MaterialSource specularMaterialSource)
{
context->setSpecularMaterialSource(specularMaterialSource);
}
- void VertexProcessor::setAmbientMaterialSource(Context::MaterialSource ambientMaterialSource)
+ void VertexProcessor::setAmbientMaterialSource(MaterialSource ambientMaterialSource)
{
context->setAmbientMaterialSource(ambientMaterialSource);
}
- void VertexProcessor::setEmissiveMaterialSource(Context::MaterialSource emissiveMaterialSource)
+ void VertexProcessor::setEmissiveMaterialSource(MaterialSource emissiveMaterialSource)
{
context->setEmissiveMaterialSource(emissiveMaterialSource);
}
@@ -414,7 +414,7 @@
}
}
- void VertexProcessor::setTexGen(unsigned int stage, Context::TexGen texGen)
+ void VertexProcessor::setTexGen(unsigned int stage, TexGen texGen)
{
if(stage < 8)
{
