nvfx: Add support for two sided color

This patch adds support for two-sided vertex color to nv30/nv40.

When set, the COLOR0/1 fs inputs on back faces will be wired to vs outputs BCOLOR0/1.
This makes OpenGL two sided lighting work, which can be tested with progs/demos/projtex.

diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index fea05ac81ab6c708168c333c744ea4f84881882e..e2c6d09fa19b6843fa16b3c718f817990c212ff2 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -46,7 +46,7 @@
 struct nvfx_rasterizer_state {
        struct pipe_rasterizer_state pipe;
        unsigned sb_len;
-       uint32_t sb[30];
+       uint32_t sb[32];
 };
 
 struct nvfx_zsa_state {

diff --git a/src/gallium/drivers/nvfx/nvfx_state.c b/src/gallium/drivers/nvfx/nvfx_state.c
index 0f03c2eb3d5a460c89f3edd4f89e1668fe4fd960..315de492dab2c4d143b00ffa3a1b9fda2fe8a22e 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_state.c
+++ b/src/gallium/drivers/nvfx/nvfx_state.c
@@ -193,7 +193,6 @@ nvfx_rasterizer_state_create(struct pipe_context *pipe,
        struct nouveau_statebuf_builder sb = sb_init(rsso->sb);
 
        /*XXX: ignored:
-        *      light_twoside
         *      point_smooth -nohw
         *      multisample
         */
@@ -202,6 +201,9 @@ nvfx_rasterizer_state_create(struct pipe_context *pipe,
        sb_data(sb, cso->flatshade ? NV34TCL_SHADE_MODEL_FLAT :
                                       NV34TCL_SHADE_MODEL_SMOOTH);
 
+       sb_method(sb, NV34TCL_VERTEX_TWO_SIDE_ENABLE, 1);
+       sb_data(sb, cso->light_twoside);
+
        sb_method(sb, NV34TCL_LINE_WIDTH, 2);
        sb_data(sb, (unsigned char)(cso->line_width * 8.0) & 0xff);
        sb_data(sb, cso->line_smooth ? 1 : 0);