r600g: implement instanced drawing support

[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 04bbcf5f4d1e918f53d06c378929f9a3e2b903da..adcd74aec7643200b299c7780ed5d799b8aa68a6 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -30,6 +30,7 @@
 #include <tgsi/tgsi_util.h>
 #include <util/u_blitter.h>
 #include <util/u_double_list.h>
+#include <util/u_format_s3tc.h>
 #include <util/u_transfer.h>
 #include <util/u_surface.h>
 #include <util/u_pack_color.h>
@@ -68,6 +69,31 @@ static void r600_flush(struct pipe_context *ctx, unsigned flags,
        dc++;
 #endif
        r600_context_flush(&rctx->ctx);
+
+       /* XXX This shouldn't be really necessary, but removing it breaks some tests.
+        * Needless buffer reallocations may significantly increase memory consumption,
+        * so getting rid of this call is important. */
+       u_upload_flush(rctx->vbuf_mgr->uploader);
+}
+
+static void r600_update_num_contexts(struct r600_screen *rscreen,
+                                     int diff)
+{
+       pipe_mutex_lock(rscreen->mutex_num_contexts);
+       if (diff > 0) {
+               rscreen->num_contexts++;
+
+               if (rscreen->num_contexts > 1)
+                       util_slab_set_thread_safety(&rscreen->pool_buffers,
+                                                   UTIL_SLAB_MULTITHREADED);
+       } else {
+               rscreen->num_contexts--;
+
+               if (rscreen->num_contexts <= 1)
+                       util_slab_set_thread_safety(&rscreen->pool_buffers,
+                                                   UTIL_SLAB_SINGLETHREADED);
+       }
+       pipe_mutex_unlock(rscreen->mutex_num_contexts);
 }
 
 static void r600_destroy_context(struct pipe_context *context)
@@ -84,12 +110,11 @@ static void r600_destroy_context(struct pipe_context *context)
                free(rctx->states[i]);
        }
 
-       u_upload_destroy(rctx->upload_ib);
-       u_upload_destroy(rctx->upload_const);
        u_vbuf_mgr_destroy(rctx->vbuf_mgr);
+       util_slab_destroy(&rctx->pool_transfers);
+
+       r600_update_num_contexts(rctx->screen, -1);
 
-       FREE(rctx->ps_resource);
-       FREE(rctx->vs_resource);
        FREE(rctx);
 }
 
@@ -101,6 +126,9 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
 
        if (rctx == NULL)
                return NULL;
+
+       r600_update_num_contexts(rscreen, 1);
+
        rctx->context.winsys = rscreen->screen.winsys;
        rctx->context.screen = screen;
        rctx->context.priv = priv;
@@ -160,42 +188,23 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                return NULL;
        }
 
-       rctx->vbuf_mgr = u_vbuf_mgr_create(&rctx->context, 1024 * 1024, 16,
-                                          U_VERTEX_FETCH_BYTE_ALIGNED);
-       if (!rctx->vbuf_mgr) {
-               r600_destroy_context(&rctx->context);
-               return NULL;
-       }
-
-       rctx->upload_ib = u_upload_create(&rctx->context, 128 * 1024, 16,
-                                         PIPE_BIND_INDEX_BUFFER);
-       if (rctx->upload_ib == NULL) {
-               r600_destroy_context(&rctx->context);
-               return NULL;
-       }
+       util_slab_create(&rctx->pool_transfers,
+                        sizeof(struct pipe_transfer), 64,
+                        UTIL_SLAB_SINGLETHREADED);
 
-       rctx->upload_const = u_upload_create(&rctx->context, 1024 * 1024, 256,
-                                            PIPE_BIND_CONSTANT_BUFFER);
-       if (rctx->upload_const == NULL) {
+       rctx->vbuf_mgr = u_vbuf_mgr_create(&rctx->context, 1024 * 1024, 256,
+                                          PIPE_BIND_VERTEX_BUFFER |
+                                          PIPE_BIND_INDEX_BUFFER |
+                                          PIPE_BIND_CONSTANT_BUFFER,
+                                          U_VERTEX_FETCH_DWORD_ALIGNED);
+       if (!rctx->vbuf_mgr) {
                r600_destroy_context(&rctx->context);
                return NULL;
        }
 
        rctx->blitter = util_blitter_create(&rctx->context);
        if (rctx->blitter == 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);
+               r600_destroy_context(&rctx->context);
                return NULL;
        }
 
@@ -276,16 +285,19 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE:
        case PIPE_CAP_DEPTH_CLAMP:
        case PIPE_CAP_SHADER_STENCIL_EXPORT:
+       case PIPE_CAP_INSTANCED_DRAWING:
                return 1;
 
        /* Unsupported features (boolean caps). */
        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;
 
+       case PIPE_CAP_ARRAY_TEXTURES:
+               /* fix once the CS checker upstream is fixed */
+               return debug_get_bool_option("R600_ARRAY_TEXTURE", FALSE);
+
        /* Texturing. */
        case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
        case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
@@ -384,7 +396,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
        case PIPE_SHADER_CAP_MAX_CONSTS:
                return 256; //max native parameters
        case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
-               return 1;
+               return R600_MAX_CONST_BUFFERS;
        case PIPE_SHADER_CAP_MAX_PREDS:
                return 0; /* FIXME */
        case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
@@ -466,6 +478,8 @@ static void r600_destroy_screen(struct pipe_screen* pscreen)
 
        radeon_decref(rscreen->radeon);
 
+       util_slab_destroy(&rscreen->pool_buffers);
+       pipe_mutex_destroy(rscreen->mutex_num_contexts);
        FREE(rscreen);
 }
 
@@ -492,6 +506,13 @@ struct pipe_screen *r600_screen_create(struct radeon *radeon)
        r600_init_screen_resource_functions(&rscreen->screen);
 
        rscreen->tiling_info = r600_get_tiling_info(radeon);
+       util_format_s3tc_init();
+
+       util_slab_create(&rscreen->pool_buffers,
+                        sizeof(struct r600_resource_buffer), 64,
+                        UTIL_SLAB_SINGLETHREADED);
+
+       pipe_mutex_init(rscreen->mutex_num_contexts);
 
        return &rscreen->screen;
 }