Mesa (8.0): intel: move error on create context to proper path

Ian Romanick idr at kemper.freedesktop.org
Sat Oct 13 03:07:54 UTC 2012


Module: Mesa
Branch: 8.0
Commit: 7d33cf9476f204dd13b2fbcf0dc2a1d9622b5f5a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d33cf9476f204dd13b2fbcf0dc2a1d9622b5f5a

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Tue Jul 17 11:22:32 2012 -0700

intel: move error on create context to proper path

The error was being set on the non-error path, rather
than the error path.

NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 881bb4ac7285c462079844072fc1d0b26e340b12)

---

 src/mesa/drivers/dri/intel/intel_screen.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index e6e79ef..4ede928 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -556,10 +556,10 @@ intelCreateContext(gl_api api,
       if (ctx->VersionMajor > major_version
 	  || (ctx->VersionMajor == major_version
 	      && ctx->VersionMinor >= minor_version)) {
-	 *error = __DRI_CTX_ERROR_BAD_VERSION;
 	 return true;
       }
 
+      *error = __DRI_CTX_ERROR_BAD_VERSION;
       intelDestroyContext(driContextPriv);
    } else {
       *error = __DRI_CTX_ERROR_NO_MEMORY;




More information about the mesa-commit mailing list