From: Marek Olšák <maraeo@gmail.com>
Date: Mon, 26 Apr 2010 02:52:28 +0000 (+0200)
Subject: r300g: use the dummy FS shader for shaders with zero instructions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=537d117ed57734d034560cc64fe1bed65a6375e3;p=mesa.git

r300g: use the dummy FS shader for shaders with zero instructions
---

diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c
index 4d61f638530..88303f074cd 100644
--- a/src/gallium/drivers/r300/r300_fs.c
+++ b/src/gallium/drivers/r300/r300_fs.c
@@ -275,6 +275,14 @@ static void r300_translate_fragment_shader(
     /* Invoke the compiler */
     r3xx_compile_fragment_program(&compiler);
 
+    /* Shaders with zero instructions are invalid,
+     * use the dummy shader instead. */
+    if (shader->code.code.r500.inst_end == -1) {
+        rc_destroy(&compiler.Base);
+        r300_dummy_fragment_shader(r300, shader);
+        return;
+    }
+
     if (compiler.Base.Error) {
         fprintf(stderr, "r300 FP: Compiler Error:\n%sUsing a dummy shader"
                 " instead.\n", compiler.Base.ErrorMsg);