summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Song <henry.song@samsung.com>2013-01-25 12:45:10 -0800
committerMartin Robinson <mrobinson@igalia.com>2013-01-25 12:45:10 -0800
commita44b8bd70683a92d862b11c2d7359ce2b0a6a968 (patch)
tree3c18d39e31eb58812a079c8fcb34303dfe5114af
parentbb4072046016610a510373df3b67cdeb2ac1b583 (diff)
gl: Fix typos in multisampling detection
Instead of looking for the EXT_framebuffer_multisample, this code should look for GL_EXT_framebuffer_multisample. GL_ARB_framebuffer_object also contains all necessary API for using multisampling, so we don't need to check for both it and the GL_EXT_framebuffer_blit and GL_EXT_framebuffer_multisample pair.
-rw-r--r--src/cairo-gl-device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cairo-gl-device.c b/src/cairo-gl-device.c
index 7dddd127..22297b33 100644
--- a/src/cairo-gl-device.c
+++ b/src/cairo-gl-device.c
@@ -256,9 +256,9 @@ _cairo_gl_context_init (cairo_gl_context_t *ctx)
#if CAIRO_HAS_GL_SURFACE
if (is_desktop && ctx->has_packed_depth_stencil &&
(gl_version >= CAIRO_GL_VERSION_ENCODE (3, 0) ||
- (_cairo_gl_has_extension ("GL_ARB_framebuffer_object") &&
- _cairo_gl_has_extension ("GL_EXT_framebuffer_blit") &&
- _cairo_gl_has_extension ("EXT_framebuffer_multisample")))) {
+ _cairo_gl_has_extension ("GL_ARB_framebuffer_object") ||
+ (_cairo_gl_has_extension ("GL_EXT_framebuffer_blit") &&
+ _cairo_gl_has_extension ("GL_EXT_framebuffer_multisample")))) {
glGetIntegerv(GL_MAX_SAMPLES_EXT, &ctx->num_samples);
}
#endif