From: Xavier Chantry <chantry.xavier@gmail.com>
Date: Sun, 2 May 2010 21:25:43 +0000 (+0200)
Subject: Update drisw state tracker to use new API aware context create
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b44c52870dc2eec9a41e984d4dceca22ea83d334;p=mesa.git

Update drisw state tracker to use new API aware context create

Even though swrast defines its own __DriverAPIRec it still shares the
driCreateNewContext() implementation from dri_util.c.  So the CreateContext
prototypes have to match in the two __DriverAPIRecs.

Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
---

diff --git a/src/mesa/drivers/dri/common/drisw_util.c b/src/mesa/drivers/dri/common/drisw_util.c
index 8d08b93bfb5..1529c23b16d 100644
--- a/src/mesa/drivers/dri/common/drisw_util.c
+++ b/src/mesa/drivers/dri/common/drisw_util.c
@@ -112,7 +112,8 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
     pcp->driDrawablePriv = NULL;
     pcp->driReadablePriv = NULL;
 
-    if (!driDriverAPI.CreateContext(&config->modes, pcp, shareCtx)) {
+    if (!driDriverAPI.CreateContext(API_OPENGL,
+			    &config->modes, pcp, shareCtx)) {
 	FREE(pcp);
 	return NULL;
     }
diff --git a/src/mesa/drivers/dri/common/drisw_util.h b/src/mesa/drivers/dri/common/drisw_util.h
index 08d5a116e96..2b54b2281fa 100644
--- a/src/mesa/drivers/dri/common/drisw_util.h
+++ b/src/mesa/drivers/dri/common/drisw_util.h
@@ -36,6 +36,8 @@
 #ifndef _DRISW_UTIL_H
 #define _DRISW_UTIL_H
 
+#include "mtypes.h"
+
 #include <GL/gl.h>
 #include <GL/internal/glcore.h>
 #include <GL/internal/dri_interface.h>
@@ -57,7 +59,8 @@ struct __DriverAPIRec {
 
     void (*DestroyScreen)(__DRIscreen *driScrnPriv);
 
-    GLboolean (*CreateContext)(const __GLcontextModes *glVis,
+    GLboolean (*CreateContext)(gl_api glapi,
+                               const __GLcontextModes *glVis,
                                __DRIcontext *driContextPriv,
                                void *sharedContextPrivate);