Commit 0caecb3d by Nicolas Capens

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/7090Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> (cherry picked from commit 95db80e4269db8ee31432590defa699d6dd36f6b) Reviewed-on: https://swiftshader-review.googlesource.com/7091Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 61e8bb15
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#define MAJOR_VERSION 3 #define MAJOR_VERSION 3
#define MINOR_VERSION 3 #define MINOR_VERSION 3
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 0 #define BUILD_REVISION 2
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -212,6 +212,8 @@ global: ...@@ -212,6 +212,8 @@ global:
libGLES_CM_swiftshader; libGLES_CM_swiftshader;
Register;
local: local:
*; *;
}; };
......
...@@ -210,3 +210,5 @@ EXPORTS ...@@ -210,3 +210,5 @@ EXPORTS
eglGetSyncAttribKHR eglGetSyncAttribKHR
libGLES_CM_swiftshader libGLES_CM_swiftshader
Register
...@@ -292,6 +292,8 @@ global: ...@@ -292,6 +292,8 @@ global:
libGLESv2_swiftshader; libGLESv2_swiftshader;
Register;
local: local:
*; *;
}; };
......
...@@ -291,3 +291,5 @@ EXPORTS ...@@ -291,3 +291,5 @@ EXPORTS
glGetInternalformativ @308 glGetInternalformativ @308
libGLESv2_swiftshader libGLESv2_swiftshader
Register
\ No newline at end of file
...@@ -1325,6 +1325,11 @@ GL_APICALL void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs) ...@@ -1325,6 +1325,11 @@ GL_APICALL void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs)
{ {
return es2::DrawBuffersEXT(n, bufs); 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); egl::Context *es2CreateContext(egl::Display *display, const egl::Context *shareContext, int clientVersion);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment