r300: Take PROGRAM_CONSTANT into account.
authorMarkus Amsler <markus.amsler@oribi.org>
Sun, 30 Mar 2008 16:10:47 +0000 (16:10 +0000)
committerOliver McFadden <z3ro.geek@gmail.com>
Sun, 30 Mar 2008 16:10:47 +0000 (16:10 +0000)
This bug was introduced by commit 978145a075255ae153ee05c2a037400e61558079.

src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_vertprog.c

index 78ed44b09c77802565241fbe8578b3eb23ae8df6..c664fb6562d6d8bf660d9b16a11fa82a450dd97e 100644 (file)
@@ -736,6 +736,7 @@ static GLuint t_src(struct r300_fragment_program *fp,
                break;
        case PROGRAM_STATE_VAR:
        case PROGRAM_NAMED_PARAM:
+       case PROGRAM_CONSTANT:
                r = emit_const4fv(fp,
                                  fp->mesa_program.Base.Parameters->
                                  ParameterValues[fpsrc.Index]);
index e741eb9b1960577b18f25e1e535cd96dc43f5459..89ccca7dae09d332bf54cbd1d29e0d87dfa880ea 100644 (file)
@@ -171,6 +171,7 @@ static unsigned long t_src_class(enum register_file file)
        case PROGRAM_LOCAL_PARAM:
        case PROGRAM_ENV_PARAM:
        case PROGRAM_NAMED_PARAM:
+       case PROGRAM_CONSTANT:
        case PROGRAM_STATE_VAR:
                return PVS_SRC_REG_CONSTANT;
                /*