commit 7dd2e10da0ca97d0d558ce7dc682a73f7bdd1aa0
author Geoff Lang <geofflang@chromium.org> Mon Nov 10 15:19:26 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Wed Dec 03 15:03:09 2014 +0000
tree b00332fb3b3614b775b66263292290f230dbbebf
parent 213294141273e016a67176d2e98162381a9cd26c

Merge the ProgramBinary class into Program.

BUG=angle:731

Change-Id: I2ee97155841dc62f04bb71c1f2035d210fd3883c
Reviewed-on: https://chromium-review.googlesource.com/232694
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/d3d/VertexDataManager.cpp

diff --git a/src/libANGLE/renderer/d3d/VertexDataManager.cpp b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
index 64e58c3..37a3633 100644
--- a/src/libANGLE/renderer/d3d/VertexDataManager.cpp
+++ b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
@@ -12,7 +12,7 @@
 #include "libANGLE/renderer/d3d/VertexBuffer.h"
 #include "libANGLE/renderer/Renderer.h"
 #include "libANGLE/Buffer.h"
-#include "libANGLE/ProgramBinary.h"
+#include "libANGLE/Program.h"
 #include "libANGLE/VertexAttribute.h"
 #include "libANGLE/State.h"
 
@@ -94,7 +94,7 @@
     // Invalidate static buffers that don't contain matching attributes
     for (int attributeIndex = 0; attributeIndex < gl::MAX_VERTEX_ATTRIBS; attributeIndex++)
     {
-        translated[attributeIndex].active = (state.getCurrentProgramBinary()->getSemanticIndex(attributeIndex) != -1);
+        translated[attributeIndex].active = (state.getProgram()->getSemanticIndex(attributeIndex) != -1);
         const gl::VertexAttribute &curAttrib = state.getVertexAttribState(attributeIndex);
 
         if (translated[attributeIndex].active && curAttrib.enabled)