From 2de9317d5f4664fbf86058a386fab085d1bd6cdc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Nicolai=20H=C3=A4hnle?= <nicolai.haehnle@amd.com>
Date: Mon, 15 Feb 2016 22:00:04 -0500
Subject: [PATCH] st/mesa: count shader images in
 MaxCombinedShaderOutputResources

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
---
 src/mesa/state_tracker/st_extensions.c | 1 +
 1 file changed, 1 insertion(+)

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) {
-- 
2.30.2