aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/windows
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-09 08:04:41 +0000
committermarha <marha@users.sourceforge.net>2011-02-09 08:04:41 +0000
commit744bc6a5e71f207a33b0826598c1f93302f7fe01 (patch)
tree63dcb1464076af2a0eba4f5655bfb2ebb47fe486 /mesalib/src/mesa/drivers/windows
parent67ff1435e31fee46b1bc8d1c65da27f8ad1c39f9 (diff)
parent51a59b7f7f9b134791d3b09673063e4c45ea9eee (diff)
downloadvcxsrv-744bc6a5e71f207a33b0826598c1f93302f7fe01.tar.gz
vcxsrv-744bc6a5e71f207a33b0826598c1f93302f7fe01.tar.bz2
vcxsrv-744bc6a5e71f207a33b0826598c1f93302f7fe01.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/drivers/windows')
-rw-r--r--mesalib/src/mesa/drivers/windows/gdi/wmesa.c3
-rw-r--r--mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
index a30326c0c..1a13e9f5c 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1479,7 +1479,8 @@ WMesaContext WMesaCreateContext(HDC hDC,
/* initialize the Mesa context data */
ctx = &c->gl_ctx;
- _mesa_initialize_context(ctx, visual, NULL, &functions, (void *)c);
+ _mesa_initialize_context(ctx, API_OPENGL, visual,
+ NULL, &functions, (void *)c);
/* visual no longer needed - it was copied by _mesa_initialize_context() */
_mesa_destroy_visual(visual);
diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c b/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
index fabce4c0b..bc4839cfe 100644
--- a/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
@@ -1414,7 +1414,7 @@ SkipPrimaryCreate:
}
#ifdef _USE_GLD3_WGL
- lpCtx->glCtx = _mesa_create_context(lpCtx->glVis, NULL, (void *)lpCtx, GL_TRUE);
+ lpCtx->glCtx = _mesa_create_context(API_OPENGL, lpCtx->glVis, NULL, (void *)lpCtx, GL_TRUE);
#else
// Create the Mesa context
lpCtx->glCtx = (*mesaFuncs.gl_create_context)(