r300: Indented radeon_span.h

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_shader_0.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c b/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
index abba59dc0c26984229f26f73ba47bafea4ff0506..8c203cc664baa6603e29c59723ca916ac7bc1718 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
@@ -264,6 +264,23 @@ pass0_make_mask(GLuint mesa_mask)
        return mask;
 }
 
+static GLboolean
+pass0_opcode_is_tex(enum prog_opcode op)
+{
+       switch (op) {
+       case OPCODE_TEX:
+       case OPCODE_TXB:
+       case OPCODE_TXD:
+       case OPCODE_TXL:
+       case OPCODE_TXP:
+               return GL_TRUE;
+       default:
+               break;
+       }
+
+       return GL_FALSE;
+}
+
 static nvsTexTarget
 pass0_make_tex_target(GLuint mesa)
 {
@@ -724,7 +741,11 @@ pass0_translate_arith(nouveauShader *nvs, struct gl_program *prog,
                                (inst->SaturateMode != SATURATE_OFF),
                                src[0], src[1], src[2]);
                nvsinst->tex_unit   = inst->TexSrcUnit;
-               nvsinst->tex_target = pass0_make_tex_target(inst->TexSrcTarget);
+               if (pass0_opcode_is_tex(inst->Opcode))
+                       nvsinst->tex_target =
+                               pass0_make_tex_target(inst->TexSrcTarget);
+               else
+                       nvsinst->tex_target = NVS_TEX_TARGET_UNKNOWN;
 
                ret = GL_TRUE;
        } else
@@ -907,7 +928,7 @@ pass0_rebase_mesa_consts(nouveauShader *nvs)
        }
 }
 
-static void
+static GLboolean
 pass0_resolve_mesa_consts(nouveauShader *nvs)
 {
        struct pass0_rec *rec = nvs->pass_rec;
@@ -928,6 +949,11 @@ pass0_resolve_mesa_consts(nouveauShader *nvs)
        for (i=0; i<plist->NumParameters; i++) {
                int hw = rec->mesa_const_base + i;
 
+               if (hw > NVS_MAX_CONSTS) {
+                       nvsProgramError(nvs, "hw = %d > NVS_MAX_CONSTS!\n", hw);
+                       return GL_FALSE;
+               }
+
                switch (plist->Parameters[i].Type) {
                case PROGRAM_NAMED_PARAM:
                case PROGRAM_STATE_VAR:
@@ -941,10 +967,13 @@ pass0_resolve_mesa_consts(nouveauShader *nvs)
                        COPY_4V(nvs->params[hw].val, plist->ParameterValues[i]);
                        break;
                default:
-                       assert(0);
-                       break;
+                       nvsProgramError(nvs, "hit bad type=%d on param %d\n",
+                                       plist->Parameters[i].Type, i);
+                       return GL_FALSE;
                }
        }
+
+       return GL_TRUE;
 }
 
 GLboolean
@@ -957,6 +986,16 @@ nouveau_shader_pass0(GLcontext *ctx, nouveauShader *nvs)
        struct pass0_rec *rec;
        int ret = GL_FALSE;
 
+       NVSDBG("start: nvs=%p\n", nvs);
+
+       /* Previously detected an error, and haven't recieved new program
+        * string, so fail immediately.
+        */
+       if (nvs->error) {
+               NVSDBG("failed previous compile attempt, not retrying\n");
+               return GL_FALSE;
+       }
+
        rec = CALLOC_STRUCT(pass0_rec);
        if (!rec)
                return GL_FALSE;
@@ -1001,7 +1040,8 @@ nouveau_shader_pass0(GLcontext *ctx, nouveauShader *nvs)
 
        ret = pass0_translate_instructions(nvs, 0, 0, nvs->program_tree);
        if (ret)
-               pass0_resolve_mesa_consts(nvs);
+               ret = pass0_resolve_mesa_consts(nvs);   
+       
        /*XXX: if (!ret) DESTROY TREE!!! */
 
        FREE(rec);