diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
| commit | 31ee9c57db79281e122d3c4acb0f8eae07f4449f (patch) | |
| tree | 222bc6f83ebdb15721e7acfdb829aa85606e243a /mesalib/src/mesa/state_tracker/st_context.c | |
| parent | 8797d6ab8ef5121c900cd74b8662305ec7aeb34b (diff) | |
| parent | d03a5f20114203fd00e0004659fd2617f4c03a32 (diff) | |
| download | vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.gz vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.bz2 vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/state_tracker/st_context.c
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/wgl_ext_api.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/man/XWin.man
xorg-server/hw/xwin/winmultiwindowwindow.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_context.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c index 40af1a5bb..b6a78daf6 100644 --- a/mesalib/src/mesa/state_tracker/st_context.c +++ b/mesalib/src/mesa/state_tracker/st_context.c @@ -179,6 +179,9 @@ struct st_context *st_create_context(gl_api api, struct pipe_context *pipe, st_init_driver_functions(&funcs);
ctx = _mesa_create_context(api, visual, shareCtx, &funcs, NULL);
+ if (!ctx) {
+ return NULL;
+ }
/* XXX: need a capability bit in gallium to query if the pipe
* driver prefers DP4 or MUL/MAD for vertex transformation.
|