[Mesa-dev] remove mfeatures.h, take two

[Brian Paul]

On 03/12/2013 04:12 PM, Jordan Justen wrote:
> On Tue, Mar 12, 2013 at 2:12 PM, Brian Paul<brianp at vmware.com>  wrote:
>> On 03/12/2013 02:52 PM, Jordan Justen wrote:
>>>
>>> On Mon, Mar 11, 2013 at 5:28 PM, Brian Paul<brianp at vmware.com>   wrote:
>>>>
>>>> On Sat, Mar 2, 2013 at 7:29 AM, Brian Paul<brianp at vmware.com>   wrote:
>>>>>
>>>>> I've respun my remove-mfeatures branch as remove-mfeatures-2.  It's in
>>>>> my
>>>>> repo on freedesktop.org
>>>>>
>>>>> This removes the mfeatures.h file and the last of the #ifdef FEATURE_x
>>>>> code
>>>>> from core Mesa.
>>>>>
>>>>> Note, however, that the scons/makefiles still define FEATURE_GL,
>>>>> FEATURE_ES1, FEATURE_ES2, etc. because that controls whether some source
>>>>> files are built and in some places (like egl-static/egl_st.c) we need to
>>>>> test those symbols to avoid calling non-existant functions.
>>>>>
>>>>> If a few people can test, that'd be great.
>>>>
>>>>
>>>>
>>>> Ping.  Can anyone test the updated remove-mfeatures-2 branch?  Thanks.
>>>
>>>
>>> I think I see an issue. In src/mesa/drivers/dri/intel/intel_screen.c, we
>>> use:
>>> #ifndef FEATURE_ES1 and #ifndef FEATURE_ES2
>>>
>>> I think these chunks of code should be removed in your series, right?
>>
>>
>> I wasn't 100% sure about that.  For the time being, leaving it as-is
>> shouldn't do any harm.
>>
>> The autoconf/makefiles will still set -DFEATURE_ES1/ES2/GL as before so
>> there shouldn't be any change in behaviour if we leave it as-is for now.
>>
>> If you think those lines should be removed, it could be done later, right?
>
> Ok. I'll extend my r-b for v2 then.
>
> I thought I saw some piglit regressions related to this, but they
> probably were fixed by rebasing your -2 branch to master rather than
> those chunks of code.

OK, thanks for testing!

-Brian