summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2016-10-10 11:29:14 -0600
committerBrian Paul <[email protected]>2016-10-13 17:38:49 -0600
commitff00ab745c9a9d6ef35239ea656a5db0c76de52d (patch)
tree0ea17a68c9eeafdb5d43b2ebaf8105ca1a131a92 /src/mesa/drivers
parenta710c21ac200fc1c80a6209862e837f0a75f4cc5 (diff)
mesa: replace gl_framebuffer::_IntegerColor wih _IntegerBuffers
Use a bitmask to indicate which color buffers are integer-valued, rather than a bool. Also, the old field was mis-computed. If an integer buffer was followed by a non-integer buffer, the _IntegerColor field was wrongly set to false. This fixes the new piglit gl-3.1-mixed-int-float-fbo test. Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/common/meta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index fdc4748602f..890e98a06b6 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1750,7 +1750,7 @@ meta_clear(struct gl_context *ctx, GLbitfield buffers, bool glsl)
z = invert_z(ctx->Depth.Clear);
}
- if (fb->_IntegerColor) {
+ if (fb->_IntegerBuffers) {
assert(glsl);
_mesa_meta_use_program(ctx, clear->IntegerShaderProg);
_mesa_Uniform4iv(0, 1, ctx->Color.ClearColor.i);