On 12/16/2012 06:05 PM, Jordan Justen wrote:
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=58380

Signed-off-by: Jordan Justen<jordan.l.jus...@intel.com>
Cc: Vinson Lee<v...@freedesktop.org>
---
  src/mesa/drivers/osmesa/osmesa.c |   10 +++++-----
  src/mesa/drivers/x11/xm_api.c    |    6 +++---
  2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 95756d5..5965d7d 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -789,13 +789,13 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, 
GLint stencilBits,
           swrast = SWRAST_CONTEXT( ctx );
           swrast->choose_line = osmesa_choose_line;
           swrast->choose_triangle = osmesa_choose_triangle;
-      }

-      _mesa_compute_version(ctx);
+         _mesa_compute_version(ctx);

-      /* Exec table initialization requires the version to be computed */
-      _mesa_initialize_exec_table(ctx);
-      _mesa_initialize_vbo_vtxfmt(ctx);
+         /* Exec table initialization requires the version to be computed */
+         _mesa_initialize_exec_table(ctx);
+         _mesa_initialize_vbo_vtxfmt(ctx);
+      }
     }
     return osmesa;
  }
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 0a005f8..c302c0c 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -959,11 +959,11 @@ XMesaContext XMesaCreateContext( XMesaVisual v, 
XMesaContext share_list )

     _mesa_meta_init(mesaCtx);

-   _mesa_compute_version(ctx);
+   _mesa_compute_version(mesaCtx);

      /* Exec table initialization requires the version to be computed */
-   _mesa_initialize_exec_table(ctx);
-   _mesa_initialize_vbo_vtxfmt(ctx);
+   _mesa_initialize_exec_table(mesaCtx);
+   _mesa_initialize_vbo_vtxfmt(mesaCtx);

     return c;
  }

Reviewed-by: Brian Paul <bri...@vmware.com>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to