fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 18:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Include the multisample enables under GL_MULTISAMPLE_BIT attrib as well.

Browse source 
Fixes (with the previous commit) piglit GL_ARB_multisample/pushpop.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Eric Anholt 2012-02-13 13:36:06 -08:00
parent 4b6e45c7d6
commit b631b471d8
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/main/attrib.c
View file

@ -617,8 +617,6 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
enable->VertexProgramTwoSide,
GL_VERTEX_PROGRAM_TWO_SIDE_ARB);
#undef TEST_AND_UPDATE
/* texture unit enables */
for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
const GLbitfield enabled = enable->Texture[i];
@ -1270,6 +1268,23 @@ _mesa_PopAttrib(void)
{
const struct gl_multisample_attrib *ms;
ms = (const struct gl_multisample_attrib *) attr->data;
TEST_AND_UPDATE(ctx->Multisample.Enabled,
ms->Enabled,
GL_MULTISAMPLE);
TEST_AND_UPDATE(ctx->Multisample.SampleCoverage,
ms->SampleCoverage,
GL_SAMPLE_COVERAGE);
TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToCoverage,
ms->SampleAlphaToCoverage,
GL_SAMPLE_ALPHA_TO_COVERAGE);
TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToOne,
ms->SampleAlphaToOne,
GL_SAMPLE_ALPHA_TO_ONE);
_mesa_SampleCoverageARB(ms->SampleCoverageValue,
ms->SampleCoverageInvert);
}