Mesa (master): st/mesa: get max supported number of image samples from driver

[Ilia Mirkin]

Module: Mesa
Branch: master
Commit: 6f4d35212b9566125cee4c2b749f8baa2a6fc031
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f4d35212b9566125cee4c2b749f8baa2a6fc031

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Jun 29 00:11:57 2016 -0400

st/mesa: get max supported number of image samples from driver

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_extensions.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 412f598..c5ecd5a 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -443,7 +443,6 @@ void st_init_limits(struct pipe_screen *screen,
          c->Program[MESA_SHADER_COMPUTE].MaxImageUniforms;
    c->MaxCombinedShaderOutputResources += c->MaxCombinedImageUniforms;
    c->MaxImageUnits = MAX_IMAGE_UNITS;
-   c->MaxImageSamples = 0; /* XXX */
    if (c->MaxCombinedImageUniforms) {
       extensions->ARB_shader_image_load_store = GL_TRUE;
       extensions->ARB_shader_image_size = GL_TRUE;
@@ -988,6 +987,11 @@ void st_init_extensions(struct pipe_screen *screen,
                                      color_formats, 16,
                                      PIPE_BIND_RENDER_TARGET);
 
+      consts->MaxImageSamples =
+         get_max_samples_for_formats(screen, ARRAY_SIZE(color_formats),
+                                     color_formats, 16,
+                                     PIPE_BIND_SHADER_IMAGE);
+
       consts->MaxColorTextureSamples =
          get_max_samples_for_formats(screen, ARRAY_SIZE(color_formats),
                                      color_formats, consts->MaxSamples,