i965/gs: implement EndPrimitive() functionality in the visitor.

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

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_frag.c b/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
index ab713f9dbf5f64be46a8e485faf3d6c8fafb7ee7..467b762fa0330ee50d751803f12b189ce43d2b45 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
@@ -27,7 +27,7 @@
 #include "nouveau_driver.h"
 #include "nouveau_context.h"
 #include "nouveau_gldefs.h"
-#include "nouveau_class.h"
+#include "nv10_3d.xml.h"
 #include "nouveau_util.h"
 #include "nv10_driver.h"
 #include "nv20_driver.h"
@@ -41,27 +41,27 @@
 #define RC_IN_SHIFT_G  40
 
 #define RC_IN_SOURCE(source)                           \
-       ((uint64_t)NV10TCL_RC_IN_RGB_D_INPUT_##source)
+       ((uint64_t)NV10_3D_RC_IN_RGB_D_INPUT_##source)
 #define RC_IN_USAGE(usage)                                     \
-       ((uint64_t)NV10TCL_RC_IN_RGB_D_COMPONENT_USAGE_##usage)
+       ((uint64_t)NV10_3D_RC_IN_RGB_D_COMPONENT_USAGE_##usage)
 #define RC_IN_MAPPING(mapping)                                 \
-       ((uint64_t)NV10TCL_RC_IN_RGB_D_MAPPING_##mapping)
+       ((uint64_t)NV10_3D_RC_IN_RGB_D_MAPPING_##mapping)
 
-#define RC_OUT_BIAS    NV10TCL_RC_OUT_RGB_BIAS_BIAS_BY_NEGATIVE_ONE_HALF
-#define RC_OUT_SCALE_1 NV10TCL_RC_OUT_RGB_SCALE_NONE
-#define RC_OUT_SCALE_2 NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_TWO
-#define RC_OUT_SCALE_4 NV10TCL_RC_OUT_RGB_SCALE_SCALE_BY_FOUR
+#define RC_OUT_BIAS    NV10_3D_RC_OUT_RGB_BIAS_BIAS_BY_NEGATIVE_ONE_HALF
+#define RC_OUT_SCALE_1 NV10_3D_RC_OUT_RGB_SCALE_NONE
+#define RC_OUT_SCALE_2 NV10_3D_RC_OUT_RGB_SCALE_SCALE_BY_TWO
+#define RC_OUT_SCALE_4 NV10_3D_RC_OUT_RGB_SCALE_SCALE_BY_FOUR
 
 /* Make the combiner do: spare0_i = A_i * B_i */
-#define RC_OUT_AB      NV10TCL_RC_OUT_RGB_AB_OUTPUT_SPARE0
+#define RC_OUT_AB      NV10_3D_RC_OUT_RGB_AB_OUTPUT_SPARE0
 /* spare0_i = dot3(A, B) */
-#define RC_OUT_DOT_AB  (NV10TCL_RC_OUT_RGB_AB_OUTPUT_SPARE0 |  \
-                        NV10TCL_RC_OUT_RGB_AB_DOT_PRODUCT)
+#define RC_OUT_DOT_AB  (NV10_3D_RC_OUT_RGB_AB_OUTPUT_SPARE0 |  \
+                        NV10_3D_RC_OUT_RGB_AB_DOT_PRODUCT)
 /* spare0_i = A_i * B_i + C_i * D_i */
-#define RC_OUT_SUM     NV10TCL_RC_OUT_RGB_SUM_OUTPUT_SPARE0
+#define RC_OUT_SUM     NV10_3D_RC_OUT_RGB_SUM_OUTPUT_SPARE0
 
 struct combiner_state {
-       GLcontext *ctx;
+       struct gl_context *ctx;
        int unit;
        GLboolean premodulate;
 
@@ -298,7 +298,7 @@ setup_combiner(struct combiner_state *rc)
 }
 
 void
-nv10_get_general_combiner(GLcontext *ctx, int i,
+nv10_get_general_combiner(struct gl_context *ctx, int i,
                          uint32_t *a_in, uint32_t *a_out,
                          uint32_t *c_in, uint32_t *c_out, uint32_t *k)
 {
@@ -328,7 +328,7 @@ nv10_get_general_combiner(GLcontext *ctx, int i,
 }
 
 void
-nv10_get_final_combiner(GLcontext *ctx, uint64_t *in, int *n)
+nv10_get_final_combiner(struct gl_context *ctx, uint64_t *in, int *n)
 {
        struct combiner_state rc = {};
 
@@ -366,11 +366,10 @@ nv10_get_final_combiner(GLcontext *ctx, uint64_t *in, int *n)
 }
 
 void
-nv10_emit_tex_env(GLcontext *ctx, int emit)
+nv10_emit_tex_env(struct gl_context *ctx, int emit)
 {
        const int i = emit - NOUVEAU_STATE_TEX_ENV0;
-       struct nouveau_channel *chan = context_chan(ctx);
-       struct nouveau_grobj *celsius = context_eng3d(ctx);
+       struct nouveau_pushbuf *push = context_push(ctx);
        uint32_t a_in, a_out, c_in, c_out, k;
 
        nv10_get_general_combiner(ctx, i, &a_in, &a_out, &c_in, &c_out, &k);
@@ -383,31 +382,30 @@ nv10_emit_tex_env(GLcontext *ctx, int emit)
                        c_out |= 0x3 << 27;
        }
 
-       BEGIN_RING(chan, celsius, NV10TCL_RC_IN_ALPHA(i), 1);
-       OUT_RING(chan, a_in);
-       BEGIN_RING(chan, celsius, NV10TCL_RC_IN_RGB(i), 1);
-       OUT_RING(chan, c_in);
-       BEGIN_RING(chan, celsius, NV10TCL_RC_COLOR(i), 1);
-       OUT_RING(chan, k);
-       BEGIN_RING(chan, celsius, NV10TCL_RC_OUT_ALPHA(i), 1);
-       OUT_RING(chan, a_out);
-       BEGIN_RING(chan, celsius, NV10TCL_RC_OUT_RGB(i), 1);
-       OUT_RING(chan, c_out);
+       BEGIN_NV04(push, NV10_3D(RC_IN_ALPHA(i)), 1);
+       PUSH_DATA (push, a_in);
+       BEGIN_NV04(push, NV10_3D(RC_IN_RGB(i)), 1);
+       PUSH_DATA (push, c_in);
+       BEGIN_NV04(push, NV10_3D(RC_COLOR(i)), 1);
+       PUSH_DATA (push, k);
+       BEGIN_NV04(push, NV10_3D(RC_OUT_ALPHA(i)), 1);
+       PUSH_DATA (push, a_out);
+       BEGIN_NV04(push, NV10_3D(RC_OUT_RGB(i)), 1);
+       PUSH_DATA (push, c_out);
 
        context_dirty(ctx, FRAG);
 }
 
 void
-nv10_emit_frag(GLcontext *ctx, int emit)
+nv10_emit_frag(struct gl_context *ctx, int emit)
 {
-       struct nouveau_channel *chan = context_chan(ctx);
-       struct nouveau_grobj *celsius = context_eng3d(ctx);
+       struct nouveau_pushbuf *push = context_push(ctx);
        uint64_t in;
        int n;
 
        nv10_get_final_combiner(ctx, &in, &n);
 
-       BEGIN_RING(chan, celsius, NV10TCL_RC_FINAL0, 2);
-       OUT_RING(chan, in);
-       OUT_RING(chan, in >> 32);
+       BEGIN_NV04(push, NV10_3D(RC_FINAL0), 2);
+       PUSH_DATA (push, in);
+       PUSH_DATA (push, in >> 32);
 }