Mesa (master): st/mesa: fix incorrect version checking code

Brian Paul brianp at kemper.freedesktop.org
Mon Mar 7 21:59:03 UTC 2011


Module: Mesa
Branch: master
Commit: ce6f16d382dc76fd77064c6ce04ca6cc18cdfcef
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce6f16d382dc76fd77064c6ce04ca6cc18cdfcef

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Mar  5 11:08:57 2011 -0700

st/mesa: fix incorrect version checking code

---

 src/mesa/state_tracker/st_manager.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 5c8853c..d85bcd4 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -684,8 +684,9 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi,
    if (attribs->major > 1 || attribs->minor > 0) {
       _mesa_compute_version(st->ctx);
 
-      if (st->ctx->VersionMajor < attribs->major ||
-          st->ctx->VersionMajor < attribs->minor) {
+      /* is the actual version less than the requested version? */
+      if (st->ctx->VersionMajor * 10 + st->ctx->VersionMinor <
+          attribs->major * 10 + attribs->minor) {
          st_destroy_context(st);
          return NULL;
       }




More information about the mesa-commit mailing list