nv50: remove NV50_PROG_{VERTEX,FRAGMENT}

diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index 1733cf97b76f065c9e40eed3208ee219e7363da0..6b8ba1bdfe5a82cea04906de6d7ba90a56640221 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -28,7 +28,10 @@
  * FUCK! watch dst==src vectors, can overwrite components that are needed.
  *     ie. SUB R0, R0.yzxw, R0
  *
- * NV50_PROG* -> PIPE_SHADER*
+ * Things to check with renouveau:
+ *     SGE/SLT with needed src0/1 swap
+ *     FP attr/result assignment - how?
+ *     FP/VP constbuf usage
  */
 struct nv50_reg {
        enum {
@@ -289,7 +292,7 @@ set_cseg(struct nv50_pc *pc, struct nv50_reg *src, unsigned *inst)
        if (src->type == P_IMMD) {
                inst[1] |= (NV50_CB_PMISC << 22);
        } else {
-               if (pc->p->type == NV50_PROG_VERTEX)
+               if (pc->p->type == PIPE_SHADER_VERTEX)
                        inst[1] |= (NV50_CB_PVP << 22);
                else
                        inst[1] |= (NV50_CB_PFP << 22);
@@ -1144,7 +1147,7 @@ nv50_program_tx_prep(struct nv50_pc *pc)
                if (!pc->attr)
                        goto out_err;
 
-               if (pc->p->type == NV50_PROG_FRAGMENT) {
+               if (pc->p->type == PIPE_SHADER_FRAGMENT) {
                        iv = alloc_temp(pc, NULL);
                        aid++;
                }
@@ -1153,7 +1156,7 @@ nv50_program_tx_prep(struct nv50_pc *pc)
                        struct nv50_reg *a = &pc->attr[i*4];
 
                        for (c = 0; c < 4; c++) {
-                               if (pc->p->type == NV50_PROG_FRAGMENT) {
+                               if (pc->p->type == PIPE_SHADER_FRAGMENT) {
                                        struct nv50_reg *at =
                                                alloc_temp(pc, NULL);
                                        pc->attr[i*4+c].type = at->type;
@@ -1168,7 +1171,7 @@ nv50_program_tx_prep(struct nv50_pc *pc)
                                }
                        }
 
-                       if (pc->p->type != NV50_PROG_FRAGMENT)
+                       if (pc->p->type != PIPE_SHADER_FRAGMENT)
                                continue;
 
                        emit_interp(pc, iv, iv, iv, FALSE);
@@ -1200,7 +1203,7 @@ nv50_program_tx_prep(struct nv50_pc *pc)
 
                for (i = 0; i < pc->result_nr; i++) {
                        for (c = 0; c < 4; c++) {
-                               if (pc->p->type == NV50_PROG_FRAGMENT) {
+                               if (pc->p->type == PIPE_SHADER_FRAGMENT) {
                                        pc->result[i*4+c].type = P_TEMP;
                                        pc->result[i*4+c].hw = -1;
                                } else {
@@ -1285,7 +1288,7 @@ nv50_program_tx(struct nv50_program *p)
                }
        }
 
-       if (p->type == NV50_PROG_FRAGMENT) {
+       if (p->type == PIPE_SHADER_FRAGMENT) {
                struct nv50_reg out;
 
                out.type = P_TEMP;
@@ -1314,7 +1317,7 @@ nv50_program_validate(struct nv50_context *nv50, struct nv50_program *p)
         * NOT immd - otherwise it's fucked fucked fucked */
        p->insns[p->insns_nr - 1] |= 0x00000001;
 
-       if (p->type == NV50_PROG_VERTEX) {
+       if (p->type == PIPE_SHADER_VERTEX) {
        for (i = 0; i < p->insns_nr; i++)
                NOUVEAU_ERR("VP0x%08x\n", p->insns[i]);
        } else {

diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 48d09c296bb94f94ef6fc2ef6ef347937191c082..774117326adc9869f95bb5fd4f534e69c78c5c50 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -331,7 +331,7 @@ nv50_vp_state_create(struct pipe_context *pipe,
        struct nv50_program *p = CALLOC_STRUCT(nv50_program);
 
        p->pipe = *cso;
-       p->type = NV50_PROG_VERTEX;
+       p->type = PIPE_SHADER_VERTEX;
        tgsi_scan_shader(p->pipe.tokens, &p->info);
        return (void *)p;
 }
@@ -361,7 +361,7 @@ nv50_fp_state_create(struct pipe_context *pipe,
        struct nv50_program *p = CALLOC_STRUCT(nv50_program);
 
        p->pipe = *cso;
-       p->type = NV50_PROG_FRAGMENT;
+       p->type = PIPE_SHADER_FRAGMENT;
        tgsi_scan_shader(p->pipe.tokens, &p->info);
        return (void *)p;
 }

diff --git a/src/gallium/drivers/nv50/nv50_state.h b/src/gallium/drivers/nv50/nv50_state.h
index dd352b658567e5693a5c1e668a4bba64e3c3175c..d568bf610d50316f207f032e1811dba69616d948 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state.h
+++ b/src/gallium/drivers/nv50/nv50_state.h
@@ -15,10 +15,7 @@ struct nv50_program {
        struct tgsi_shader_info info;
        boolean translated;
 
-       enum {
-               NV50_PROG_VERTEX,
-               NV50_PROG_FRAGMENT
-       } type;
+       unsigned type;
        unsigned *insns;
        unsigned insns_nr;