| commit | 0caecb3dfab2066086416d568856eaa5cb4fbdc1 | [log] [tgz] |
|---|---|---|
| author | Nicolas Capens <capn@google.com> | Tue Sep 06 14:58:10 2016 -0400 |
| committer | Nicolas Capens <capn@google.com> | Wed Sep 07 14:27:44 2016 +0000 |
| tree | 13071041e41278b909da835dc11e79be6070eca5 | |
| parent | 61e8bb159271fd7198ebb5605b2137a01c08dfb1 [diff] [blame] |
Fix null pointer access by older Chrome versions. Older Chrome branches still need the Register() function. Bug chromium:644329 Change-Id: I6b07aea6e069604f3e5d9e08c97c287df31c0dd6 Reviewed-on: https://swiftshader-review.googlesource.com/7090 Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> (cherry picked from commit 95db80e4269db8ee31432590defa699d6dd36f6b) Reviewed-on: https://swiftshader-review.googlesource.com/7091 Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/main.cpp b/src/OpenGL/libGLESv2/main.cpp index 12ed31d..7537c15 100644 --- a/src/OpenGL/libGLESv2/main.cpp +++ b/src/OpenGL/libGLESv2/main.cpp
@@ -1325,6 +1325,11 @@ { return es2::DrawBuffersEXT(n, bufs); } + +void GL_APIENTRY Register(const char *licenseKey) +{ + // Nothing to do, SwiftShader is open-source +} } egl::Context *es2CreateContext(egl::Display *display, const egl::Context *shareContext, int clientVersion);