diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-05-09 20:31:35 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-05-09 21:07:58 +0100 |
| commit | b421736f7d82ec82898725ce16722454d1a77016 (patch) | |
| tree | 7cd420825638e881a02d29dc7fb3bdb9ff4a7c26 | |
| parent | cedebab8c47a39f03ac33c114dce2159b56ccd71 (diff) | |
Ignore pbuffer size attributesnodrm-build-fixes-5
Ignore pbuffer size attributes. If the server doesn't lie and say 0, no
fbconfigs match and direct rendering fails and sadness...
XXX: should probably fix this in XWin by reporting 0.
Also, add an error message for this case.
| -rw-r--r-- | src/glx/dri_common.c | 2 | ||||
| -rw-r--r-- | src/glx/dri_glx.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index 8bf47054a3..a303dfff8b 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -234,9 +234,11 @@ static const struct __ATTRIB(__DRI_ATTRIB_BLUE_MASK, blueMask), __ATTRIB(__DRI_ATTRIB_ALPHA_MASK, alphaMask), #endif +#if 0 __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH, maxPbufferWidth), __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT, maxPbufferHeight), __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS, maxPbufferPixels), +#endif __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH, optimalPbufferWidth), __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT, optimalPbufferHeight), #if 0 diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c index 04a0847a4b..bfed7bd61a 100644 --- a/src/glx/dri_glx.c +++ b/src/glx/dri_glx.c @@ -460,8 +460,10 @@ CallCreateNewScreen(Display *dpy, int scrn, struct dri_screen *psc, configs = driConvertConfigs(psc->core, psc->base.configs, driver_configs); visuals = driConvertConfigs(psc->core, psc->base.visuals, driver_configs); - if (!configs || !visuals) + if (!configs || !visuals) { + ErrorMessageF("Failed to find matching fbConfigs or visuals\n"); goto handle_error; + } glx_config_destroy_list(psc->base.configs); psc->base.configs = configs; |