fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Returns zero samples when querying GL_NUM_SAMPLE_COUNTS when internal format is integer

Browse source 
From GL ES 3.0 specification, section 6.1.15 Internal Format Queries (page 236),
multisampling is not supported for signed and unsigned integer internal formats.

Fixes 19 dEQP tests under 'dEQP-GLES3.functional.state_query.internal_format.*'.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eduardo Lima Mitev 2014-11-20 14:52:35 +01:00 • committed by Iago Toral Quiroga
parent 7894278717
commit 09cb149ba7
1 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/mesa/main/formatquery.c
View file

@ -115,29 +115,40 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
internalformat, buffer);
break;
case GL_NUM_SAMPLE_COUNTS: {
/* The driver can return 0, and we should pass that along to the
* application. The ARB decided that ARB_internalformat_query should
* behave as ARB_internalformat_query2 in this situation.
*
* The ARB_internalformat_query2 spec says:
*
* "- NUM_SAMPLE_COUNTS: The number of sample counts that would be
* returned by querying SAMPLES is returned in <params>.
* * If <internalformat> is not color-renderable,
* depth-renderable, or stencil-renderable (as defined in
* section 4.4.4), or if <target> does not support multiple
* samples (ie other than TEXTURE_2D_MULTISAMPLE,
* TEXTURE_2D_MULTISAMPLE_ARRAY, or RENDERBUFFER), 0 is
* returned."
*/
const size_t num_samples =
ctx->Driver.QuerySamplesForFormat(ctx, target, internalformat, buffer);
if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalformat)) {
/* From GL ES 3.0 specification, section 6.1.15 page 236: "Since
* multisampling is not supported for signed and unsigned integer
* internal formats, the value of NUM_SAMPLE_COUNTS will be zero
* for such formats.
*/
buffer[0] = 0;
count = 1;
} else {
size_t num_samples;
/* QuerySamplesForFormat writes some stuff to buffer, so we have to
* separately over-write it with the requested value.
*/
buffer[0] = (GLint) num_samples;
count = 1;
/* The driver can return 0, and we should pass that along to the
* application. The ARB decided that ARB_internalformat_query should
* behave as ARB_internalformat_query2 in this situation.
*
* The ARB_internalformat_query2 spec says:
*
* "- NUM_SAMPLE_COUNTS: The number of sample counts that would be
* returned by querying SAMPLES is returned in <params>.
* * If <internalformat> is not color-renderable,
* depth-renderable, or stencil-renderable (as defined in
* section 4.4.4), or if <target> does not support multiple
* samples (ie other than TEXTURE_2D_MULTISAMPLE,
* TEXTURE_2D_MULTISAMPLE_ARRAY, or RENDERBUFFER), 0 is
* returned."
*/
num_samples = ctx->Driver.QuerySamplesForFormat(ctx, target, internalformat, buffer);
/* QuerySamplesForFormat writes some stuff to buffer, so we have to
* separately over-write it with the requested value.
*/
buffer[0] = (GLint) num_samples;
count = 1;
}
break;
}
default: