From: Luca Barbieri <luca@luca-barbieri.com>
Date: Sat, 21 Aug 2010 18:23:41 +0000 (+0200)
Subject: nvfx: slightly improve handling of overlong vps
X-Git-Tag: mesa-7.9-rc1~964
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8e210eb111324482450c8bdbb19e29a805b088e;p=platform%2Fupstream%2Fmesa.git

nvfx: slightly improve handling of overlong vps
---

diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c b/src/gallium/drivers/nvfx/nvfx_vertprog.c
index 8ca7cfe..7cccffe 100644
--- a/src/gallium/drivers/nvfx/nvfx_vertprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_vertprog.c
@@ -1110,7 +1110,11 @@ nvfx_vertprog_validate(struct nvfx_context *nvfx)
 			}
 
 			if (nouveau_resource_alloc(heap, vplen, vp, &vp->exec))
-				assert(0);
+			{
+				debug_printf("Vertex shader too long: %u instructions\n", vplen);
+				nvfx->fallback_swtnl |= NVFX_NEW_VERTPROG;
+				return FALSE;
+			}
 		}
 
 		upload_code = TRUE;
@@ -1129,7 +1133,11 @@ nvfx_vertprog_validate(struct nvfx_context *nvfx)
 			}
 
 			if (nouveau_resource_alloc(heap, vp->nr_consts, vp, &vp->data))
-				assert(0);
+                        {
+                                debug_printf("Vertex shader uses too many constants: %u constants\n", vp->nr_consts);
+                                nvfx->fallback_swtnl |= NVFX_NEW_VERTPROG;
+                                return FALSE;
+                        }
 		}
 
 		/*XXX: handle this some day */