r600g: consolidate set_sampler_views functions

[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 a0a8a58cd9c2ccf642fe4da61711cc2b36ced0d1..048b801319257fc861d3b0ae658258bbf01f5fef 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -156,12 +156,24 @@ static void r600_destroy_context(struct pipe_context *context)
 {
        struct r600_context *rctx = (struct r600_context *)context;
 
+       pipe_resource_reference((struct pipe_resource**)&rctx->dummy_cmask, NULL);
+       pipe_resource_reference((struct pipe_resource**)&rctx->dummy_fmask, NULL);
+
+       if (rctx->no_blend) {
+               rctx->context.delete_blend_state(&rctx->context, rctx->no_blend);
+       }
        if (rctx->dummy_pixel_shader) {
                rctx->context.delete_fs_state(&rctx->context, rctx->dummy_pixel_shader);
        }
        if (rctx->custom_dsa_flush) {
                rctx->context.delete_depth_stencil_alpha_state(&rctx->context, rctx->custom_dsa_flush);
        }
+       if (rctx->custom_blend_resolve) {
+               rctx->context.delete_blend_state(&rctx->context, rctx->custom_blend_resolve);
+       }
+       if (rctx->custom_blend_decompress) {
+               rctx->context.delete_blend_state(&rctx->context, rctx->custom_blend_decompress);
+       }
        util_unreference_framebuffer_state(&rctx->framebuffer);
 
        r600_context_fini(rctx);
@@ -192,12 +204,13 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
 {
        struct r600_context *rctx = CALLOC_STRUCT(r600_context);
        struct r600_screen* rscreen = (struct r600_screen *)screen;
+       struct pipe_blend_state no_blend = {};
 
        if (rctx == NULL)
                return NULL;
 
        util_slab_create(&rctx->pool_transfers,
-                        sizeof(struct pipe_transfer), 64,
+                        sizeof(struct r600_transfer), 64,
                         UTIL_SLAB_SINGLETHREADED);
 
        rctx->context.screen = screen;
@@ -211,11 +224,9 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->family = rscreen->family;
        rctx->chip_class = rscreen->chip_class;
 
-       LIST_INITHEAD(&rctx->dirty_states);
        LIST_INITHEAD(&rctx->active_timer_queries);
        LIST_INITHEAD(&rctx->active_nontimer_queries);
        LIST_INITHEAD(&rctx->dirty);
-       LIST_INITHEAD(&rctx->resource_dirty);
        LIST_INITHEAD(&rctx->enable_list);
 
        rctx->range = CALLOC(NUM_RANGES, sizeof(struct r600_range));
@@ -226,12 +237,12 @@ 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;
+
 
        rctx->context.create_video_decoder = vl_create_decoder;
        rctx->context.create_video_buffer = vl_video_buffer_create;
 
-       r600_init_common_atoms(rctx);
+       r600_init_common_state_functions(rctx);
 
        switch (rctx->chip_class) {
        case R600:
@@ -241,6 +252,9 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                if (r600_context_init(rctx))
                        goto fail;
                rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);
+               rctx->custom_blend_resolve = rctx->chip_class == R700 ? r700_create_resolve_blend(rctx)
+                                                                     : r600_create_resolve_blend(rctx);
+               rctx->custom_blend_decompress = r600_create_decompress_blend(rctx);
                rctx->has_vertex_cache = !(rctx->family == CHIP_RV610 ||
                                           rctx->family == CHIP_RV620 ||
                                           rctx->family == CHIP_RS780 ||
@@ -255,6 +269,8 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                if (evergreen_context_init(rctx))
                        goto fail;
                rctx->custom_dsa_flush = evergreen_create_db_flush_dsa(rctx);
+               rctx->custom_blend_resolve = evergreen_create_resolve_blend(rctx);
+               rctx->custom_blend_decompress = evergreen_create_decompress_blend(rctx);
                rctx->has_vertex_cache = !(rctx->family == CHIP_CEDAR ||
                                           rctx->family == CHIP_PALM ||
                                           rctx->family == CHIP_SUMO ||
@@ -281,6 +297,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->blitter = util_blitter_create(&rctx->context);
        if (rctx->blitter == NULL)
                goto fail;
+       rctx->blitter->draw_rectangle = r600_draw_rectangle;
 
        r600_get_backend_mask(rctx); /* this emits commands and must be last */
 
@@ -293,6 +310,9 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                                                     TGSI_INTERPOLATE_CONSTANT);
        rctx->context.bind_fs_state(&rctx->context, rctx->dummy_pixel_shader);
 
+       no_blend.rt[0].colormask = 0xF;
+       rctx->no_blend = rctx->context.create_blend_state(&rctx->context, &no_blend);
+
        return &rctx->context;
 
 fail:
@@ -385,13 +405,14 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_USER_CONSTANT_BUFFERS:
        case PIPE_CAP_COMPUTE:
        case PIPE_CAP_START_INSTANCE:
+       case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
                return 1;
 
        case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT:
                return 256;
 
        case PIPE_CAP_GLSL_FEATURE_LEVEL:
-               return rscreen->glsl_feature_level;
+               return 130;
 
        /* Supported except the original R600. */
        case PIPE_CAP_INDEP_BLEND_ENABLE:
@@ -412,7 +433,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_FRAGMENT_COLOR_CLAMPED:
        case PIPE_CAP_VERTEX_COLOR_CLAMPED:
        case PIPE_CAP_USER_VERTEX_BUFFERS:
-       case PIPE_CAP_QUERY_TIMESTAMP:
                return 0;
 
        /* Stream output. */
@@ -446,15 +466,15 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        /* Timer queries, present when the clock frequency is non zero. */
        case PIPE_CAP_TIMER_QUERY:
                return rscreen->info.r600_clock_crystal_freq != 0;
+       case PIPE_CAP_QUERY_TIMESTAMP:
+               return rscreen->info.drm_minor >= 20 &&
+                      rscreen->info.r600_clock_crystal_freq != 0;
 
        case PIPE_CAP_MIN_TEXEL_OFFSET:
                return -8;
 
        case PIPE_CAP_MAX_TEXEL_OFFSET:
                return 7;
-
-       case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
-               return family < CHIP_CEDAR ?  1 : 0;
        }
        return 0;
 }
@@ -489,7 +509,6 @@ static float r600_get_paramf(struct pipe_screen* pscreen,
 
 static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
 {
-       struct r600_screen *rscreen = (struct r600_screen *)pscreen;
        switch(shader)
        {
        case PIPE_SHADER_FRAGMENT:
@@ -539,7 +558,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
        case PIPE_SHADER_CAP_SUBROUTINES:
                return 0;
        case PIPE_SHADER_CAP_INTEGERS:
-               return rscreen->glsl_feature_level >= 130;
+               return 1;
        case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
                return 16;
         case PIPE_SHADER_CAP_PREFERRED_IR:
@@ -624,9 +643,10 @@ static int r600_get_compute_param(struct pipe_screen *screen,
        case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE:
                if (ret) {
                        uint64_t * max_global_size = ret;
-                       /* XXX: This is what the proprietary driver reports, we
-                        * may want to use a different value. */
-                       *max_global_size = 201326592;
+                       /* XXX: This is 64kb for now until we get the
+                        * compute memory pool working correctly.
+                        */
+                       *max_global_size = 1024 * 16 * 4;
                }
                return sizeof(uint64_t);
 
@@ -872,6 +892,14 @@ static unsigned radeon_family_from_device(unsigned device)
        }
 }
 
+static uint64_t r600_get_timestamp(struct pipe_screen *screen)
+{
+       struct r600_screen *rscreen = (struct r600_screen*)screen;
+
+       return 1000000 * rscreen->ws->query_timestamp(rscreen->ws) /
+                       rscreen->info.r600_clock_crystal_freq;
+}
+
 struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
 {
        struct r600_screen *rscreen = CALLOC_STRUCT(r600_screen);
@@ -905,14 +933,12 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        switch (rscreen->chip_class) {
        case R600:
        case EVERGREEN:
-               rscreen->has_streamout = rscreen->info.drm_minor >= 13;
+       case CAYMAN:
+               rscreen->has_streamout = rscreen->info.drm_minor >= 14;
                break;
        case R700:
                rscreen->has_streamout = rscreen->info.drm_minor >= 17;
                break;
-       /* TODO: Cayman */
-       default:
-               rscreen->has_streamout = debug_get_bool_option("R600_STREAMOUT", FALSE);
        }
 
        if (r600_init_tiling(rscreen)) {
@@ -928,6 +954,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        rscreen->screen.get_paramf = r600_get_paramf;
        rscreen->screen.get_video_param = r600_get_video_param;
        rscreen->screen.get_compute_param = r600_get_compute_param;
+       rscreen->screen.get_timestamp = r600_get_timestamp;
 
        if (rscreen->chip_class >= EVERGREEN) {
                rscreen->screen.is_format_supported = evergreen_is_format_supported;
@@ -950,10 +977,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        LIST_INITHEAD(&rscreen->fences.blocks);
        pipe_mutex_init(rscreen->fences.mutex);
 
-       rscreen->use_surface_alloc = debug_get_bool_option("R600_SURF", TRUE);
-       rscreen->glsl_feature_level = debug_get_bool_option("R600_GLSL130", TRUE) ? 130 : 120;
-
-       rscreen->global_pool = compute_memory_pool_new(0, rscreen);
+       rscreen->global_pool = compute_memory_pool_new(rscreen);
 
        return &rscreen->screen;
 }