From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Tue, 16 Feb 2016 06:18:30 +0000 (-0500)
Subject: mesa: gl_NumSamples should always be at least one
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12e3ad2ae98a560e2527f4f28423920a15570590;p=mesa.git

mesa: gl_NumSamples should always be at least one

From ARB_sample_shading:

    "gl_NumSamples is the total number of samples in the framebuffer,
     or one if rendering to a non-multisample framebuffer"

So make sure to always pass in at least 1.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Edward O`Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
---

diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index eed241271df..489f75fd577 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -353,7 +353,7 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
       }
       return;
    case STATE_NUM_SAMPLES:
-      ((int *)value)[0] = _mesa_geometric_samples(ctx->DrawBuffer);
+      ((int *)value)[0] = MAX2(1, _mesa_geometric_samples(ctx->DrawBuffer));
       return;
    case STATE_DEPTH_RANGE:
       value[0] = ctx->ViewportArray[0].Near;                /* near       */