| commit | 7dd2e10da0ca97d0d558ce7dc682a73f7bdd1aa0 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
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>
diff --git a/src/libANGLE/ResourceManager.cpp b/src/libANGLE/ResourceManager.cpp index 7cebe30..3ed77f1 100644 --- a/src/libANGLE/ResourceManager.cpp +++ b/src/libANGLE/ResourceManager.cpp
@@ -106,7 +106,7 @@ { GLuint handle = mProgramShaderHandleAllocator.allocate(); - mProgramMap[handle] = new Program(mRenderer, this, handle); + mProgramMap[handle] = new Program(mRenderer->createProgram(), this, handle); return handle; }