Add context, dispatch parameters to __glDispatchMakeCurrent()

When making current, assign the API state's new context and dispatch table
in GLdispatch rather than GLX.  This avoids consistency issues if the API state
is unchanged but the current dispatch or context may have changed.

Update the __glDispatchMakeCurrent() call in
__glXMakeGLDispatchCurrent() to get libglvnd building for now; a later change
will remove libglxgldispatch.c altogether.

Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/GLdispatch/GLdispatch.h b/src/GLdispatch/GLdispatch.h
index f7dd618..12c121d 100644
--- a/src/GLdispatch/GLdispatch.h
+++ b/src/GLdispatch/GLdispatch.h
@@ -144,10 +144,12 @@ PUBLIC __GLdispatchTable *__glDispatchCreateTable(
 PUBLIC void __glDispatchDestroyTable(__GLdispatchTable *dispatch);
 
 /*!
- * This makes the given API state current, and sets the current dispatch
- * table and context based on the settings in the API state.
+ * This makes the given API state current, and assigns this API state
+ * the passed-in current dispatch table and context.
  */
-PUBLIC void __glDispatchMakeCurrent(__GLdispatchAPIState *apiState);
+PUBLIC void __glDispatchMakeCurrent(__GLdispatchAPIState *apiState,
+                                    __GLdispatchTable *dispatch,
+                                    void *context);
 
 /*!
  * This makes the NOP dispatch table current and sets the current context and