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

[Török Edwin]

On 09/15/2012 07:12 PM, Brian Paul wrote:
> 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.

Yes thats why I ended up doing locally to fix my build.

--Edwin