Merge remote branch 'origin/master' into pipe-video

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

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index a9fc31d9fbd6c9285567a30ed4334a57630c3de8..8a62d646d3ab27cf2631dc7d6c7b6c24ac2e448f 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -78,7 +78,12 @@ static void r600_destroy_context(struct pipe_context *context)
 {
        struct r600_pipe_context *rctx = (struct r600_pipe_context *)context;
 
+       rctx->context.delete_depth_stencil_alpha_state(&rctx->context, rctx->custom_dsa_flush);
+
        r600_context_fini(&rctx->ctx);
+
+       util_blitter_destroy(rctx->blitter);
+
        for (int i = 0; i < R600_PIPE_NSTATES; i++) {
                free(rctx->states[i]);
        }
@@ -86,6 +91,11 @@ static void r600_destroy_context(struct pipe_context *context)
        u_upload_destroy(rctx->upload_vb);
        u_upload_destroy(rctx->upload_ib);
 
+       if (rctx->tran.translate_cache)
+               translate_cache_destroy(rctx->tran.translate_cache);
+
+       FREE(rctx->ps_resource);
+       FREE(rctx->vs_resource);
        FREE(rctx);
 }
 
@@ -172,6 +182,24 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                return NULL;
        }
 
+       rctx->tran.translate_cache = translate_cache_create();
+       if (rctx->tran.translate_cache == NULL) {
+               FREE(rctx);
+               return NULL;
+       }
+       
+       rctx->vs_resource = CALLOC(R600_RESOURCE_ARRAY_SIZE, sizeof(struct r600_pipe_state));
+       if (!rctx->vs_resource) {
+               FREE(rctx);
+               return NULL;
+       }
+
+       rctx->ps_resource = CALLOC(R600_RESOURCE_ARRAY_SIZE, sizeof(struct r600_pipe_state));
+       if (!rctx->ps_resource) {
+               FREE(rctx);
+               return NULL;
+       }
+
        class = r600_get_family_class(rctx->radeon);
        if (class == R600 || class == R700)
                rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);
@@ -194,24 +222,24 @@ static const char* r600_get_vendor(struct pipe_screen* pscreen)
 static const char *r600_get_family_name(enum radeon_family family)
 {
        switch(family) {
-       case CHIP_R600: return "R600";
-       case CHIP_RV610: return "RV610";
-       case CHIP_RV630: return "RV630";
-       case CHIP_RV670: return "RV670";
-       case CHIP_RV620: return "RV620";
-       case CHIP_RV635: return "RV635";
-       case CHIP_RS780: return "RS780";
-       case CHIP_RS880: return "RS880";
-       case CHIP_RV770: return "RV770";
-       case CHIP_RV730: return "RV730";
-       case CHIP_RV710: return "RV710";
-       case CHIP_RV740: return "RV740";
-       case CHIP_CEDAR: return "CEDAR";
-       case CHIP_REDWOOD: return "REDWOOD";
-       case CHIP_JUNIPER: return "JUNIPER";
-       case CHIP_CYPRESS: return "CYPRESS";
-       case CHIP_HEMLOCK: return "HEMLOCK";
-       default: return "unknown";
+       case CHIP_R600: return "AMD R600";
+       case CHIP_RV610: return "AMD RV610";
+       case CHIP_RV630: return "AMD RV630";
+       case CHIP_RV670: return "AMD RV670";
+       case CHIP_RV620: return "AMD RV620";
+       case CHIP_RV635: return "AMD RV635";
+       case CHIP_RS780: return "AMD RS780";
+       case CHIP_RS880: return "AMD RS880";
+       case CHIP_RV770: return "AMD RV770";
+       case CHIP_RV730: return "AMD RV730";
+       case CHIP_RV710: return "AMD RV710";
+       case CHIP_RV740: return "AMD RV740";
+       case CHIP_CEDAR: return "AMD CEDAR";
+       case CHIP_REDWOOD: return "AMD REDWOOD";
+       case CHIP_JUNIPER: return "AMD JUNIPER";
+       case CHIP_CYPRESS: return "AMD CYPRESS";
+       case CHIP_HEMLOCK: return "AMD HEMLOCK";
+       default: return "AMD unknown";
        }
 }
 
@@ -243,11 +271,13 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_INDEP_BLEND_ENABLE:
        case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE:
        case PIPE_CAP_DEPTH_CLAMP:
+       case PIPE_CAP_SHADER_STENCIL_EXPORT:
                return 1;
 
        /* Unsupported features (boolean caps). */
        case PIPE_CAP_TIMER_QUERY:
        case PIPE_CAP_STREAM_OUTPUT:
+       case PIPE_CAP_PRIMITIVE_RESTART:
        case PIPE_CAP_INDEP_BLEND_FUNC: /* FIXME allow this */
                return 0;
 
@@ -258,7 +288,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return 14;
        case PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS:
                /* FIXME allow this once infrastructure is there */
-               return 0;
+               return 16;
        case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
        case PIPE_CAP_MAX_COMBINED_SAMPLERS:
                return 16;
@@ -403,6 +433,9 @@ static void r600_destroy_screen(struct pipe_screen* pscreen)
 
        if (rscreen == NULL)
                return;
+
+       radeon_decref(rscreen->radeon);
+
        FREE(rscreen);
 }
 
@@ -430,5 +463,7 @@ struct pipe_screen *r600_screen_create(struct radeon *radeon)
        r600_init_screen_texture_functions(&rscreen->screen);
        r600_init_screen_resource_functions(&rscreen->screen);
 
+       rscreen->tiling_info = r600_get_tiling_info(radeon);
+
        return &rscreen->screen;
 }