gallium/svga: added debug code for dumping framebuffer images (disabled)

[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 20838e4d98ffbda18928e7dea2cfd7a22ae9543d..45c093121da1d648af5a0a0bb0de64e8e1dd844d 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -35,6 +35,7 @@
 #include <util/u_pack_color.h>
 #include <util/u_memory.h>
 #include <util/u_inlines.h>
+#include "util/u_upload_mgr.h"
 #include <pipebuffer/pb_buffer.h>
 #include "r600.h"
 #include "r600d.h"
@@ -68,8 +69,8 @@ static void r600_flush(struct pipe_context *ctx, unsigned flags,
 #endif
        r600_context_flush(&rctx->ctx);
 
-       r600_upload_flush(rctx->rupload_vb);
-       r600_upload_flush(rctx->rupload_const);
+       u_upload_flush(rctx->upload_vb);
+       u_upload_flush(rctx->upload_const);
 }
 
 static void r600_destroy_context(struct pipe_context *context)
@@ -88,8 +89,8 @@ static void r600_destroy_context(struct pipe_context *context)
                free(rctx->states[i]);
        }
 
-       r600_upload_destroy(rctx->rupload_vb);
-       r600_upload_destroy(rctx->rupload_const);
+       u_upload_destroy(rctx->upload_vb);
+       u_upload_destroy(rctx->upload_const);
 
        if (rctx->tran.translate_cache)
                translate_cache_destroy(rctx->tran.translate_cache);
@@ -122,6 +123,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        r600_init_query_functions(rctx);
        r600_init_context_resource_functions(rctx);
        r600_init_surface_functions(rctx);
+       rctx->context.draw_vbo = r600_draw_vbo;
 
        switch (r600_get_family(rctx->radeon)) {
        case CHIP_R600:
@@ -136,7 +138,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        case CHIP_RV730:
        case CHIP_RV710:
        case CHIP_RV740:
-               rctx->context.draw_vbo = r600_draw_vbo;
                r600_init_state_functions(rctx);
                if (r600_context_init(&rctx->ctx, rctx->radeon)) {
                        r600_destroy_context(&rctx->context);
@@ -153,7 +154,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        case CHIP_BARTS:
        case CHIP_TURKS:
        case CHIP_CAICOS:
-               rctx->context.draw_vbo = evergreen_draw;
                evergreen_init_state_functions(rctx);
                if (evergreen_context_init(&rctx->ctx, rctx->radeon)) {
                        r600_destroy_context(&rctx->context);
@@ -167,14 +167,17 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                return NULL;
        }
 
-       rctx->rupload_vb = r600_upload_create(rctx, 128 * 1024, 16);
-       if (rctx->rupload_vb == NULL) {
+       rctx->upload_vb = u_upload_create(&rctx->context, 1024 * 1024, 16,
+                                         PIPE_BIND_VERTEX_BUFFER |
+                                         PIPE_BIND_INDEX_BUFFER);
+       if (rctx->upload_vb == NULL) {
                r600_destroy_context(&rctx->context);
                return NULL;
        }
 
-       rctx->rupload_const = r600_upload_create(rctx, 128 * 1024, 256);
-       if (rctx->rupload_const == NULL) {
+       rctx->upload_const = u_upload_create(&rctx->context, 1024 * 1024, 256,
+                                            PIPE_BIND_CONSTANT_BUFFER);
+       if (rctx->upload_const == NULL) {
                r600_destroy_context(&rctx->context);
                return NULL;
        }
@@ -283,10 +286,11 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                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 */
+       case PIPE_CAP_INSTANCED_DRAWING:
+       case PIPE_CAP_ARRAY_TEXTURES:
                return 0;
 
        /* Texturing. */
@@ -317,6 +321,10 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER:
                return 0;
 
+       /* Timer queries, present when the clock frequency is non zero. */
+       case PIPE_CAP_TIMER_QUERY:
+               return r600_get_clock_crystal_freq(rscreen->radeon) != 0;
+
        default:
                R600_ERR("r600: unknown param %d\n", param);
                return 0;