From 3f7b4e5d04cf9f0274ddcd37d573eb96f835278e Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 25 Sep 2013 15:48:41 -0700 Subject: [PATCH] i965: Rename brwCreateContext's error parameter to dri_ctx_error. "error" is a very generic name. dri_ctx_error is the name used in intelInitContext(), which is more specific. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 5d5f41a32fe..5494fcd6324 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -282,7 +282,7 @@ brwCreateContext(gl_api api, unsigned major_version, unsigned minor_version, uint32_t flags, - unsigned *error, + unsigned *dri_ctx_error, void *sharedContextPrivate) { __DRIscreen *sPriv = driContextPriv->driScreenPriv; @@ -292,7 +292,7 @@ brwCreateContext(gl_api api, struct brw_context *brw = rzalloc(NULL, struct brw_context); if (!brw) { printf("%s: failed to alloc context\n", __FUNCTION__); - *error = __DRI_CTX_ERROR_NO_MEMORY; + *dri_ctx_error = __DRI_CTX_ERROR_NO_MEMORY; return false; } @@ -310,7 +310,7 @@ brwCreateContext(gl_api api, if (!intelInitContext( brw, api, major_version, minor_version, mesaVis, driContextPriv, sharedContextPrivate, &functions, - error)) { + dri_ctx_error)) { intelDestroyContext(driContextPriv); return false; } -- 2.30.2