Refactor some entry point stuff.
BUG=angleproject:747
Change-Id: I80634b5e6de8bae1433c49a56a92d3b19c24e11d
Reviewed-on: https://chromium-review.googlesource.com/395568
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index 29be350..961ff3c 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -377,39 +377,27 @@
return mState.mLabel;
}
-bool Program::attachShader(Shader *shader)
+void Program::attachShader(Shader *shader)
{
switch (shader->getType())
{
case GL_VERTEX_SHADER:
{
- if (mState.mAttachedVertexShader)
- {
- return false;
- }
-
+ ASSERT(!mState.mAttachedVertexShader);
mState.mAttachedVertexShader = shader;
mState.mAttachedVertexShader->addRef();
break;
}
case GL_FRAGMENT_SHADER:
{
- if (mState.mAttachedFragmentShader)
- {
- return false;
- }
-
+ ASSERT(!mState.mAttachedFragmentShader);
mState.mAttachedFragmentShader = shader;
mState.mAttachedFragmentShader->addRef();
break;
}
case GL_COMPUTE_SHADER:
{
- if (mState.mAttachedComputeShader)
- {
- return false;
- }
-
+ ASSERT(!mState.mAttachedComputeShader);
mState.mAttachedComputeShader = shader;
mState.mAttachedComputeShader->addRef();
break;
@@ -417,8 +405,6 @@
default:
UNREACHABLE();
}
-
- return true;
}
bool Program::detachShader(Shader *shader)