Mesa (master): i965: Fix compiler warning.

Kenneth Graunke kwg at kemper.freedesktop.org
Wed Nov 6 01:59:43 UTC 2013


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

Author: Courtney Goeltzenleuchter <courtney at lunarg.com>
Date:   Wed Oct 30 15:58:30 2013 -0600

i965: Fix compiler warning.

fix: intel_screen.c:1320:4: warning: initialization from
incompatible pointer type [enabled by default]

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_context.c |    2 +-
 src/mesa/drivers/dri/i965/brw_context.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index ab420fb..ad54a7a 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -552,7 +552,7 @@ brw_process_driconf_options(struct brw_context *brw)
       driQueryOptionb(options, "disable_glsl_line_continuations");
 }
 
-bool
+GLboolean
 brwCreateContext(gl_api api,
 	         const struct gl_config *mesaVis,
 		 __DRIcontext *driContextPriv,
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index e1f73ae..0531c12 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1475,7 +1475,7 @@ void intel_prepare_render(struct brw_context *brw);
 void intel_resolve_for_dri2_flush(struct brw_context *brw,
                                   __DRIdrawable *drawable);
 
-bool brwCreateContext(gl_api api,
+GLboolean brwCreateContext(gl_api api,
 		      const struct gl_config *mesaVis,
 		      __DRIcontext *driContextPriv,
                       unsigned major_version,




More information about the mesa-commit mailing list