diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-18 10:05:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-18 10:05:10 +0100 |
| commit | 1d46380a9bb69897acdadf71b80cd759b0493fad (patch) | |
| tree | d8517cf38e0ac8a6ec098d92293e262e99a4c7b9 /xorg-server/glx | |
| parent | 18d9ddc200055ccf6bf285e578e4724159ff69d5 (diff) | |
| parent | 293fd0043af7e861c9c540bebc44630d0da0bf9b (diff) | |
| download | vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.gz vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.bz2 vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 18 oct 2012
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glxdri2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index bce1bfa4b..b26e501dc 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -514,7 +514,7 @@ create_driver_context(__GLXDRIcontext * context, unsigned minor_ver; uint32_t flags; int reset; - int api; + int api = __DRI_API_OPENGL; if (num_attribs != 0) { if (!dri2_convert_glx_attribs(screen, num_attribs, attribs, |