[Mesa-dev] [PATCH 2/3] mesa: require GL_MAX_SAMPLES >= 4 for GL 3.0

[Kenneth Graunke]

On 04/24/2012 03:41 AM, Ian Romanick wrote:
> On 04/22/2012 11:47 PM, Kenneth Graunke wrote:
>> On 04/22/2012 01:43 AM, nobled wrote:
>>> As noted in commit be4e46b21a60cfdc826bf89d1078df54966115b1,
>>> this was missing before.
>>>
>>> NOTE: This is a candidate for the 8.0 branch.
>>> ---
>>> src/mesa/main/version.c | 1 +
>>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
>>> index 82cc54b..607230b 100644
>>> --- a/src/mesa/main/version.c
>>> +++ b/src/mesa/main/version.c
>>> @@ -124,6 +124,7 @@ compute_version(struct gl_context *ctx)
>>> ctx->Extensions.EXT_texture_sRGB);
>>> const GLboolean ver_3_0 = (ver_2_1&&
>>> ctx->Const.GLSLVersion>= 130&&
>>> + ctx->Const.MaxSamples>= 4&&
>>> ctx->Extensions.ARB_color_buffer_float&&
>>> ctx->Extensions.ARB_depth_buffer_float&&
>>> ctx->Extensions.ARB_half_float_pixel&&
>>
>> We can't really cherry-pick this to 8.0, as it would cause i965 to
>> suddenly advertise 2.1 instead of 3.0. The missing/incorrect MSAA
>> support has to stay a "known issue" for 8.0.
>
> Are you sure about that? I thought we already lied by saying that there
> were 4 samples.

Oh, right.

I'm fine with cherry-picking this to 8.0 then.  Though I don't really 
care either way.

>> That said, I'm fine with this for master/8.1, as I think we'll have real
>> MSAA support.
>>
>> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>