Just a heads-up, this patch conflicts with this one:
https://patchwork.freedesktop.org/patch/239169/
Your were sent out first, so I'll be happy to rebase mine when this has
landed...
On 13. juli 2018 14:46, Gert Wollny wrote:
Fixes: 91f48cdfe5c817158c533a8f67c60e9aabbe4479
virgl: Add support for glGetMultisample
Signed-off-by: Gert Wollny <gert.wol...@collabora.com>
---
src/gallium/drivers/virgl/virgl_context.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/virgl/virgl_context.c
b/src/gallium/drivers/virgl/virgl_context.c
index d985bf906f..f5e3832d99 100644
--- a/src/gallium/drivers/virgl/virgl_context.c
+++ b/src/gallium/drivers/virgl/virgl_context.c
@@ -943,11 +943,11 @@ static void virgl_get_sample_position(struct pipe_context
*ctx,
return;
} else if (sample_count == 2) {
bits = vs->caps.caps.v2.msaa_sample_positions[0] >> (8 * index);
- } else if (sample_count < 4) {
+ } else if (sample_count <= 4) {
bits = vs->caps.caps.v2.msaa_sample_positions[1] >> (8 * index);
- } else if (sample_count < 8) {
+ } else if (sample_count <= 8) {
bits = vs->caps.caps.v2.msaa_sample_positions[2 + (index >> 2)] >> (8 *
(index & 3));
- } else if (sample_count < 8) {
+ } else if (sample_count <= 16) {
bits = vs->caps.caps.v2.msaa_sample_positions[4 + (index >> 2)] >> (8 *
(index & 3));
}
out_value[0] = ((bits >> 4) & 0xf) / 16.0f;
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
