diff options
| author | Brian Paul <[email protected]> | 2012-08-30 08:45:13 -0600 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-08-30 08:28:19 -0700 |
| commit | 055093e33fc90705c429e948caefedf0e0fb82af (patch) | |
| tree | 4296944340cdd9196d7c07ed77d7b718a748af0d /src/mesa/main | |
| parent | aad7ccd261e67e9d943dcab17ebe8082d7b6f4d9 (diff) | |
meta: remove call to _meta_in_progress(), fix multisample enable/disable
This partially reverts d638da23d2ec2e9c52655b1ea138249e7f8bcccb.
With gallium the meta code is not always built so the call to
_meta_in_progress() was unresolved. Simply special-case the
GL_MULTISAMPLE case in the meta code. There might be other special
cases in the future given all the differences between legacy GL,
core GL, GLES, etc.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=54234
and https://bugs.freedesktop.org/show_bug.cgi?id=54239
v2 (Paul Berry <[email protected]>): keep _meta_in_progress
function, since it's needed by the i965 driver, but don't call it from
core mesa.
Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/enable.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index b713f5f2c44..14eea53fefd 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -765,13 +765,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) /* GL_ARB_multisample */ case GL_MULTISAMPLE_ARB: - /* Technically speaking, this should not be allowed for OpenGL ES 2.0 - * or 3.0. However, meta really needs it. - */ - if (!_mesa_meta_in_progress(ctx) && !_mesa_is_desktop_gl(ctx) - && ctx->API != API_OPENGLES) + if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES) goto invalid_enum_error; - if (ctx->Multisample.Enabled == state) return; FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE); |