diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2016-03-24 08:30:09 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2016-03-24 08:36:43 -0600 |
| commit | f96309753b7f5f4ea5e1942778087b3ace8eda9b (patch) | |
| tree | 468944dfe7dac7c04c956660c941bea2f2be26c3 /src/mesa/drivers/dri/i965/gen6_cc.c | |
| parent | 0bea0e7141a7698118bfd465fdb4adf8e0b21bc8 (diff) | |
| download | external_mesa3d-f96309753b7f5f4ea5e1942778087b3ace8eda9b.zip external_mesa3d-f96309753b7f5f4ea5e1942778087b3ace8eda9b.tar.gz external_mesa3d-f96309753b7f5f4ea5e1942778087b3ace8eda9b.tar.bz2 | |
mesa: replace gl_context->Multisample._Enabled with _mesa_is_multisample_enabled.
This removes any dependency on driver validation of the number of
framebuffer samples.
Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_cc.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_cc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c b/src/mesa/drivers/dri/i965/gen6_cc.c index cee139b..f5a7d4d 100644 --- a/src/mesa/drivers/dri/i965/gen6_cc.c +++ b/src/mesa/drivers/dri/i965/gen6_cc.c @@ -198,14 +198,14 @@ gen6_upload_blend_state(struct brw_context *brw) if(!is_buffer_zero_integer_format) { /* _NEW_MULTISAMPLE */ blend[b].blend1.alpha_to_coverage = - ctx->Multisample._Enabled && ctx->Multisample.SampleAlphaToCoverage; + _mesa_is_multisample_enabled(ctx) && ctx->Multisample.SampleAlphaToCoverage; /* From SandyBridge PRM, volume 2 Part 1, section 8.2.3, BLEND_STATE: * DWord 1, Bit 30 (AlphaToOne Enable): * "If Dual Source Blending is enabled, this bit must be disabled" */ WARN_ONCE(ctx->Color.Blend[b]._UsesDualSrc && - ctx->Multisample._Enabled && + _mesa_is_multisample_enabled(ctx) && ctx->Multisample.SampleAlphaToOne, "HW workaround: disabling alpha to one with dual src " "blending\n"); @@ -213,7 +213,7 @@ gen6_upload_blend_state(struct brw_context *brw) blend[b].blend1.alpha_to_one = false; else blend[b].blend1.alpha_to_one = - ctx->Multisample._Enabled && ctx->Multisample.SampleAlphaToOne; + _mesa_is_multisample_enabled(ctx) && ctx->Multisample.SampleAlphaToOne; blend[b].blend1.alpha_to_coverage_dither = (brw->gen >= 7); } |