On 10/30/2013 02:58 PM, Courtney Goeltzenleuchter wrote: > fix: intel_screen.c:1320:4: warning: initialization from > incompatible pointer type [enabled by default] > --- > 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 2a923c4..5b4d662d 100644 > --- a/src/mesa/drivers/dri/i965/brw_context.c > +++ b/src/mesa/drivers/dri/i965/brw_context.c > @@ -498,7 +498,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 7f7d5c2..c261ae8 100644 > --- a/src/mesa/drivers/dri/i965/brw_context.h > +++ b/src/mesa/drivers/dri/i965/brw_context.h > @@ -1446,7 +1446,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, >
Whoops...looks like I got a bit overzealous in converting those during the intel_context/brw_context merges. Thanks, pushed. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
