From: Jordan Justen <jordan.l.justen@intel.com>
Date: Tue, 17 Jul 2012 18:22:32 +0000 (-0700)
Subject: intel: move error on create context to proper path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=881bb4ac7285c462079844072fc1d0b26e340b12;p=mesa.git

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@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 81953ce9334..e8a4ad13f4d 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -696,10 +696,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;