Add the EGL display as a context member. This prevents having to access the current display though TLS. Change-Id: Ic93d0f88096a7e7e50318dbafb9b32da5fbc50a2 Reviewed-on: https://swiftshader-review.googlesource.com/5511 Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Meng-Lin Wu <marleymoo@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libGLESv2/Context.h b/src/OpenGL/libGLESv2/Context.h index f5775ca..4750485 100644 --- a/src/OpenGL/libGLESv2/Context.h +++ b/src/OpenGL/libGLESv2/Context.h
@@ -87,7 +87,7 @@ MAX_ELEMENTS_VERTICES = 0x7FFFFFFF, MAX_VERTEX_OUTPUT_VECTORS = 16, MAX_FRAGMENT_INPUT_VECTORS = 15, - MIN_PROGRAM_TEXEL_OFFSET = sw::MIN_PROGRAM_TEXEL_OFFSET, + MIN_PROGRAM_TEXEL_OFFSET = sw::MIN_PROGRAM_TEXEL_OFFSET, MAX_PROGRAM_TEXEL_OFFSET = sw::MAX_PROGRAM_TEXEL_OFFSET, MAX_DRAW_BUFFERS = sw::RENDERTARGETS, MAX_COLOR_ATTACHMENTS = MAX(MAX_DRAW_BUFFERS, 8), @@ -425,7 +425,7 @@ class Context : public egl::Context { public: - Context(const egl::Config *config, const Context *shareContext, EGLint clientVersion); + Context(egl::Display *display, const egl::Config *config, const Context *shareContext, EGLint clientVersion); virtual void makeCurrent(egl::Surface *surface); virtual EGLint getClientVersion() const;