r600g: drop r600_bind_state.

[mesa.git] / src / gallium / drivers / r600 / r600_context.c

diff --git a/src/gallium/drivers/r600/r600_context.c b/src/gallium/drivers/r600/r600_context.c
index 95e9b6a8ed9d533e75c337cb4fb33310533c9d64..7a0e5b4049f135de1b120d914cfe3b22ea596fb1 100644 (file)
--- a/src/gallium/drivers/r600/r600_context.c
+++ b/src/gallium/drivers/r600/r600_context.c
@@ -39,6 +39,21 @@ static void r600_destroy_context(struct pipe_context *context)
 {
        struct r600_context *rctx = r600_context(context);
 
+       rctx->rasterizer = r600_context_state_decref(rctx->rasterizer);
+       rctx->poly_stipple = r600_context_state_decref(rctx->poly_stipple);
+       rctx->scissor = r600_context_state_decref(rctx->scissor);
+       rctx->clip = r600_context_state_decref(rctx->clip);
+       rctx->ps_shader = r600_context_state_decref(rctx->ps_shader);
+       rctx->vs_shader = r600_context_state_decref(rctx->vs_shader);
+       rctx->depth = r600_context_state_decref(rctx->depth);
+       rctx->stencil = r600_context_state_decref(rctx->stencil);
+       rctx->alpha = r600_context_state_decref(rctx->alpha);
+       rctx->dsa = r600_context_state_decref(rctx->dsa);
+       rctx->blend = r600_context_state_decref(rctx->blend);
+       rctx->stencil_ref = r600_context_state_decref(rctx->stencil_ref);
+       rctx->viewport = r600_context_state_decref(rctx->viewport);
+       rctx->framebuffer = r600_context_state_decref(rctx->framebuffer);
+       radeon_ctx_fini(&rctx->ctx);
        FREE(rctx);
 }
 
@@ -57,11 +72,13 @@ void r600_flush(struct pipe_context *ctx, unsigned flags,
         */
        if (!rctx->ctx.cdwords)
                goto out;
+#if 0
        sprintf(dname, "gallium-%08d.bof", dc);
        if (dc < 2) {
                radeon_ctx_dump_bof(&rctx->ctx, dname);
                R600_ERR("dumped %s\n", dname);
        }
+#endif
 #if 1
        radeon_ctx_submit(&rctx->ctx);
 #endif
@@ -258,13 +275,24 @@ static void r600_init_config(struct r600_context *rctx)
        rctx->config.states[R600_CONFIG__SQ_STACK_RESOURCE_MGMT_2] |= S_008C14_NUM_GS_STACK_ENTRIES(num_gs_stack_entries);
        rctx->config.states[R600_CONFIG__SQ_STACK_RESOURCE_MGMT_2] |= S_008C14_NUM_ES_STACK_ENTRIES(num_es_stack_entries);
 
-       rctx->config.states[R600_CONFIG__SQ_DYN_GPR_CNTL_PS_FLUSH_REQ] = 0x00004000;
-       rctx->config.states[R600_CONFIG__TA_CNTL_AUX] = 0x07000002;
        rctx->config.states[R600_CONFIG__VC_ENHANCE] = 0x00000000;
-       rctx->config.states[R600_CONFIG__DB_DEBUG] = 0x00000000;
-       rctx->config.states[R600_CONFIG__DB_WATERMARKS] = 0x00420204;
        rctx->config.states[R600_CONFIG__SX_MISC] = 0x00000000;
-       rctx->config.states[R600_CONFIG__SPI_THREAD_GROUPING] = 0x00000001;
+
+       if (family >= CHIP_RV770) {
+               rctx->config.states[R600_CONFIG__SQ_DYN_GPR_CNTL_PS_FLUSH_REQ] = 0x00004000;
+               rctx->config.states[R600_CONFIG__TA_CNTL_AUX] = 0x07000002;
+               rctx->config.states[R600_CONFIG__DB_DEBUG] = 0x00000000;
+               rctx->config.states[R600_CONFIG__DB_WATERMARKS] = 0x00420204;
+               rctx->config.states[R600_CONFIG__SPI_THREAD_GROUPING] = 0x00000000;
+               rctx->config.states[R600_CONFIG__PA_SC_MODE_CNTL] = 0x00514000;
+       } else {
+               rctx->config.states[R600_CONFIG__SQ_DYN_GPR_CNTL_PS_FLUSH_REQ] = 0x00000000;
+               rctx->config.states[R600_CONFIG__TA_CNTL_AUX] = 0x07000003;
+               rctx->config.states[R600_CONFIG__DB_DEBUG] = 0x82000000;
+               rctx->config.states[R600_CONFIG__DB_WATERMARKS] = 0x01020204;
+               rctx->config.states[R600_CONFIG__SPI_THREAD_GROUPING] = 0x00000001;
+               rctx->config.states[R600_CONFIG__PA_SC_MODE_CNTL] = 0x00004010;
+       }
        rctx->config.states[R600_CONFIG__CB_SHADER_CONTROL] = 0x00000003;
        rctx->config.states[R600_CONFIG__SQ_ESGS_RING_ITEMSIZE] = 0x00000000;
        rctx->config.states[R600_CONFIG__SQ_GSVS_RING_ITEMSIZE] = 0x00000000;
@@ -288,7 +316,6 @@ static void r600_init_config(struct r600_context *rctx)
        rctx->config.states[R600_CONFIG__VGT_GROUP_VECT_0_FMT_CNTL] = 0x00000000;
        rctx->config.states[R600_CONFIG__VGT_GROUP_VECT_1_FMT_CNTL] = 0x00000000;
        rctx->config.states[R600_CONFIG__VGT_GS_MODE] = 0x00000000;
-       rctx->config.states[R600_CONFIG__PA_SC_MODE_CNTL] = 0x00514000;
        rctx->config.states[R600_CONFIG__VGT_STRMOUT_EN] = 0x00000000;
        rctx->config.states[R600_CONFIG__VGT_REUSE_OFF] = 0x00000001;
        rctx->config.states[R600_CONFIG__VGT_VTX_CNT_EN] = 0x00000000;