r300: Add a basic dirty state emit.

I feel strangely unproductive. Must be the cold.

diff --git a/src/gallium/drivers/r300/Makefile b/src/gallium/drivers/r300/Makefile
index bce7dcb..644e6d0 100644 (file)
--- a/src/gallium/drivers/r300/Makefile
+++ b/src/gallium/drivers/r300/Makefile
@@ -7,6 +7,7 @@ C_SOURCES = \
        r300_blit.c \
        r300_clear.c \
        r300_context.c \
+       r300_emit.c \
        r300_screen.c \
        r300_state.c \
        r300_surface.c

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 4cbbf96..ad1e4fc 100644 (file)
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -30,8 +30,8 @@
 #include "r300_screen.h"
 
 struct r300_blend_state {
-    uint32_t blend_control;       /* R300_RB3D_BLENDCNTL: 0x4e04 */
-    uint32_t alpha_blend_control; /* R300_RB3D_ABLENDCNTL: 0x4e08 */
+    uint32_t blend_control;       /* R300_RB3D_CBLEND: 0x4e04 */
+    uint32_t alpha_blend_control; /* R300_RB3D_ABLEND: 0x4e08 */
     uint32_t rop;                 /* R300_RB3D_ROPCNTL: 0x4e18 */
     uint32_t dither;              /* R300_RB3D_DITHER_CTL: 0x4e50 */
 };
@@ -51,16 +51,16 @@ struct r300_dsa_state {
     uint32_t z_stencil_control; /* R300_ZB_ZSTENCILCNTL: 0x4f04 */
     uint32_t stencil_ref_mask;  /* R300_ZB_STENCILREFMASK: 0x4f08 */
     uint32_t z_buffer_top;      /* R300_ZB_ZTOP: 0x4f14 */
-    uint32_t stencil_ref_bf;    /* R300_ZB_STENCILREFMASK_BF: 0x4fd4 */
+    uint32_t stencil_ref_bf;    /* R500_ZB_STENCILREFMASK_BF: 0x4fd4 */
 };
 
 struct r300_rs_state {
-    uint32_t polygon_offset_enable; /* R300_SU_POLY_OFFSET_ENABLE: 0x42b4 */
-    uint32_t cull_mode;             /* R300_SU_CULL_MODE: 0x42b8 */
     uint32_t depth_scale_front;     /* R300_SU_POLY_OFFSET_FRONT_SCALE: 0x42a4 */
     uint32_t depth_offset_front;    /* R300_SU_POLY_OFFSET_FRONT_OFFSET: 0x42a8 */
     uint32_t depth_scale_back;      /* R300_SU_POLY_OFFSET_BACK_SCALE: 0x42ac */
     uint32_t depth_offset_back;     /* R300_SU_POLY_OFFSET_BACK_OFFSET: 0x42b0 */
+    uint32_t polygon_offset_enable; /* R300_SU_POLY_OFFSET_ENABLE: 0x42b4 */
+    uint32_t cull_mode;             /* R300_SU_CULL_MODE: 0x42b8 */
 };
 
 struct r300_scissor_state {
@@ -73,6 +73,7 @@ struct r300_scissor_state {
 #define R300_NEW_DSA            0x04
 #define R300_NEW_RS             0x08
 #define R300_NEW_SCISSOR        0x10
+#define R300_NEW_KITCHEN_SINK   0x1f
 
 struct r300_context {
     /* Parent class */

diff --git a/src/gallium/drivers/r300/r300_cs.h b/src/gallium/drivers/r300/r300_cs.h
index 92ed807..3dacf25 100644 (file)
--- a/src/gallium/drivers/r300/r300_cs.h
+++ b/src/gallium/drivers/r300/r300_cs.h
@@ -37,6 +37,9 @@
 #define RADEON_GEM_DOMAIN_GTT  0x2
 #define RADEON_GEM_DOMAIN_VRAM 0x4
 
+/* XXX stolen from radeon_reg.h */
+#define RADEON_CP_PACKET0 0x0
+
 #define CP_PACKET0(register, count) \
     (RADEON_CP_PACKET0 | ((count) << 16) | ((register) >> 2))
 

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
new file mode 100644 (file)
index 0000000..8662830
--- /dev/null
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2008 Corbin Simpson <MostAwesomeDude@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE. */
+
+/* r300_emit: Functions for emitting state. */
+
+#include "r300_context.h"
+#include "r300_cs.h"
+#include "r300_screen.h"
+
+static void r300_emit_dirty_state(struct r300_context* r300)
+{
+    struct r300_screen* r300screen = (struct r300_screen*)r300->context.screen;
+    CS_LOCALS(r300);
+
+    /* XXX check size */
+
+    if (r300->dirty_state & R300_NEW_BLEND) {
+        struct r300_blend_state* blend = r300->blend_state;
+        /* XXX next two are contiguous regs */
+        OUT_CS_REG(R300_RB3D_CBLEND, blend->blend_control);
+        OUT_CS_REG(R300_RB3D_ABLEND, blend->alpha_blend_control);
+        OUT_CS_REG(R300_RB3D_ROPCNTL, blend->rop);
+        OUT_CS_REG(R300_RB3D_DITHER_CTL, blend->dither);
+    }
+
+    if (r300->dirty_state & R300_NEW_BLEND_COLOR) {
+        struct r300_blend_color_state* blend_color = r300->blend_color_state;
+        if (r300screen->is_r500) {
+            /* XXX next two are contiguous regs */
+            OUT_CS_REG(R500_RB3D_CONSTANT_COLOR_AR,
+                       blend_color->blend_color_red_alpha);
+            OUT_CS_REG(R500_RB3D_CONSTANT_COLOR_GB,
+                       blend_color->blend_color_green_blue);
+        } else {
+            OUT_CS_REG(R300_RB3D_BLEND_COLOR,
+                       blend_color->blend_color);
+        }
+    }
+
+    if (r300->dirty_state & R300_NEW_DSA) {
+        struct r300_dsa_state* dsa = r300->dsa_state;
+        OUT_CS_REG(R300_FG_ALPHA_FUNC, dsa->alpha_function);
+        OUT_CS_REG(R500_FG_ALPHA_VALUE, dsa->alpha_reference);
+        /* XXX next three are contiguous regs */
+        OUT_CS_REG(R300_ZB_CNTL, dsa->z_buffer_control);
+        OUT_CS_REG(R300_ZB_ZSTENCILCNTL, dsa->z_stencil_control);
+        OUT_CS_REG(R300_ZB_STENCILREFMASK, dsa->stencil_ref_mask);
+        OUT_CS_REG(R300_ZB_ZTOP, dsa->z_buffer_top);
+        if (r300screen->is_r500) {
+            OUT_CS_REG(R500_ZB_STENCILREFMASK_BF, dsa->stencil_ref_bf);
+        }
+    }
+
+    if (r300->dirty_state & R300_NEW_RS) {
+        struct r300_rs_state* rs = r300->rs_state;
+        /* XXX next six are contiguous regs */
+        OUT_CS_REG(R300_SU_POLY_OFFSET_FRONT_SCALE, rs->depth_scale_front);
+        OUT_CS_REG(R300_SU_POLY_OFFSET_FRONT_OFFSET, rs->depth_offset_front);
+        OUT_CS_REG(R300_SU_POLY_OFFSET_BACK_SCALE, rs->depth_scale_back);
+        OUT_CS_REG(R300_SU_POLY_OFFSET_BACK_OFFSET, rs->depth_offset_back);
+        OUT_CS_REG(R300_SU_POLY_OFFSET_ENABLE, rs->polygon_offset_enable);
+        OUT_CS_REG(R300_SU_CULL_MODE, rs->cull_mode);
+    }
+
+    if (r300->dirty_state & R300_NEW_SCISSOR) {
+        struct r300_scissor_state* scissor = r300->scissor_state;
+        /* XXX next two are contiguous regs */
+        OUT_CS_REG(R300_SC_SCISSORS_TL, scissor->scissor_top_left);
+        OUT_CS_REG(R300_SC_SCISSORS_BR, scissor->scissor_bottom_right);
+    }
+
+    r300->dirty_state = 0;
+}

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index dacde27..5074e3e 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -35,7 +35,7 @@ static int r300_get_param(struct pipe_screen* pscreen, int param) {
     struct r300_screen* r300screen = r300_screen(pscreen);
 
     switch (param) {
-        /* Cases marked "IN THEORY" are possible on the hardware,
+        /* XXX cases marked "IN THEORY" are possible on the hardware,
          * but haven't been implemented yet. */
         case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
             /* XXX I'm told this goes up to 16 */
@@ -48,6 +48,11 @@ static int r300_get_param(struct pipe_screen* pscreen, int param) {
             return 0;
         case PIPE_CAP_TWO_SIDED_STENCIL:
             /* IN THEORY */
+            /* if (r300screen->is_r500) {
+             * return 1;
+             * } else {
+             * return 0;
+             * } */
             return 0;
         case PIPE_CAP_ANISOTROPIC_FILTER:
             /* IN THEORY */