diff options
Diffstat (limited to 'xorg-server/hw/xquartz/GL')
| -rw-r--r-- | xorg-server/hw/xquartz/GL/capabilities.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/GL/indirect.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/GL/visualConfigs.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/xquartz/GL/capabilities.c b/xorg-server/hw/xquartz/GL/capabilities.c index 43064044c..5f1f87013 100644 --- a/xorg-server/hw/xquartz/GL/capabilities.c +++ b/xorg-server/hw/xquartz/GL/capabilities.c @@ -522,7 +522,7 @@ bool getGlCapabilities(struct glCapabilities *cap) { conf = malloc(sizeof(*conf)); if(NULL == conf) { perror("malloc"); - abort(); + OsAbort(); } /* Copy the struct. */ diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c index 176282532..44380ffa0 100644 --- a/xorg-server/hw/xquartz/GL/indirect.c +++ b/xorg-server/hw/xquartz/GL/indirect.c @@ -548,7 +548,7 @@ static CGLPixelFormatObj makeFormat(__GLXconfig *conf) { attr[i++] = conf->samples; } - attr[i++] = 0; + attr[i + 1] = 0; error = CGLChoosePixelFormat(attr, &fobj, &formats); if(error) { diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.c b/xorg-server/hw/xquartz/GL/visualConfigs.c index f92677847..bef27f048 100644 --- a/xorg-server/hw/xquartz/GL/visualConfigs.c +++ b/xorg-server/hw/xquartz/GL/visualConfigs.c @@ -62,7 +62,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) int numConfigs = 0; __GLXconfig *visualConfigs, *c; struct glCapabilities caps; - struct glCapabilitiesConfig *conf = NULL; + struct glCapabilitiesConfig *conf; int stereo, depth, aux, buffers, stencil, accum, color, msample; if(getGlCapabilities(&caps)) { @@ -94,7 +94,6 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) */ assert(NULL != caps.configurations); - conf = caps.configurations; numConfigs = 0; |