X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ftrace%2Ftr_screen.c;h=8b02680c77e0c97228aeb592c06c3f81b8dcf306;hb=525921ed51176255474c73adacfc6801a7bf2783;hp=117503aaff694c8346e14fd53365362a7a2eb849;hpb=cd8614b0287dc5a69725ec4ee0208fad61f7789e;p=mesa.git

diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index 117503aaff6..8b02680c77e 100644
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -27,20 +27,18 @@
 
 #include "util/u_format.h"
 #include "util/u_memory.h"
-#include "util/u_simple_list.h"
+#include "util/simple_list.h"
 
-#include "tr_buffer.h"
 #include "tr_dump.h"
+#include "tr_dump_defines.h"
 #include "tr_dump_state.h"
 #include "tr_texture.h"
+#include "tr_context.h"
 #include "tr_screen.h"
-
-#include "pipe/p_inlines.h"
-#include "pipe/p_format.h"
+#include "tr_public.h"
 
 
 static boolean trace = FALSE;
-static boolean rbug = FALSE;
 
 static const char *
 trace_screen_get_name(struct pipe_screen *_screen)
@@ -84,22 +82,20 @@ trace_screen_get_vendor(struct pipe_screen *_screen)
 }
 
 
-static int
-trace_screen_get_param(struct pipe_screen *_screen,
-                       int param)
+static const char *
+trace_screen_get_device_vendor(struct pipe_screen *_screen)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
-   int result;
+   const char *result;
 
-   trace_dump_call_begin("pipe_screen", "get_param");
+   trace_dump_call_begin("pipe_screen", "get_device_vendor");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(int, param);
 
-   result = screen->get_param(screen, param);
+   result = screen->get_device_vendor(screen);
 
-   trace_dump_ret(int, result);
+   trace_dump_ret(string, result);
 
    trace_dump_call_end();
 
@@ -107,22 +103,22 @@ trace_screen_get_param(struct pipe_screen *_screen,
 }
 
 
-static float
-trace_screen_get_paramf(struct pipe_screen *_screen,
-                        int param)
+static int
+trace_screen_get_param(struct pipe_screen *_screen,
+                       enum pipe_cap param)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
-   float result;
+   int result;
 
-   trace_dump_call_begin("pipe_screen", "get_paramf");
+   trace_dump_call_begin("pipe_screen", "get_param");
 
    trace_dump_arg(ptr, screen);
    trace_dump_arg(int, param);
 
-   result = screen->get_paramf(screen, param);
+   result = screen->get_param(screen, param);
 
-   trace_dump_ret(float, result);
+   trace_dump_ret(int, result);
 
    trace_dump_call_end();
 
@@ -130,28 +126,23 @@ trace_screen_get_paramf(struct pipe_screen *_screen,
 }
 
 
-static boolean
-trace_screen_is_format_supported(struct pipe_screen *_screen,
-                                 enum pipe_format format,
-                                 enum pipe_texture_target target,
-                                 unsigned tex_usage,
-                                 unsigned geom_flags)
+static int
+trace_screen_get_shader_param(struct pipe_screen *_screen, unsigned shader,
+                       enum pipe_shader_cap param)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
-   boolean result;
+   int result;
 
-   trace_dump_call_begin("pipe_screen", "is_format_supported");
+   trace_dump_call_begin("pipe_screen", "get_shader_param");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(format, format);
-   trace_dump_arg(int, target);
-   trace_dump_arg(uint, tex_usage);
-   trace_dump_arg(uint, geom_flags);
+   trace_dump_arg(uint, shader);
+   trace_dump_arg(int, param);
 
-   result = screen->is_format_supported(screen, format, target, tex_usage, geom_flags);
+   result = screen->get_shader_param(screen, shader, param);
 
-   trace_dump_ret(bool, result);
+   trace_dump_ret(int, result);
 
    trace_dump_call_end();
 
@@ -159,583 +150,196 @@ trace_screen_is_format_supported(struct pipe_screen *_screen,
 }
 
 
-static void
-trace_screen_flush_frontbuffer(struct pipe_screen *_screen,
-                               struct pipe_surface *_surface,
-                               void *context_private)
-{
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_surface *tr_surf = trace_surface(_surface);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_surface *surface = tr_surf->surface;
-
-   trace_dump_call_begin("pipe_screen", "flush_frontbuffer");
-
-   trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, surface);
-   /* XXX: hide, as there is nothing we can do with this
-   trace_dump_arg(ptr, context_private);
-   */
-
-   screen->flush_frontbuffer(screen, surface, context_private);
-
-   trace_dump_call_end();
-}
-
-
-/********************************************************************
- * texture
- */
-
-
-static struct pipe_texture *
-trace_screen_texture_create(struct pipe_screen *_screen,
-                            const struct pipe_texture *templat)
+static float
+trace_screen_get_paramf(struct pipe_screen *_screen,
+                        enum pipe_capf param)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_texture *result;
+   float result;
 
-   trace_dump_call_begin("pipe_screen", "texture_create");
+   trace_dump_call_begin("pipe_screen", "get_paramf");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(template, templat);
+   trace_dump_arg(int, param);
 
-   result = screen->texture_create(screen, templat);
+   result = screen->get_paramf(screen, param);
 
-   trace_dump_ret(ptr, result);
+   trace_dump_ret(float, result);
 
    trace_dump_call_end();
 
-   result = trace_texture_create(tr_scr, result);
-
    return result;
 }
 
 
-static struct pipe_texture *
-trace_screen_texture_blanket(struct pipe_screen *_screen,
-                             const struct pipe_texture *templat,
-                             const unsigned *ppitch,
-                             struct pipe_buffer *_buffer)
+static boolean
+trace_screen_is_format_supported(struct pipe_screen *_screen,
+                                 enum pipe_format format,
+                                 enum pipe_texture_target target,
+                                 unsigned sample_count,
+                                 unsigned tex_usage)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_buffer *tr_buf = trace_buffer(_buffer);
    struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *buffer = tr_buf->buffer;
-   unsigned pitch = *ppitch;
-   struct pipe_texture *result;
+   boolean result;
 
-   trace_dump_call_begin("pipe_screen", "texture_blanket");
+   trace_dump_call_begin("pipe_screen", "is_format_supported");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(template, templat);
-   trace_dump_arg(uint, pitch);
-   trace_dump_arg(ptr, buffer);
+   trace_dump_arg(format, format);
+   trace_dump_arg(int, target);
+   trace_dump_arg(uint, sample_count);
+   trace_dump_arg(uint, tex_usage);
 
-   result = screen->texture_blanket(screen, templat, ppitch, buffer);
+   result = screen->is_format_supported(screen, format, target, sample_count,
+                                        tex_usage);
 
-   trace_dump_ret(ptr, result);
+   trace_dump_ret(bool, result);
 
    trace_dump_call_end();
 
-   result = trace_texture_create(tr_scr, result);
-
    return result;
 }
 
 
-static void
-trace_screen_texture_destroy(struct pipe_texture *_texture)
-{
-   struct trace_screen *tr_scr = trace_screen(_texture->screen);
-   struct trace_texture *tr_tex = trace_texture(_texture);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_texture *texture = tr_tex->texture;
-
-   assert(texture->screen == screen);
-
-   trace_dump_call_begin("pipe_screen", "texture_destroy");
-
-   trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, texture);
-
-   trace_dump_call_end();
-
-   trace_texture_destroy(tr_tex);
-}
-
-
-/********************************************************************
- * surface
- */
-
-
-static struct pipe_surface *
-trace_screen_get_tex_surface(struct pipe_screen *_screen,
-                             struct pipe_texture *_texture,
-                             unsigned face, unsigned level,
-                             unsigned zslice,
-                             unsigned usage)
+static struct pipe_context *
+trace_screen_context_create(struct pipe_screen *_screen, void *priv,
+                            unsigned flags)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_texture *tr_tex = trace_texture(_texture);
    struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_texture *texture = tr_tex->texture;
-   struct pipe_surface *result = NULL;
+   struct pipe_context *result;
 
-   assert(texture->screen == screen);
-
-   trace_dump_call_begin("pipe_screen", "get_tex_surface");
+   trace_dump_call_begin("pipe_screen", "context_create");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, texture);
-   trace_dump_arg(uint, face);
-   trace_dump_arg(uint, level);
-   trace_dump_arg(uint, zslice);
-   trace_dump_arg(uint, usage);
+   trace_dump_arg(ptr, priv);
+   trace_dump_arg(uint, flags);
 
-   result = screen->get_tex_surface(screen, texture, face, level, zslice, usage);
+   result = screen->context_create(screen, priv, flags);
 
    trace_dump_ret(ptr, result);
 
    trace_dump_call_end();
 
-   result = trace_surface_create(tr_tex, result);
+   result = trace_context_create(tr_scr, result);
 
    return result;
 }
 
 
 static void
-trace_screen_tex_surface_destroy(struct pipe_surface *_surface)
-{
-   struct trace_screen *tr_scr = trace_screen(_surface->texture->screen);
-   struct trace_surface *tr_surf = trace_surface(_surface);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_surface *surface = tr_surf->surface;
-
-   trace_dump_call_begin("pipe_screen", "tex_surface_destroy");
-
-   trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, surface);
-
-   trace_dump_call_end();
-
-   trace_surface_destroy(tr_surf);
-}
-
-
-/********************************************************************
- * transfer
- */
-
-
-static struct pipe_transfer *
-trace_screen_get_tex_transfer(struct pipe_screen *_screen,
-                              struct pipe_texture *_texture,
-                              unsigned face, unsigned level,
-                              unsigned zslice,
-                              enum pipe_transfer_usage usage,
-                              unsigned x, unsigned y, unsigned w, unsigned h)
+trace_screen_flush_frontbuffer(struct pipe_screen *_screen,
+                               struct pipe_resource *_resource,
+                               unsigned level, unsigned layer,
+                               void *context_private,
+                               struct pipe_box *sub_box)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_texture *tr_tex = trace_texture(_texture);
+   struct trace_resource *tr_res = trace_resource(_resource);
    struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_texture *texture = tr_tex->texture;
-   struct pipe_transfer *result = NULL;
-
-   assert(texture->screen == screen);
+   struct pipe_resource *resource = tr_res->resource;
 
-   trace_dump_call_begin("pipe_screen", "get_tex_transfer");
+   trace_dump_call_begin("pipe_screen", "flush_frontbuffer");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, texture);
-   trace_dump_arg(uint, face);
+   trace_dump_arg(ptr, resource);
    trace_dump_arg(uint, level);
-   trace_dump_arg(uint, zslice);
-   trace_dump_arg(uint, usage);
-
-   trace_dump_arg(uint, x);
-   trace_dump_arg(uint, y);
-   trace_dump_arg(uint, w);
-   trace_dump_arg(uint, h);
-
-   result = screen->get_tex_transfer(screen, texture, face, level, zslice, usage,
-                                     x, y, w, h);
-
-   trace_dump_ret(ptr, result);
-
-   trace_dump_call_end();
-
-   if (result)
-      result = trace_transfer_create(tr_tex, result);
-
-   return result;
-}
-
-
-static void
-trace_screen_tex_transfer_destroy(struct pipe_transfer *_transfer)
-{
-   struct trace_screen *tr_scr = trace_screen(_transfer->texture->screen);
-   struct trace_transfer *tr_trans = trace_transfer(_transfer);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_transfer *transfer = tr_trans->transfer;
-
-   trace_dump_call_begin("pipe_screen", "tex_transfer_destroy");
+   trace_dump_arg(uint, layer);
+   /* XXX: hide, as there is nothing we can do with this
+   trace_dump_arg(ptr, context_private);
+   */
 
-   trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, transfer);
+   screen->flush_frontbuffer(screen, resource, level, layer, context_private, sub_box);
 
    trace_dump_call_end();
-
-   trace_transfer_destroy(tr_trans);
-}
-
-
-static void *
-trace_screen_transfer_map(struct pipe_screen *_screen,
-                          struct pipe_transfer *_transfer)
-{
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_transfer *tr_trans = trace_transfer(_transfer);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_transfer *transfer = tr_trans->transfer;
-   void *map;
-
-   map = screen->transfer_map(screen, transfer);
-   if(map) {
-      if(transfer->usage & PIPE_TRANSFER_WRITE) {
-         assert(!tr_trans->map);
-         tr_trans->map = map;
-      }
-   }
-
-   return map;
-}
-
-
-static void
-trace_screen_transfer_unmap(struct pipe_screen *_screen,
-                           struct pipe_transfer *_transfer)
-{
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_transfer *tr_trans = trace_transfer(_transfer);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_transfer *transfer = tr_trans->transfer;
-
-   if(tr_trans->map) {
-      size_t size = util_format_get_nblocksy(transfer->texture->format, transfer->height) * transfer->stride;
-
-      trace_dump_call_begin("pipe_screen", "transfer_write");
-
-      trace_dump_arg(ptr, screen);
-
-      trace_dump_arg(ptr, transfer);
-
-      trace_dump_arg_begin("stride");
-      trace_dump_uint(transfer->stride);
-      trace_dump_arg_end();
-
-      trace_dump_arg_begin("data");
-      trace_dump_bytes(tr_trans->map, size);
-      trace_dump_arg_end();
-
-      trace_dump_arg_begin("size");
-      trace_dump_uint(size);
-      trace_dump_arg_end();
-
-      trace_dump_call_end();
-
-      tr_trans->map = NULL;
-   }
-
-   screen->transfer_unmap(screen, transfer);
 }
 
 
 /********************************************************************
- * buffer
+ * texture
  */
 
 
-static struct pipe_buffer *
-trace_screen_surface_buffer_create(struct pipe_screen *_screen,
-                                   unsigned width, unsigned height,
-                                   enum pipe_format format,
-                                   unsigned usage,
-                                   unsigned tex_usage,
-                                   unsigned *pstride)
-{
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct pipe_screen *screen = tr_scr->screen;
-   unsigned stride;
-   struct pipe_buffer *result;
-
-   trace_dump_call_begin("pipe_screen", "surface_buffer_create");
-
-   trace_dump_arg(ptr, screen);
-   trace_dump_arg(uint, width);
-   trace_dump_arg(uint, height);
-   trace_dump_arg(format, format);
-   trace_dump_arg(uint, usage);
-   trace_dump_arg(uint, tex_usage);
-
-   result = screen->surface_buffer_create(screen,
-                                          width, height,
-                                          format,
-                                          usage,
-                                          tex_usage,
-                                          pstride);
-
-   stride = *pstride;
-
-   trace_dump_arg(uint, stride);
-
-   trace_dump_ret(ptr, result);
-
-   trace_dump_call_end();
-
-   return trace_buffer_create(tr_scr, result);
-}
-
-
-static struct pipe_buffer *
-trace_screen_buffer_create(struct pipe_screen *_screen,
-                           unsigned alignment,
-                           unsigned usage,
-                           unsigned size)
-{
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *result;
-
-   trace_dump_call_begin("pipe_screen", "buffer_create");
-
-   trace_dump_arg(ptr, screen);
-   trace_dump_arg(uint, alignment);
-   trace_dump_arg(uint, usage);
-   trace_dump_arg(uint, size);
-
-   result = screen->buffer_create(screen, alignment, usage, size);
-
-   trace_dump_ret(ptr, result);
-
-   trace_dump_call_end();
-
-   /* Zero the buffer to avoid dumping uninitialized memory */
-   if(result->usage & PIPE_BUFFER_USAGE_CPU_WRITE) {
-      void *map;
-      map = pipe_buffer_map(screen, result, PIPE_BUFFER_USAGE_CPU_WRITE);
-      if(map) {
-         memset(map, 0, result->size);
-         screen->buffer_unmap(screen, result);
-      }
-   }
-
-   return trace_buffer_create(tr_scr, result);
-}
-
-
-static struct pipe_buffer *
-trace_screen_user_buffer_create(struct pipe_screen *_screen,
-                                void *data,
-                                unsigned size)
+static struct pipe_resource *
+trace_screen_resource_create(struct pipe_screen *_screen,
+                            const struct pipe_resource *templat)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *result;
+   struct pipe_resource *result;
 
-   trace_dump_call_begin("pipe_screen", "user_buffer_create");
+   trace_dump_call_begin("pipe_screen", "resource_create");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg_begin("data");
-   trace_dump_bytes(data, size);
-   trace_dump_arg_end();
-   trace_dump_arg(uint, size);
+   trace_dump_arg(resource_template, templat);
 
-   result = screen->user_buffer_create(screen, data, size);
+   result = screen->resource_create(screen, templat);
 
    trace_dump_ret(ptr, result);
 
    trace_dump_call_end();
 
-   if(result) {
-      assert(!(result->usage & TRACE_BUFFER_USAGE_USER));
-      result->usage |= TRACE_BUFFER_USAGE_USER;
-   }
-
-   return trace_buffer_create(tr_scr, result);
-}
-
-
-/**
- * This function is used to track if data has been changed on a user buffer
- * without map/unmap being called.
- */
-void
-trace_screen_user_buffer_update(struct pipe_screen *_screen,
-                                struct pipe_buffer *_buffer)
-{
-#if 0
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct pipe_screen *screen = tr_scr->screen;
-   const void *map;
-
-   if(buffer && buffer->usage & TRACE_BUFFER_USAGE_USER) {
-      map = screen->buffer_map(screen, buffer, PIPE_BUFFER_USAGE_CPU_READ);
-      if(map) {
-         trace_dump_call_begin("pipe_winsys", "buffer_write");
-
-         trace_dump_arg(ptr, screen);
-
-         trace_dump_arg(ptr, buffer);
-
-         trace_dump_arg_begin("data");
-         trace_dump_bytes(map, buffer->size);
-         trace_dump_arg_end();
-
-         trace_dump_arg_begin("size");
-         trace_dump_uint(buffer->size);
-         trace_dump_arg_end();
+   result = trace_resource_create(tr_scr, result);
 
-         trace_dump_call_end();
-
-         screen->buffer_unmap(screen, buffer);
-      }
-   }
-#endif
+   return result;
 }
 
-
-static void *
-trace_screen_buffer_map(struct pipe_screen *_screen,
-                        struct pipe_buffer *_buffer,
-                        unsigned usage)
+static struct pipe_resource *
+trace_screen_resource_from_handle(struct pipe_screen *_screen,
+                                 const struct pipe_resource *templ,
+                                 struct winsys_handle *handle)
 {
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_buffer *tr_buf = trace_buffer(_buffer);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *buffer = tr_buf->buffer;
-   void *map;
-
-   assert(screen->buffer_map);
-   map = screen->buffer_map(screen, buffer, usage);
-   if(map) {
-      if(usage & PIPE_BUFFER_USAGE_CPU_WRITE) {
-         tr_buf->map = map;
-      }
-   }
+   struct trace_screen *tr_screen = trace_screen(_screen);
+   struct pipe_screen *screen = tr_screen->screen;
+   struct pipe_resource *result;
 
-   return map;
-}
+   /* TODO trace call */
 
+   result = screen->resource_from_handle(screen, templ, handle);
 
-static void *
-trace_screen_buffer_map_range(struct pipe_screen *_screen,
-                              struct pipe_buffer *_buffer,
-                              unsigned offset,
-                              unsigned length,
-                              unsigned usage)
-{
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_buffer *tr_buf = trace_buffer(_buffer);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *buffer = tr_buf->buffer;
-   void *map;
-
-   assert(screen->buffer_map_range);
-   map = screen->buffer_map_range(screen, buffer, offset, length, usage);
-   if(map) {
-      if(usage & PIPE_BUFFER_USAGE_CPU_WRITE) {
-         tr_buf->map = map;
-      }
-   }
+   result = trace_resource_create(trace_screen(_screen), result);
 
-   return map;
+   return result;
 }
 
-
-static void
-buffer_write(struct pipe_screen *screen,
-             struct pipe_buffer *buffer,
-             unsigned offset,
-             const char *map,
-             unsigned size)
+static boolean
+trace_screen_resource_get_handle(struct pipe_screen *_screen,
+                                struct pipe_resource *_resource,
+                                struct winsys_handle *handle)
 {
-   assert(map);
-
-   trace_dump_call_begin("pipe_screen", "buffer_write");
-
-   trace_dump_arg(ptr, screen);
-
-   trace_dump_arg(ptr, buffer);
-
-   trace_dump_arg(uint, offset);
+   struct trace_screen *tr_screen = trace_screen(_screen);
+   struct trace_resource *tr_resource = trace_resource(_resource);
+   struct pipe_screen *screen = tr_screen->screen;
+   struct pipe_resource *resource = tr_resource->resource;
 
-   trace_dump_arg_begin("data");
-   trace_dump_bytes(map + offset, size);
-   trace_dump_arg_end();
-
-   trace_dump_arg(uint, size);
-
-   trace_dump_call_end();
+   /* TODO trace call */
 
+   return screen->resource_get_handle(screen, resource, handle);
 }
 
 
-static void
-trace_screen_buffer_flush_mapped_range(struct pipe_screen *_screen,
-                                       struct pipe_buffer *_buffer,
-                                       unsigned offset,
-                                       unsigned length)
-{
-   struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_buffer *tr_buf = trace_buffer(_buffer);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *buffer = tr_buf->buffer;
-
-   assert(tr_buf->map);
-   buffer_write(screen, buffer, offset, tr_buf->map, length);
-   tr_buf->range_flushed = TRUE;
-   screen->buffer_flush_mapped_range(screen, buffer, offset, length);
-}
-
 
 static void
-trace_screen_buffer_unmap(struct pipe_screen *_screen,
-                          struct pipe_buffer *_buffer)
+trace_screen_resource_destroy(struct pipe_screen *_screen,
+			      struct pipe_resource *_resource)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
-   struct trace_buffer *tr_buf = trace_buffer(_buffer);
+   struct trace_resource *tr_res = trace_resource(_resource);
    struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *buffer = tr_buf->buffer;
+   struct pipe_resource *resource = tr_res->resource;
 
-   if (tr_buf->map && !tr_buf->range_flushed)
-      buffer_write(screen, buffer, 0, tr_buf->map, buffer->size);
-   tr_buf->map = NULL;
-   tr_buf->range_flushed = FALSE;
-   screen->buffer_unmap(screen, buffer);
-}
-
-
-static void
-trace_screen_buffer_destroy(struct pipe_buffer *_buffer)
-{
-   struct trace_screen *tr_scr = trace_screen(_buffer->screen);
-   struct trace_buffer *tr_buf = trace_buffer(_buffer);
-   struct pipe_screen *screen = tr_scr->screen;
-   struct pipe_buffer *buffer = tr_buf->buffer;
+   assert(resource->screen == screen);
 
-   trace_dump_call_begin("pipe_screen", "buffer_destroy");
+   trace_dump_call_begin("pipe_screen", "resource_destroy");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, buffer);
+   trace_dump_arg(ptr, resource);
 
    trace_dump_call_end();
 
-   trace_buffer_destroy(tr_scr, _buffer);
+   trace_resource_destroy(tr_scr, tr_res);
 }
 
 
@@ -768,24 +372,24 @@ trace_screen_fence_reference(struct pipe_screen *_screen,
 }
 
 
-static int
-trace_screen_fence_signalled(struct pipe_screen *_screen,
-                             struct pipe_fence_handle *fence,
-                             unsigned flags)
+static boolean
+trace_screen_fence_finish(struct pipe_screen *_screen,
+                          struct pipe_fence_handle *fence,
+                          uint64_t timeout)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
    int result;
 
-   trace_dump_call_begin("pipe_screen", "fence_signalled");
+   trace_dump_call_begin("pipe_screen", "fence_finish");
 
    trace_dump_arg(ptr, screen);
    trace_dump_arg(ptr, fence);
-   trace_dump_arg(uint, flags);
+   trace_dump_arg(uint, timeout);
 
-   result = screen->fence_signalled(screen, fence, flags);
+   result = screen->fence_finish(screen, fence, timeout);
 
-   trace_dump_ret(int, result);
+   trace_dump_ret(bool, result);
 
    trace_dump_call_end();
 
@@ -793,35 +397,28 @@ trace_screen_fence_signalled(struct pipe_screen *_screen,
 }
 
 
-static int
-trace_screen_fence_finish(struct pipe_screen *_screen,
-                          struct pipe_fence_handle *fence,
-                          unsigned flags)
+/********************************************************************
+ * screen
+ */
+
+static uint64_t
+trace_screen_get_timestamp(struct pipe_screen *_screen)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
-   int result;
-
-   trace_dump_call_begin("pipe_screen", "fence_finish");
+   uint64_t result;
 
+   trace_dump_call_begin("pipe_screen", "get_timestamp");
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(ptr, fence);
-   trace_dump_arg(uint, flags);
 
-   result = screen->fence_finish(screen, fence, flags);
-
-   trace_dump_ret(int, result);
+   result = screen->get_timestamp(screen);
 
+   trace_dump_ret(uint, result);
    trace_dump_call_end();
 
    return result;
 }
 
-
-/********************************************************************
- * screen
- */
-
 static void
 trace_screen_destroy(struct pipe_screen *_screen)
 {
@@ -831,10 +428,6 @@ trace_screen_destroy(struct pipe_screen *_screen)
    trace_dump_call_begin("pipe_screen", "destroy");
    trace_dump_arg(ptr, screen);
    trace_dump_call_end();
-   trace_dump_trace_end();
-
-   if (tr_scr->rbug)
-      trace_rbug_stop(tr_scr->rbug);
 
    screen->destroy(screen);
 
@@ -850,18 +443,11 @@ trace_enabled(void)
       return trace;
    firstrun = FALSE;
 
-   trace_dump_init();
-
    if(trace_dump_trace_begin()) {
       trace_dumping_start();
       trace = TRUE;
    }
 
-   if (debug_get_bool_option("GALLIUM_RBUG", FALSE)) {
-      trace = TRUE;
-      rbug = TRUE;
-   }
-
    return trace;
 }
 
@@ -869,7 +455,6 @@ struct pipe_screen *
 trace_screen_create(struct pipe_screen *screen)
 {
    struct trace_screen *tr_scr;
-   struct pipe_winsys *winsys;
 
    if(!screen)
       goto error1;
@@ -883,70 +468,35 @@ trace_screen_create(struct pipe_screen *screen)
    if(!tr_scr)
       goto error2;
 
-#if 0
-   winsys = trace_winsys_create(screen->winsys);
-   if(!winsys)
-      goto error3;
-#else
-   winsys = screen->winsys;
-#endif
-   pipe_mutex_init(tr_scr->list_mutex);
-   make_empty_list(&tr_scr->buffers);
-   make_empty_list(&tr_scr->contexts);
-   make_empty_list(&tr_scr->textures);
-   make_empty_list(&tr_scr->surfaces);
-   make_empty_list(&tr_scr->transfers);
-
-   tr_scr->base.winsys = winsys;
    tr_scr->base.destroy = trace_screen_destroy;
    tr_scr->base.get_name = trace_screen_get_name;
    tr_scr->base.get_vendor = trace_screen_get_vendor;
+   tr_scr->base.get_device_vendor = trace_screen_get_device_vendor;
    tr_scr->base.get_param = trace_screen_get_param;
+   tr_scr->base.get_shader_param = trace_screen_get_shader_param;
    tr_scr->base.get_paramf = trace_screen_get_paramf;
    tr_scr->base.is_format_supported = trace_screen_is_format_supported;
-   tr_scr->base.texture_create = trace_screen_texture_create;
-   tr_scr->base.texture_blanket = trace_screen_texture_blanket;
-   tr_scr->base.texture_destroy = trace_screen_texture_destroy;
-   tr_scr->base.get_tex_surface = trace_screen_get_tex_surface;
-   tr_scr->base.tex_surface_destroy = trace_screen_tex_surface_destroy;
-   tr_scr->base.get_tex_transfer = trace_screen_get_tex_transfer;
-   tr_scr->base.tex_transfer_destroy = trace_screen_tex_transfer_destroy;
-   tr_scr->base.transfer_map = trace_screen_transfer_map;
-   tr_scr->base.transfer_unmap = trace_screen_transfer_unmap;
-   tr_scr->base.buffer_create = trace_screen_buffer_create;
-   tr_scr->base.user_buffer_create = trace_screen_user_buffer_create;
-   tr_scr->base.surface_buffer_create = trace_screen_surface_buffer_create;
-   if (screen->buffer_map)
-      tr_scr->base.buffer_map = trace_screen_buffer_map;
-   if (screen->buffer_map_range)
-      tr_scr->base.buffer_map_range = trace_screen_buffer_map_range;
-   if (screen->buffer_flush_mapped_range)
-      tr_scr->base.buffer_flush_mapped_range = trace_screen_buffer_flush_mapped_range;
-   if (screen->buffer_unmap)
-      tr_scr->base.buffer_unmap = trace_screen_buffer_unmap;
-   tr_scr->base.buffer_destroy = trace_screen_buffer_destroy;
+   assert(screen->context_create);
+   tr_scr->base.context_create = trace_screen_context_create;
+   tr_scr->base.resource_create = trace_screen_resource_create;
+   tr_scr->base.resource_from_handle = trace_screen_resource_from_handle;
+   tr_scr->base.resource_get_handle = trace_screen_resource_get_handle;
+   tr_scr->base.resource_destroy = trace_screen_resource_destroy;
    tr_scr->base.fence_reference = trace_screen_fence_reference;
-   tr_scr->base.fence_signalled = trace_screen_fence_signalled;
    tr_scr->base.fence_finish = trace_screen_fence_finish;
    tr_scr->base.flush_frontbuffer = trace_screen_flush_frontbuffer;
+   tr_scr->base.get_timestamp = trace_screen_get_timestamp;
+
    tr_scr->screen = screen;
 
    trace_dump_ret(ptr, screen);
    trace_dump_call_end();
 
-   if (rbug)
-      tr_scr->rbug = trace_rbug_start(tr_scr);
-
    return &tr_scr->base;
 
-#if 0
-error3:
-   FREE(tr_scr);
-#endif
 error2:
    trace_dump_ret(ptr, screen);
    trace_dump_call_end();
-   trace_dump_trace_end();
 error1:
    return screen;
 }