From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Tue, 16 Feb 2016 03:00:04 +0000 (-0500)
Subject: st/mesa: count shader images in MaxCombinedShaderOutputResources
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2de9317d5f4664fbf86058a386fab085d1bd6cdc;p=mesa.git

st/mesa: count shader images in MaxCombinedShaderOutputResources

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 57eeed66639..9077added7c 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -382,6 +382,7 @@ void st_init_limits(struct pipe_screen *screen,
          c->Program[MESA_SHADER_GEOMETRY].MaxImageUniforms +
          c->Program[MESA_SHADER_FRAGMENT].MaxImageUniforms +
          c->Program[MESA_SHADER_COMPUTE].MaxImageUniforms;
+   c->MaxCombinedShaderOutputResources += c->MaxCombinedImageUniforms;
    c->MaxImageUnits = MAX_IMAGE_UNITS;
    c->MaxImageSamples = 0; /* XXX */
    if (c->MaxCombinedImageUniforms) {