[Mesa-dev] [PATCH 46/47] mesa: remove remaining FEATURE_* defines where protected by API check.

[Jose Fonseca]

----- Original Message -----
> On 09/15/2012 09:04 AM, Török Edwin wrote:
> > On 09/13/2012 11:19 AM, Oliver McFadden wrote:
> >> Signed-off-by: Oliver McFadden<oliver.mcfadden at linux.intel.com>
> >>
> >> diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
> >> index abce52e..63bb3da 100644
> >> --- a/src/mesa/main/context.c
> >> +++ b/src/mesa/main/context.c
> >> @@ -952,18 +952,14 @@ _mesa_initialize_context(struct gl_context
> >> *ctx,
> >>
> >> -#if FEATURE_ES1
> >>      case API_OPENGLES:
> >>         ctx->Exec = _mesa_create_exec_table_es1();
> >>         break;
> >> -#endif
> >
> > This breaks r600 gallium build:
> > r600_dri.so.tmp: undefined reference to
> > `_mesa_create_exec_table_es1'
> >
> > The definition of that function in api_exec_es1.c is protected by
> > #ifdef FEATURE_ES1,
> > did you mean to remove that one as well?
> 
> If you restore those two #if / #endif lines does that fix things?
> 
> That would probably be the simplest solution for now.

The windows builds got broken with this commit:
- egl-static allows (defaults) to build only openvg by default, and this got broken
- missing _mesa_create_exec_table_es1 symbols as above.

I tried several things but at the end, the only way I could fix it was reverting this commit, and I'm not sure that correct way of fixing this, so I've opted to temporarily reverted.

Jose