commit 7162096ee6cfcb0fa797eb3503154f39ec53ef09
author Brandon Jones <bajones@chromium.org> Wed Aug 20 14:04:59 2014 -0700
committer Brandon Jones <bajones@chromium.org> Thu Aug 28 16:52:31 2014 +0000
tree 6cd0e40cca2372b14a95c398d59cd8a754f83b19
parent e3929050250c2aba21ffd2a98023a2209f5a0a97

More shader refactor cleanup

Removed VertexShader and FragmentShader in favor of using a single Shader object
Used VertexShaderD3D and FragmentShaderD3D directly when appropriate.

BUG=angle:731
Change-Id: Ib1ffdf85ee0bfa7c88bb9ddb1029ccbd63a9dbe1
Reviewed-on: https://chromium-review.googlesource.com/213840
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>

src/libGLESv2/ResourceManager.cpp

diff --git a/src/libGLESv2/ResourceManager.cpp b/src/libGLESv2/ResourceManager.cpp
index 55c743c..701f7cb 100644
--- a/src/libGLESv2/ResourceManager.cpp
+++ b/src/libGLESv2/ResourceManager.cpp
@@ -93,13 +93,9 @@
 {
     GLuint handle = mProgramShaderHandleAllocator.allocate();
 
-    if (type == GL_VERTEX_SHADER)
+    if (type == GL_VERTEX_SHADER || type == GL_FRAGMENT_SHADER)
     {
-        mShaderMap[handle] = new VertexShader(this, mRenderer->createShader(type), handle);
-    }
-    else if (type == GL_FRAGMENT_SHADER)
-    {
-        mShaderMap[handle] = new FragmentShader(this, mRenderer->createShader(type), handle);
+        mShaderMap[handle] = new Shader(this, mRenderer->createShader(type), type, handle);
     }
     else UNREACHABLE();