Merge branch 'gallium-msaa'

[mesa.git] / src / gallium / state_trackers / xorg / xorg_dri2.c

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index f23e4c6cc7ca9f9b033d8f69bc92ae53e1bccac0..e719644d340c5ab3ff226b172789f8df176d3f7e 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -53,14 +53,14 @@ static Bool set_format_in_do_create_buffer;
 
 typedef struct {
     PixmapPtr pPixmap;
-    struct pipe_texture *tex;
+    struct pipe_resource *tex;
     struct pipe_fence_handle *fence;
 } *BufferPrivatePtr;
 
 static Bool
 dri2_do_create_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer, unsigned int format)
 {
-    struct pipe_texture *tex = NULL;
+    struct pipe_resource *tex = NULL;
     ScreenPtr pScreen = pDraw->pScreen;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     modesettingPtr ms = modesettingPTR(pScrn);
@@ -101,9 +101,9 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer, unsigned int form
         /* Fall through */
     case DRI2BufferDepth:
        if (exa_priv->depth_stencil_tex)
-           pipe_texture_reference(&tex, exa_priv->depth_stencil_tex);
+           pipe_resource_reference(&tex, exa_priv->depth_stencil_tex);
         else {
-           struct pipe_texture template;
+           struct pipe_resource template;
             unsigned depthBits = (format != 0) ? format : pDraw->depth;
            memset(&template, 0, sizeof(template));
            template.target = PIPE_TEXTURE_2D;
@@ -122,16 +122,16 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer, unsigned int form
                }
             } else {
                template.format = ms->ds_depth_bits_last ?
-                                 PIPE_FORMAT_Z24S8_UNORM : PIPE_FORMAT_S8Z24_UNORM;
+                                 PIPE_FORMAT_Z24_UNORM_S8_USCALED : PIPE_FORMAT_S8_USCALED_Z24_UNORM;
             }
            template.width0 = pDraw->width;
            template.height0 = pDraw->height;
            template.depth0 = 1;
            template.last_level = 0;
-           template.tex_usage = PIPE_TEXTURE_USAGE_DEPTH_STENCIL |
-               PIPE_TEXTURE_USAGE_SHARED;
-           tex = ms->screen->texture_create(ms->screen, &template);
-           pipe_texture_reference(&exa_priv->depth_stencil_tex, tex);
+           template.bind = PIPE_BIND_DEPTH_STENCIL |
+               PIPE_BIND_SHARED;
+           tex = ms->screen->resource_create(ms->screen, &template);
+           pipe_resource_reference(&exa_priv->depth_stencil_tex, tex);
        }
        break;
     }
@@ -157,7 +157,7 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer, unsigned int form
     memset(&whandle, 0, sizeof(whandle));
     whandle.type = DRM_API_HANDLE_TYPE_SHARED;
 
-    ms->screen->texture_get_handle(ms->screen, tex, &whandle);
+    ms->screen->resource_get_handle(ms->screen, tex, &whandle);
 
     buffer->name = whandle.handle;
     buffer->pitch = whandle.stride;
@@ -185,9 +185,9 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
     BufferPrivatePtr private = buffer->driverPrivate;
     struct exa_pixmap_priv *exa_priv = exaGetPixmapDriverPrivate(private->pPixmap);
 
-    pipe_texture_reference(&private->tex, NULL);
+    pipe_resource_reference(&private->tex, NULL);
     ms->screen->fence_reference(ms->screen, &private->fence, NULL);
-    pipe_texture_reference(&exa_priv->depth_stencil_tex, NULL);
+    pipe_resource_reference(&exa_priv->depth_stencil_tex, NULL);
     (*pScreen->DestroyPixmap)(private->pPixmap);
 }
 
@@ -403,7 +403,7 @@ xorg_dri2_init(ScreenPtr pScreen)
     }
 #endif
 
-    dri2info.version = DRI2INFOREC_VERSION;
+    dri2info.version = min(DRI2INFOREC_VERSION, 3);
     dri2info.fd = ms->fd;
 
     dri2info.driverName = pScrn->driverName;
@@ -437,11 +437,13 @@ xorg_dri2_init(ScreenPtr pScreen)
     ms->d_depth_bits_last =
         ms->screen->is_format_supported(ms->screen, PIPE_FORMAT_Z24X8_UNORM,
                                         PIPE_TEXTURE_2D,
-                                        PIPE_TEXTURE_USAGE_DEPTH_STENCIL, 0);
+                                        0,
+                                        PIPE_BIND_DEPTH_STENCIL, 0);
     ms->ds_depth_bits_last =
-        ms->screen->is_format_supported(ms->screen, PIPE_FORMAT_Z24S8_UNORM,
+        ms->screen->is_format_supported(ms->screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
                                         PIPE_TEXTURE_2D,
-                                        PIPE_TEXTURE_USAGE_DEPTH_STENCIL, 0);
+                                        0,
+                                        PIPE_BIND_DEPTH_STENCIL, 0);
 
     return DRI2ScreenInit(pScreen, &dri2info);
 }