commit 0caecb3dfab2066086416d568856eaa5cb4fbdc1
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

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>

src/Common/Version.h

diff --git a/src/Common/Version.h b/src/Common/Version.h
index 078899a..d1beda2 100644
--- a/src/Common/Version.h
+++ b/src/Common/Version.h
@@ -15,7 +15,7 @@
 #define MAJOR_VERSION 3
 #define MINOR_VERSION 3
 #define BUILD_VERSION 0
-#define BUILD_REVISION 0
+#define BUILD_REVISION 2
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/OpenGL/libGLES_CM/exports.map

diff --git a/src/OpenGL/libGLES_CM/exports.map b/src/OpenGL/libGLES_CM/exports.map
index a169b99..dcf548f 100644
--- a/src/OpenGL/libGLES_CM/exports.map
+++ b/src/OpenGL/libGLES_CM/exports.map
@@ -212,6 +212,8 @@
 
     libGLES_CM_swiftshader;
 
+    Register;
+
 local:
     *;
 };

src/OpenGL/libGLES_CM/libGLES_CM.def

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.def b/src/OpenGL/libGLES_CM/libGLES_CM.def
index 9c9d032..cf15c8b 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.def
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.def
@@ -210,3 +210,5 @@
     eglGetSyncAttribKHR
 
 	libGLES_CM_swiftshader
+
+	Register

src/OpenGL/libGLESv2/exports.map

diff --git a/src/OpenGL/libGLESv2/exports.map b/src/OpenGL/libGLESv2/exports.map
index 1a344dc..8238564 100644
--- a/src/OpenGL/libGLESv2/exports.map
+++ b/src/OpenGL/libGLESv2/exports.map
@@ -292,6 +292,8 @@
 
     libGLESv2_swiftshader;
 
+    Register;
+
 local:
     *;
 };

src/OpenGL/libGLESv2/libGLESv2.def

diff --git a/src/OpenGL/libGLESv2/libGLESv2.def b/src/OpenGL/libGLESv2/libGLESv2.def
index 1b8c458..d6e59b4 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.def
+++ b/src/OpenGL/libGLESv2/libGLESv2.def
@@ -291,3 +291,5 @@
     glGetInternalformativ           @308
 
     libGLESv2_swiftshader
+
+	Register
\ No newline at end of file

src/OpenGL/libGLESv2/main.cpp

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);