Merge branch 'glsl-to-tgsi'
[mesa.git] / src / gallium / drivers / r600 / r600_pipe.c
index 2d74413752277c8aee1fafc0f7470b2597bfcf55..461f59439e88dd488f95d0d5bf01f526f429b067 100644 (file)
@@ -38,6 +38,8 @@
 #include <util/u_memory.h>
 #include <util/u_inlines.h>
 #include "util/u_upload_mgr.h"
+#include <vl/vl_decoder.h>
+#include <vl/vl_video_buffer.h>
 #include "os/os_time.h"
 #include <pipebuffer/pb_buffer.h>
 #include "r600.h"
@@ -45,7 +47,6 @@
 #include "r600_resource.h"
 #include "r600_shader.h"
 #include "r600_pipe.h"
-#include "r600_state_inlines.h"
 
 /*
  * pipe_context
@@ -61,7 +62,7 @@ static struct r600_fence *r600_create_fence(struct r600_pipe_context *ctx)
                        R600_ERR("r600: failed to create bo for fence objects\n");
                        return NULL;
                }
-               ctx->fences.data = r600_bo_map(ctx->radeon, ctx->fences.bo, PB_USAGE_UNSYNCHRONIZED, NULL);
+               ctx->fences.data = r600_bo_map(ctx->radeon, ctx->fences.bo, PIPE_TRANSFER_UNSYNCHRONIZED, NULL);
        }
 
        if (!LIST_IS_EMPTY(&ctx->fences.pool)) {
@@ -118,25 +119,9 @@ static void r600_flush(struct pipe_context *ctx,
        struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
        struct r600_fence **rfence = (struct r600_fence**)fence;
 
-#if 0
-       static int dc = 0;
-       char dname[256];
-#endif
-
        if (rfence)
                *rfence = r600_create_fence(rctx);
 
-       if (!rctx->ctx.pm4_cdwords)
-               return;
-
-#if 0
-       sprintf(dname, "gallium-%08d.bof", dc);
-       if (dc < 20) {
-               r600_context_dump_bof(&rctx->ctx, dname);
-               R600_ERR("dumped %s\n", dname);
-       }
-       dc++;
-#endif
        r600_context_flush(&rctx->ctx);
 }
 
@@ -198,7 +183,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
 {
        struct r600_pipe_context *rctx = CALLOC_STRUCT(r600_pipe_context);
        struct r600_screen* rscreen = (struct r600_screen *)screen;
-       enum chip_class class;
 
        if (rctx == NULL)
                return NULL;
@@ -215,6 +199,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->screen = rscreen;
        rctx->radeon = rscreen->radeon;
        rctx->family = r600_get_family(rctx->radeon);
+       rctx->chip_class = r600_get_family_class(rctx->radeon);
 
        rctx->fences.bo = NULL;
        rctx->fences.data = NULL;
@@ -228,47 +213,32 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        r600_init_surface_functions(rctx);
        rctx->context.draw_vbo = r600_draw_vbo;
 
-       switch (r600_get_family(rctx->radeon)) {
-       case CHIP_R600:
-       case CHIP_RV610:
-       case CHIP_RV630:
-       case CHIP_RV670:
-       case CHIP_RV620:
-       case CHIP_RV635:
-       case CHIP_RS780:
-       case CHIP_RS880:
-       case CHIP_RV770:
-       case CHIP_RV730:
-       case CHIP_RV710:
-       case CHIP_RV740:
+       rctx->context.create_video_decoder = vl_create_decoder;
+       rctx->context.create_video_buffer = vl_video_buffer_create;
+
+       switch (rctx->chip_class) {
+       case R600:
+       case R700:
                r600_init_state_functions(rctx);
                if (r600_context_init(&rctx->ctx, rctx->radeon)) {
                        r600_destroy_context(&rctx->context);
                        return NULL;
                }
                r600_init_config(rctx);
+               rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);
                break;
-       case CHIP_CEDAR:
-       case CHIP_REDWOOD:
-       case CHIP_JUNIPER:
-       case CHIP_CYPRESS:
-       case CHIP_HEMLOCK:
-       case CHIP_PALM:
-       case CHIP_SUMO:
-       case CHIP_SUMO2:
-       case CHIP_BARTS:
-       case CHIP_TURKS:
-       case CHIP_CAICOS:
-       case CHIP_CAYMAN:
+       case EVERGREEN:
+       case CAYMAN:
                evergreen_init_state_functions(rctx);
                if (evergreen_context_init(&rctx->ctx, rctx->radeon)) {
                        r600_destroy_context(&rctx->context);
                        return NULL;
                }
                evergreen_init_config(rctx);
+               rctx->custom_dsa_flush = evergreen_create_db_flush_dsa(rctx);
                break;
        default:
-               R600_ERR("unsupported family %d\n", r600_get_family(rctx->radeon));
+               R600_ERR("Unsupported chip class %d.\n", rctx->chip_class);
                r600_destroy_context(&rctx->context);
                return NULL;
        }
@@ -293,12 +263,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                return NULL;
        }
 
-       class = r600_get_family_class(rctx->radeon);
-       if (class == R600 || class == R700)
-               rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);
-       else
-               rctx->custom_dsa_flush = evergreen_create_db_flush_dsa(rctx);
-
        return &rctx->context;
 }
 
@@ -376,6 +340,8 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT:
        case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER:
        case PIPE_CAP_SM3:
+       case PIPE_CAP_SEAMLESS_CUBE_MAP:
+       case PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL:
                return 1;
 
        /* Supported except the original R600. */
@@ -385,14 +351,12 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return family == CHIP_R600 ? 0 : 1;
 
        /* Supported on Evergreen. */
-       case PIPE_CAP_SEAMLESS_CUBE_MAP:
        case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
                return family >= CHIP_CEDAR ? 1 : 0;
 
        /* Unsupported features. */
        case PIPE_CAP_STREAM_OUTPUT:
        case PIPE_CAP_PRIMITIVE_RESTART:
-       case PIPE_CAP_FRAGMENT_COLOR_CLAMP_CONTROL:
        case PIPE_CAP_TGSI_INSTANCEID:
        case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
        case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER:
@@ -481,9 +445,9 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
                return 8; /* FIXME */
        case PIPE_SHADER_CAP_MAX_INPUTS:
                if(shader == PIPE_SHADER_FRAGMENT)
-                       return 10;
+                       return 34;
                else
-                       return 16;
+                       return 32;
        case PIPE_SHADER_CAP_MAX_TEMPS:
                return 256; /* Max native temporaries. */
        case PIPE_SHADER_CAP_MAX_ADDRS:
@@ -511,62 +475,21 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
        }
 }
 
-static boolean r600_is_format_supported(struct pipe_screen* screen,
-                                       enum pipe_format format,
-                                       enum pipe_texture_target target,
-                                       unsigned sample_count,
-                                        unsigned usage)
+static int r600_get_video_param(struct pipe_screen *screen,
+                               enum pipe_video_profile profile,
+                               enum pipe_video_cap param)
 {
-       unsigned retval = 0;
-       if (target >= PIPE_MAX_TEXTURE_TYPES) {
-               R600_ERR("r600: unsupported texture type %d\n", target);
-               return FALSE;
-       }
-
-        if (!util_format_is_supported(format, usage))
-                return FALSE;
-
-       /* Multisample */
-       if (sample_count > 1)
-               return FALSE;
-
-       if ((usage & PIPE_BIND_SAMPLER_VIEW) &&
-           r600_is_sampler_format_supported(screen, format)) {
-               retval |= PIPE_BIND_SAMPLER_VIEW;
-       }
-
-       if ((usage & (PIPE_BIND_RENDER_TARGET |
-                       PIPE_BIND_DISPLAY_TARGET |
-                       PIPE_BIND_SCANOUT |
-                       PIPE_BIND_SHARED)) &&
-                       r600_is_colorbuffer_format_supported(format)) {
-               retval |= usage &
-                       (PIPE_BIND_RENDER_TARGET |
-                        PIPE_BIND_DISPLAY_TARGET |
-                        PIPE_BIND_SCANOUT |
-                        PIPE_BIND_SHARED);
-       }
-
-       if ((usage & PIPE_BIND_DEPTH_STENCIL) &&
-           r600_is_zs_format_supported(format)) {
-               retval |= PIPE_BIND_DEPTH_STENCIL;
-       }
-
-       if (usage & PIPE_BIND_VERTEX_BUFFER) {
-               struct r600_screen *rscreen = (struct r600_screen *)screen;
-               enum radeon_family family = r600_get_family(rscreen->radeon);
-
-               if (r600_is_vertex_format_supported(format, family)) {
-                       retval |= PIPE_BIND_VERTEX_BUFFER;
-               }
+       switch (param) {
+       case PIPE_VIDEO_CAP_SUPPORTED:
+               return vl_profile_supported(screen, profile);
+       case PIPE_VIDEO_CAP_NPOT_TEXTURES:
+               return 1;
+       case PIPE_VIDEO_CAP_MAX_WIDTH:
+       case PIPE_VIDEO_CAP_MAX_HEIGHT:
+               return vl_video_buffer_max_size(screen);
+       default:
+               return 0;
        }
-
-       if (usage & PIPE_BIND_TRANSFER_READ)
-               retval |= PIPE_BIND_TRANSFER_READ;
-       if (usage & PIPE_BIND_TRANSFER_WRITE)
-               retval |= PIPE_BIND_TRANSFER_WRITE;
-
-       return retval == usage;
 }
 
 static void r600_destroy_screen(struct pipe_screen* pscreen)
@@ -657,7 +580,13 @@ struct pipe_screen *r600_screen_create(struct radeon *radeon)
        rscreen->screen.get_param = r600_get_param;
        rscreen->screen.get_shader_param = r600_get_shader_param;
        rscreen->screen.get_paramf = r600_get_paramf;
-       rscreen->screen.is_format_supported = r600_is_format_supported;
+       rscreen->screen.get_video_param = r600_get_video_param;
+       if (r600_get_family_class(radeon) >= EVERGREEN) {
+               rscreen->screen.is_format_supported = evergreen_is_format_supported;
+       } else {
+               rscreen->screen.is_format_supported = r600_is_format_supported;
+       }
+       rscreen->screen.is_video_format_supported = vl_video_buffer_is_format_supported;
        rscreen->screen.context_create = r600_create_context;
        rscreen->screen.fence_reference = r600_fence_reference;
        rscreen->screen.fence_signalled = r600_fence_signalled;