GNOME Bugzilla – Bug 665722
Build Fixes for COGL master branch
Last modified: 2011-12-13 14:54:01 UTC
Created attachment 202972 [details] [review] Include cogl-pipeline-progend-glsl-private.h unconditionally Hi, It seems that cogl-attribute.c now uses _cogl_pipeline_progend_glsl_get_attrib_location for all COGL builds, which means that cogl-pipeline-progend-glsl-private.h must be included for all builds to avoid C4013 warnings/errors on Visual C++ (i.e. implcit declaration of ... for GCC people), so this is the trivial patch to address that issue. Thank you, and God bless!
Created attachment 202974 [details] [review] Elimate a compiler warning Hi, Here's another one-it seems that cogl-bitmask.h tried to return _cogl_bitmask_set_flags_array (a void return-type function) from _cogl_bitmask_set_flags (which is also of void return-type), which causes compilers like Visual C++ to warn on this (return of ... from a void function), so this silences this. Thank you. and God bless!
I've pushed the second patch as 1be2cdab2. I think the first patch needs a bit of tweaking because currently it also doesn't compile on builds with no GLSL support (ie, when only the GLES1 driver is enabled). I'm attaching another patch which should fix this. Thanks for the patches.
Created attachment 202983 [details] [review] attribute: Fix including progend-glsl-private.h on GL2 Previously this header was only included on GLES2 but since 7283e0a4 the progend is used on any driver where GLSL is available. This changes the #ifdef to check for the presence of the GLSL progend. Based on a patch by Fan, Chun-wei
Review of attachment 202974 [details] [review]: Set status of this patch as "committed". It seems that the other patch for the include worked ok on Windows-but I would not be able to try that out on GLES1 as it's not readily available on my system at this time. Thanks though, and God Bless!
Thanks. I've tested that it builds with GLES1 using Mesa's header. I've pushed the patch as 39203cb8f.