summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-04-23 11:53:50 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-04-23 11:53:50 -0700
commit942ec8722d4d903820a5c9b0720f9aff0f938888 (patch)
treec0493bec750d9ca18777cc3071b156519cebdb3e
parent45affda4bf056ac07a1db2c2d973ad51d9135ea7 (diff)
Fix __glXInitializeVisualConfigFromTags's handling of unrecognized fbconfig
__glXInitializeVisualConfigFromTags doesn't skip the payload of unrecognized tags. Instead, it treats the value as if it were the next tag, which can happen if the server's GLX extension is not Mesa's. For example, this falls down when NVIDIA sends a GLX_FLOAT_COMPONENTS_NV = 0 pair, causing __glXInitializeVisualConfigFromTags to bail out early. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--src/glx/x11/glxext.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 5633a3e4a29..bdc6e31a8bf 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -442,6 +442,8 @@ __glXInitializeVisualConfigFromTags(__GLcontextModes * config, int count,
i = count;
break;
default:
+ /* Ignore the unrecognized tag's value */
+ bp++;
break;
}
}