radeonsi: disable array-textures for now

[mesa.git] / src / gallium / drivers / radeonsi / radeonsi_pipe.c

diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index 9ee96a062004c80c2f0eaa818e44f72c86a66762..48b9a3ecb37427f7d1fd5fe58bfc4e186202d44c 100644 (file)
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -117,7 +117,7 @@ static struct r600_fence *r600_create_fence(struct r600_context *rctx)
        pipe_reference_init(&fence->reference, 1);
 
        rscreen->fences.data[fence->index] = 0;
-       r600_context_emit_fence(rctx, rscreen->fences.bo, fence->index, 1);
+       si_context_emit_fence(rctx, rscreen->fences.bo, fence->index, 1);
 
        /* Create a dummy BO so that fence_finish without a timeout can sleep waiting for completion */
        fence->sleep_bo = si_resource_create_custom(&rctx->screen->screen, PIPE_USAGE_STAGING, 1);
@@ -149,7 +149,7 @@ void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
                ctx->render_condition(ctx, NULL, 0);
        }
 
-       r600_context_flush(rctx, flags);
+       si_context_flush(rctx, flags);
 
        /* Re-enable render condition. */
        if (render_cond) {
@@ -206,16 +206,14 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->family = rscreen->family;
        rctx->chip_class = rscreen->chip_class;
 
-       r600_init_blit_functions(rctx);
+       si_init_blit_functions(rctx);
        r600_init_query_functions(rctx);
        r600_init_context_resource_functions(rctx);
-       r600_init_surface_functions(rctx);
+       si_init_surface_functions(rctx);
 
        rctx->context.create_video_decoder = vl_create_decoder;
        rctx->context.create_video_buffer = vl_video_buffer_create;
 
-       r600_init_common_atoms(rctx);
-
        switch (rctx->chip_class) {
        case TAHITI:
                si_init_state_functions(rctx);
@@ -251,9 +249,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                return NULL;
        }
 
-       LIST_INITHEAD(&rctx->dirty_states);
-
-       r600_get_backend_mask(rctx); /* this emits commands and must be last */
+       si_get_backend_mask(rctx); /* this emits commands and must be last */
 
        rctx->dummy_pixel_shader =
                util_make_fragment_cloneinput_shader(&rctx->context, 0,
@@ -296,7 +292,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 
        switch (param) {
        /* Supported features (boolean caps). */
-       case PIPE_CAP_NPOT_TEXTURES:
        case PIPE_CAP_TWO_SIDED_STENCIL:
        case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
        case PIPE_CAP_ANISOTROPIC_FILTER:
@@ -337,6 +332,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return debug_get_bool_option("R600_GLSL130", FALSE) ? 130 : 120;
 
        /* Unsupported features. */
+       case PIPE_CAP_NPOT_TEXTURES:
        case PIPE_CAP_TGSI_INSTANCEID:
        case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
        case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER:
@@ -350,6 +346,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return 0;
 
        /* Stream output. */
+#if 0
        case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
                return debug_get_bool_option("R600_STREAMOUT", FALSE) ? 4 : 0;
        case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
@@ -357,6 +354,12 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
        case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
                return 16*4;
+#endif
+       case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
+       case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
+       case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
+       case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
+               return 0;
 
        /* Texturing. */
        case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
@@ -364,7 +367,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
                        return 15;
        case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
-               return rscreen->info.drm_minor >= 9 ? 16384 : 0;
+               return /*rscreen->info.drm_minor >= 9 ? 16384 :*/ 0;
        case PIPE_CAP_MAX_COMBINED_SAMPLERS:
                return 32;