radeonsi: fix shader disk cache key

[mesa.git] / src / gallium / state_trackers / xa / xa_tracker.c

diff --git a/src/gallium/state_trackers/xa/xa_tracker.c b/src/gallium/state_trackers/xa/xa_tracker.c
index 2944b16858c04e1c478c350b3942ec006a15811f..0909044fb91ee0be5664d6f282252213bd252fd2 100644 (file)
--- a/src/gallium/state_trackers/xa/xa_tracker.c
+++ b/src/gallium/state_trackers/xa/xa_tracker.c
@@ -82,13 +82,22 @@ static const unsigned int stype_bind[XA_LAST_SURFACE_TYPE] = { 0,
 };
 
 static struct xa_format_descriptor
-xa_get_pipe_format(enum xa_formats xa_format)
+xa_get_pipe_format(struct xa_tracker *xa, enum xa_formats xa_format)
 {
     struct xa_format_descriptor fdesc;
 
     fdesc.xa_format = xa_format;
 
     switch (xa_format) {
+    case xa_format_a8:
+        if (xa->screen->is_format_supported(xa->screen, PIPE_FORMAT_R8_UNORM,
+                                            PIPE_TEXTURE_2D, 0, 0,
+                                            stype_bind[xa_type_a] |
+                                            PIPE_BIND_RENDER_TARGET))
+            fdesc.format = PIPE_FORMAT_R8_UNORM;
+        else
+            fdesc.format = PIPE_FORMAT_L8_UNORM;
+       break;
     case xa_format_a8r8g8b8:
        fdesc.format = PIPE_FORMAT_B8G8R8A8_UNORM;
        break;
@@ -101,9 +110,21 @@ xa_get_pipe_format(enum xa_formats xa_format)
     case xa_format_x1r5g5b5:
        fdesc.format = PIPE_FORMAT_B5G5R5A1_UNORM;
        break;
-    case xa_format_a8:
-       fdesc.format = PIPE_FORMAT_L8_UNORM;
-       break;
+    case xa_format_a4r4g4b4:
+        fdesc.format = PIPE_FORMAT_B4G4R4A4_UNORM;
+        break;
+    case xa_format_a2b10g10r10:
+        fdesc.format = PIPE_FORMAT_R10G10B10A2_UNORM;
+        break;
+    case xa_format_x2b10g10r10:
+        fdesc.format = PIPE_FORMAT_R10G10B10X2_UNORM;
+        break;
+    case xa_format_b8g8r8a8:
+        fdesc.format = PIPE_FORMAT_A8R8G8B8_UNORM;
+        break;
+    case xa_format_b8g8r8x8:
+        fdesc.format = PIPE_FORMAT_X8R8G8B8_UNORM;
+        break;
     case xa_format_z24:
        fdesc.format = PIPE_FORMAT_Z24X8_UNORM;
        break;
@@ -126,7 +147,12 @@ xa_get_pipe_format(enum xa_formats xa_format)
        fdesc.format = PIPE_FORMAT_S8_UINT_Z24_UNORM;
        break;
     case xa_format_yuv8:
-       fdesc.format = PIPE_FORMAT_L8_UNORM;
+        if (xa->screen->is_format_supported(xa->screen, PIPE_FORMAT_R8_UNORM,
+                                            PIPE_TEXTURE_2D, 0, 0,
+                                            stype_bind[xa_type_yuv_component]))
+            fdesc.format = PIPE_FORMAT_R8_UNORM;
+        else
+            fdesc.format = PIPE_FORMAT_L8_UNORM;
        break;
     default:
        fdesc.xa_format = xa_format_unknown;
@@ -141,21 +167,13 @@ xa_tracker_create(int drm_fd)
     struct xa_tracker *xa = calloc(1, sizeof(struct xa_tracker));
     enum xa_surface_type stype;
     unsigned int num_formats;
-    int loader_fd;
 
     if (!xa)
        return NULL;
 
-#if GALLIUM_STATIC_TARGETS
-    xa->screen = dd_create_screen(drm_fd);
-    (void) loader_fd; /* silence unused var warning */
-#else
-    loader_fd = dup(drm_fd);
-    if (loader_fd == -1)
-        return NULL;
-    if (pipe_loader_drm_probe_fd(&xa->dev, loader_fd))
-       xa->screen = pipe_loader_create_screen(xa->dev, PIPE_SEARCH_DIR);
-#endif
+    if (pipe_loader_drm_probe_fd(&xa->dev, drm_fd))
+       xa->screen = pipe_loader_create_screen(xa->dev);
+
     if (!xa->screen)
        goto out_no_screen;
 
@@ -184,10 +202,11 @@ xa_tracker_create(int drm_fd)
        for (i = 0; i < num_preferred[stype]; ++i) {
            xa_format = preferred[stype][i];
 
-           struct xa_format_descriptor fdesc = xa_get_pipe_format(xa_format);
+           struct xa_format_descriptor fdesc =
+                xa_get_pipe_format(xa, xa_format);
 
            if (xa->screen->is_format_supported(xa->screen, fdesc.format,
-                                               PIPE_TEXTURE_2D, 0, bind)) {
+                                               PIPE_TEXTURE_2D, 0, 0, bind)) {
                if (xa->format_map[stype][0] == 0)
                    xa->format_map[stype][0] = num_formats;
                xa->format_map[stype][1] = num_formats;
@@ -202,10 +221,9 @@ xa_tracker_create(int drm_fd)
  out_no_pipe:
     xa->screen->destroy(xa->screen);
  out_no_screen:
-#if !GALLIUM_STATIC_TARGETS
     if (xa->dev)
        pipe_loader_release(&xa->dev, 1);
-#endif
+
     free(xa);
     return NULL;
 }
@@ -216,9 +234,8 @@ xa_tracker_destroy(struct xa_tracker *xa)
     free(xa->supported_formats);
     xa_context_destroy(xa->default_ctx);
     xa->screen->destroy(xa->screen);
-#if !GALLIUM_STATIC_TARGETS
     pipe_loader_release(&xa->dev, 1);
-#endif
+    /* CHECK: The XA API user preserves ownership of the original fd */
     free(xa);
 }
 
@@ -259,7 +276,7 @@ xa_get_format_stype_depth(struct xa_tracker *xa,
     int found = 0;
 
     for (i = xa->format_map[stype][0]; i <= xa->format_map[stype][1]; ++i) {
-       fdesc = xa_get_pipe_format(xa->supported_formats[i]);
+       fdesc = xa_get_pipe_format(xa, xa->supported_formats[i]);
        if (fdesc.xa_format != xa_format_unknown &&
            xa_format_depth(fdesc.xa_format) == depth) {
            found = 1;
@@ -277,7 +294,7 @@ XA_EXPORT int
 xa_format_check_supported(struct xa_tracker *xa,
                          enum xa_formats xa_format, unsigned int flags)
 {
-    struct xa_format_descriptor fdesc = xa_get_pipe_format(xa_format);
+    struct xa_format_descriptor fdesc = xa_get_pipe_format(xa, xa_format);
     unsigned int bind;
 
     if (fdesc.xa_format == xa_format_unknown)
@@ -292,7 +309,7 @@ xa_format_check_supported(struct xa_tracker *xa,
        bind |= PIPE_BIND_SCANOUT;
 
     if (!xa->screen->is_format_supported(xa->screen, fdesc.format,
-                                        PIPE_TEXTURE_2D, 0, bind))
+                                        PIPE_TEXTURE_2D, 0, 0, bind))
        return -XA_ERR_INVAL;
 
     return XA_ERR_NONE;
@@ -303,12 +320,12 @@ handle_type(enum xa_handle_type type)
 {
     switch (type) {
     case xa_handle_type_kms:
-       return DRM_API_HANDLE_TYPE_KMS;
+       return WINSYS_HANDLE_TYPE_KMS;
     case xa_handle_type_fd:
-        return DRM_API_HANDLE_TYPE_FD;
+        return WINSYS_HANDLE_TYPE_FD;
     case xa_handle_type_shared:
     default:
-       return DRM_API_HANDLE_TYPE_SHARED;
+       return WINSYS_HANDLE_TYPE_SHARED;
     }
 }
 
@@ -328,7 +345,7 @@ surface_create(struct xa_tracker *xa,
     if (xa_format == xa_format_unknown)
        fdesc = xa_get_format_stype_depth(xa, stype, depth);
     else
-       fdesc = xa_get_pipe_format(xa_format);
+       fdesc = xa_get_pipe_format(xa, xa_format);
 
     if (fdesc.xa_format == xa_format_unknown)
        return NULL;
@@ -355,7 +372,8 @@ surface_create(struct xa_tracker *xa,
        template->bind |= PIPE_BIND_SCANOUT;
 
     if (whandle)
-       srf->tex = xa->screen->resource_from_handle(xa->screen, template, whandle);
+       srf->tex = xa->screen->resource_from_handle(xa->screen, template, whandle,
+                                                    PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
     else
        srf->tex = xa->screen->resource_create(xa->screen, template);
     if (!srf->tex)
@@ -395,7 +413,7 @@ xa_surface_from_handle(struct xa_tracker *xa,
                  uint32_t handle, uint32_t stride)
 {
     return xa_surface_from_handle2(xa, width, height, depth, stype, xa_format,
-                                   DRM_API_HANDLE_TYPE_SHARED, flags, handle,
+                                   WINSYS_HANDLE_TYPE_SHARED, flags, handle,
                                    stride);
 }
 
@@ -440,7 +458,7 @@ xa_surface_redefine(struct xa_surface *srf,
     if (xa_format == xa_format_unknown)
        fdesc = xa_get_format_stype_depth(xa, stype, depth);
     else
-       fdesc = xa_get_pipe_format(xa_format);
+       fdesc = xa_get_pipe_format(xa, xa_format);
 
     if (width == template->width0 && height == template->height0 &&
        template->format == fdesc.format &&
@@ -461,7 +479,7 @@ xa_surface_redefine(struct xa_surface *srf,
            return -XA_ERR_INVAL;
 
        if (!xa->screen->is_format_supported(xa->screen, fdesc.format,
-                                            PIPE_TEXTURE_2D, 0,
+                                            PIPE_TEXTURE_2D, 0, 0,
                                             template->bind |
                                             PIPE_BIND_RENDER_TARGET))
            return -XA_ERR_INVAL;
@@ -541,7 +559,9 @@ xa_surface_handle(struct xa_surface *srf,
 
     memset(&whandle, 0, sizeof(whandle));
     whandle.type = handle_type(type);
-    res = screen->resource_get_handle(screen, srf->tex, &whandle);
+    res = screen->resource_get_handle(screen, srf->xa->default_ctx->pipe,
+                                      srf->tex, &whandle,
+                                      PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
     if (!res)
        return -XA_ERR_INVAL;