Mesa (master): intel: Return if pointer to intel_context is null

Anuj Phogat aphogat at kemper.freedesktop.org
Tue Jan 17 17:00:31 PST 2012


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

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Tue Jan 17 13:21:52 2012 -0800

intel: Return if pointer to intel_context is null

It is better to test if(intel == NULL) and simply return in that case.

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

---

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

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index a08f3d1..0566907 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -114,16 +114,16 @@ intelDRI2Flush(__DRIdrawable *drawable)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct intel_context *intel = intel_context(ctx);
+   if (intel == NULL)
+      return;
 
-   if (intel != NULL) {
-      if (intel->gen < 4)
-	 INTEL_FIREVERTICES(intel);
+   if (intel->gen < 4)
+      INTEL_FIREVERTICES(intel);
 
-      intel->need_throttle = true;
+   intel->need_throttle = true;
 
-      if (intel->batch.used)
-	 intel_batchbuffer_flush(intel);
-   }
+   if (intel->batch.used)
+      intel_batchbuffer_flush(intel);
 }
 
 static const struct __DRI2flushExtensionRec intelFlushExtension = {



More information about the mesa-commit mailing list