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

[Oliver McFadden]

On Sun, Sep 16, 2012 at 01:32:00PM +0300, Ian Romanick wrote:
> On 09/15/2012 06:04 PM, 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?
> >
> > P.S.: I called configure like this on Debian:
> > ./configure --prefix=/opt/xorg --with-driver=dri --with-state-trackers=egl dri --with-dri-drivers= --with-gallium-drivers=r600 LLVM_CONFIG=/usr/bin/llvm-config-3.1 --enable-r600-llvm-compiler
> > --enable-openvg --enable-vdpau --enable-glx-tls --enable-shared-glapi --enable-texture-float --enable-egl --enable-gallium-egl
> 
> The problem is that _mesa_create_exec_table_es1 only exists with 
> --enable-es1.  I had several other review comments on this series, but 
> I'm traveling and jetlagged, which has delayed things.

Okay, clearly I need to more carefully rewrite and test the final commit
in this series.  It has been reverted as a temporary solution and if I
have some time during XDC I will test with as many of the GNU/Linux
configurations as possible.  I cannot test Windows but you're welcome to
test that yourself when I post the patch for review.

-- 
Oliver McFadden.