i965/gen7: Only advertise 4 samples for RGBA32F on GLES

We can't render to 8x MSAA if the width is greater than 64 bits. (see
brw_render_target_supported)

Fixes ES31-CTS.sample_variables.mask.rgba32f.samples_8.mask_*

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Jordan Justen
2016-07-22 15:23:55 -07:00
parent 76e953788a
commit 72c00e7c47
+19 -3
View File
@@ -23,6 +23,7 @@
#include "brw_context.h"
#include "brw_state.h"
#include "main/context.h"
#include "main/formatquery.h"
#include "main/glformats.h"
@@ -50,9 +51,24 @@ brw_query_samples_for_format(struct gl_context *ctx, GLenum target,
return 3;
case 7:
samples[0] = 8;
samples[1] = 4;
return 2;
if (internalFormat == GL_RGBA32F && _mesa_is_gles(ctx)) {
/* For GLES, we are allowed to return a smaller number of samples for
* GL_RGBA32F. See OpenGLES 3.2 spec, section 20.3.1 Internal Format
* Query Parameters, under SAMPLES:
*
* "A value less than or equal to the value of MAX_SAMPLES, if
* internalformat is RGBA16F, R32F, RG32F, or RGBA32F."
*
* In brw_render_target_supported, we prevent formats with a size
* greater than 8 bytes from using 8x MSAA on gen7.
*/
samples[0] = 4;
return 1;
} else {
samples[0] = 8;
samples[1] = 4;
return 2;
}
case 6:
samples[0] = 4;