diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-12-05 10:56:07 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-05-23 13:07:51 -0700 |
| commit | 96d74138b1c0273e88933220d99a893858b649cd (patch) | |
| tree | 92c96f2a96c41a449ff82388fdff2dc995825c4e /glx/glxcmds.c | |
| parent | 62f06b0dcde13cb87bc3d0c5ff86d8db7e3ff0ef (diff) | |
glx: Extend __GLXscreen::createContext to take attributes
The attributes will be used for glXCreateContextAttribsARB additions
in follow-on patches.
v2: Add missing 'int *error' parameters noticed by Christopher James
Halse Rogers.
v3: Remove redundant 'int err;' declaration noticed by Christopher
James Halse Rogers. This was supposed to be in v2, but I missed it.
v4: Add comma missing from additions in v2. Ugh.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Diffstat (limited to 'glx/glxcmds.c')
| -rw-r--r-- | glx/glxcmds.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 5c70afabe..308c14a4e 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -276,8 +276,14 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, /* ** Allocate memory for the new context */ - if (!isDirect) - glxc = pGlxScreen->createContext(pGlxScreen, config, shareglxc); + if (!isDirect) { + /* Without any attributes, the only error that the driver should be + * able to generate is BadAlloc. As result, just drop the error + * returned from the driver on the floor. + */ + glxc = pGlxScreen->createContext(pGlxScreen, config, shareglxc, + 0, NULL, &err); + } else glxc = __glXdirectContextCreate(pGlxScreen, config, shareglxc); if (!glxc) { |