Mesa (master): nv50, nvc0: initialize ctx->sample_mask to ~0
Maarten Lankhorst
mlankhorst at kemper.freedesktop.org
Thu Jan 16 18:26:13 UTC 2014
Module: Mesa
Branch: master
Commit: dd687fb8d090f08d09ac5e350a92f38ded837788
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd687fb8d090f08d09ac5e350a92f38ded837788
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun Jan 12 15:01:29 2014 -0500
nv50, nvc0: initialize ctx->sample_mask to ~0
Commit 95bf222603b (cso_context: Fix cso_context::sample_mask initial
value.) fixed the cso sample mask to be initialized to ~0. The cso code
is also careful not to needlessly call set_sample_mask, so we ended up
with the ctx->sample_mask never being set. This broke a number of
EXT_framebuffer_multisample piglit tests.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
src/gallium/drivers/nouveau/nv50/nv50_state.c | 2 ++
src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c
index b6a180e..87dd07f 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_state.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c
@@ -1123,4 +1123,6 @@ nv50_init_state_functions(struct nv50_context *nv50)
pipe->create_stream_output_target = nv50_so_target_create;
pipe->stream_output_target_destroy = nv50_so_target_destroy;
pipe->set_stream_output_targets = nv50_set_stream_output_targets;
+
+ nv50->sample_mask = ~0;
}
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
index 4b8632a..0213a8e 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
@@ -1229,4 +1229,6 @@ nvc0_init_state_functions(struct nvc0_context *nvc0)
pipe->set_global_binding = nvc0_set_global_bindings;
pipe->set_compute_resources = nvc0_set_compute_resources;
pipe->set_shader_resources = nvc0_set_shader_resources;
+
+ nvc0->sample_mask = ~0;
}
More information about the mesa-commit
mailing list