Mesa (master): mesa/main: fix meta caller of _mesa_ClampColor
Nicolai Hähnle
nh at kemper.freedesktop.org
Thu Jan 19 08:29:35 UTC 2017
Module: Mesa
Branch: master
Commit: a7c635ec6589f600f0d52d0097774ea0b938de9f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7c635ec6589f600f0d52d0097774ea0b938de9f
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Mon Jan 16 12:13:50 2017 +0100
mesa/main: fix meta caller of _mesa_ClampColor
Since _mesa_ClampColor properly checks for support of the API function
now, it's meta callers need to check support as well.
Fixes: 963311b71f ("mesa/main: fix version/extension checks in _mesa_ClampColor")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99401
Tested-by: Mark Janes <mark.a.janes at intel.com>
Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Cc: "17.0" <mesa-stable at lists.freedesktop.org>
---
src/mesa/main/attrib.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 9c7f5ed..ada2203 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1071,7 +1071,8 @@ _mesa_PopAttrib(void)
if (ctx->Extensions.ARB_color_buffer_float)
_mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR_ARB,
color->ClampFragmentColor);
- _mesa_ClampColor(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
+ if (ctx->Extensions.ARB_color_buffer_float || ctx->Version >= 30)
+ _mesa_ClampColor(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
/* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
if (ctx->Extensions.EXT_framebuffer_sRGB)
More information about the mesa-commit
mailing list