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 dd8fa4fcd770c8c8d070a7cb96c220b97ef98268..8a62d646d3ab27cf2631dc7d6c7b6c24ac2e448f 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -43,6 +43,7 @@
 #include "r600_shader.h"
 #include "r600_pipe.h"
 #include "r600_state_inlines.h"
+#include "r600_video_context.h"
 
 /*
  * pipe_context
@@ -77,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]);
        }
@@ -85,6 +91,9 @@ 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);
@@ -173,6 +182,12 @@ 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);
@@ -207,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";
        }
 }
 
@@ -262,6 +277,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        /* 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;
 
@@ -417,6 +433,9 @@ static void r600_destroy_screen(struct pipe_screen* pscreen)
 
        if (rscreen == NULL)
                return;
+
+       radeon_decref(rscreen->radeon);
+
        FREE(rscreen);
 }
 
@@ -440,6 +459,7 @@ struct pipe_screen *r600_screen_create(struct radeon *radeon)
        rscreen->screen.get_paramf = r600_get_paramf;
        rscreen->screen.is_format_supported = r600_is_format_supported;
        rscreen->screen.context_create = r600_create_context;
+       rscreen->screen.video_context_create = r600_video_create;
        r600_init_screen_texture_functions(&rscreen->screen);
        r600_init_screen_resource_functions(&rscreen->screen);