diff options
| -rw-r--r-- | src/mesa/drivers/dri/common/utils.c | 11 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 7 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index bc0dd6b9b61..f2d98d9f2ff 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -421,7 +421,6 @@ __DRIconfig **driConcatConfigs(__DRIconfig **a, return all; } -/* careful, lack of trailing semicolon */ #define __ATTRIB(attrib, field) case attrib: *value = config->modes.field; break /** @@ -489,11 +488,11 @@ driGetConfigAttribIndex(const __DRIconfig *config, __ATTRIB(__DRI_ATTRIB_GREEN_MASK, greenMask); __ATTRIB(__DRI_ATTRIB_BLUE_MASK, blueMask); __ATTRIB(__DRI_ATTRIB_ALPHA_MASK, alphaMask); - __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH, maxPbufferWidth); - __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT, maxPbufferHeight); - __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS, maxPbufferPixels); - __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH, optimalPbufferWidth); - __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT, optimalPbufferHeight); + case __DRI_ATTRIB_MAX_PBUFFER_WIDTH: + case __DRI_ATTRIB_MAX_PBUFFER_HEIGHT: + case __DRI_ATTRIB_MAX_PBUFFER_PIXELS: + case __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH: + case __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT: case __DRI_ATTRIB_VISUAL_SELECT_GROUP: *value = 0; break; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 95da90828fb..7e94b3a721d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -192,13 +192,6 @@ struct gl_config GLint sampleBuffers; GLuint samples; - /* SGIX_pbuffer / GLX 1.3 */ - GLint maxPbufferWidth; - GLint maxPbufferHeight; - GLint maxPbufferPixels; - GLint optimalPbufferWidth; /* Only for SGIX_pbuffer. */ - GLint optimalPbufferHeight; /* Only for SGIX_pbuffer. */ - /* OML_swap_method */ GLint swapMethod; |