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

Author: Nicolai Hähnle <[email protected]>
Date:   Mon Feb 15 22:00:04 2016 -0500

st/mesa: count shader images in MaxCombinedShaderOutputResources

Reviewed-by: Ilia Mirkin <[email protected]>

---

 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 57eeed6..9077add 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) {

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to