Revert "r300g,radeong: finish and enable the immediate mode"

This reverts commit 112239e9a66a155d36fe2ad0ab130e6f26eff298.

5 files changed, 15 insertions, 86 deletions

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
index 5214b6d8bc..25e1cdcdb6 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
@@ -51,23 +51,6 @@ static const char *radeon_get_name(struct pipe_winsys *ws)
     return "Radeon/GEM+KMS";
 }
 
-uint32_t radeon_domain_from_usage(unsigned usage)
-{
-    uint32_t domain = 0;
-
-    if (usage & PIPE_BUFFER_USAGE_PIXEL) {
-        domain |= RADEON_GEM_DOMAIN_VRAM;
-    }
-    if (usage & PIPE_BUFFER_USAGE_VERTEX) {
-        domain |= RADEON_GEM_DOMAIN_GTT;
-    }
-    if (usage & PIPE_BUFFER_USAGE_INDEX) {
-        domain |= RADEON_GEM_DOMAIN_GTT;
-    }
-
-    return domain;
-}
-
 static struct pipe_buffer *radeon_buffer_create(struct pipe_winsys *ws,
                                                 unsigned alignment,
                                                 unsigned usage,
@@ -88,17 +71,25 @@ static struct pipe_buffer *radeon_buffer_create(struct pipe_winsys *ws,
     radeon_buffer->base.usage = usage;
     radeon_buffer->base.size = size;
 
-    if ((usage == PIPE_BUFFER_USAGE_CONSTANT && is_r3xx(radeon_ws->pci_id)) ||
-        (usage == PIPE_BUFFER_USAGE_VERTEX && size < 512)) {
+    if (usage == PIPE_BUFFER_USAGE_CONSTANT && is_r3xx(radeon_ws->pci_id)) {
         /* Don't bother allocating a BO, as it'll never get to the card. */
-        /* Also, create small vertex buffers in RAM. */
         desc.alignment = alignment;
         desc.usage = usage;
         radeon_buffer->pb = pb_malloc_buffer_create(size, &desc);
         return &radeon_buffer->base;
     }
 
-    domain = radeon_domain_from_usage(usage);
+    domain = 0;
+
+    if (usage & PIPE_BUFFER_USAGE_PIXEL) {
+        domain |= RADEON_GEM_DOMAIN_VRAM;
+    }
+    if (usage & PIPE_BUFFER_USAGE_VERTEX) {
+        domain |= RADEON_GEM_DOMAIN_GTT;
+    }
+    if (usage & PIPE_BUFFER_USAGE_INDEX) {
+        domain |= RADEON_GEM_DOMAIN_GTT;
+    }
 
     radeon_buffer->bo = radeon_bo_open(radeon_ws->priv->bom, 0, size,
             alignment, domain, 0);
@@ -231,54 +222,6 @@ static void radeon_buffer_set_tiling(struct radeon_winsys *ws,
     radeon_bo_set_tiling(radeon_buffer->bo, flags, pitch);
 }
 
-static boolean radeon_buffer_is_local(struct radeon_winsys *ws,
-                                      struct pipe_buffer *buffer)
-{
-    struct radeon_pipe_buffer *radeon_buffer =
-        (struct radeon_pipe_buffer*)buffer;
-
-    return radeon_buffer->pb != NULL;
-}
-
-static void radeon_buffer_make_managed(struct radeon_winsys *ws,
-                                       struct pipe_buffer *buffer)
-{
-    struct radeon_pipe_buffer* radeon_buffer =
-        (struct radeon_pipe_buffer*)buffer;
-    uint32_t domain;
-    void *map;
-
-    if (radeon_buffer->pb) {
-        domain = radeon_domain_from_usage(buffer->usage);
-
-        /* Create a managed buffer. */
-        radeon_buffer->bo = radeon_bo_open(ws->priv->bom, 0,
-                                           buffer->size, buffer->alignment,
-                                           domain, 0);
-        if (radeon_buffer->bo == NULL) {
-            /* XXX What now? */
-            fprintf(stderr, "radeon: cannot create a buffer in function %s\n",
-                    __FUNCTION__);
-            assert(0);
-            abort();
-        }
-
-        /* Move data. */
-        radeon_bo_map(radeon_buffer->bo, 1);
-        map = pb_map(radeon_buffer->pb, PIPE_BUFFER_USAGE_CPU_READ);
-
-        memcpy(radeon_buffer->bo->ptr, map, buffer->size);
-
-        pb_unmap(radeon_buffer->pb);
-        radeon_bo_unmap(radeon_buffer->bo);
-
-        /* Release the locally-created buffer. */
-        pipe_reference_init(&radeon_buffer->pb->base.reference, 0);
-        pb_destroy(radeon_buffer->pb);
-        radeon_buffer->pb = 0;
-    }
-}
-
 static void radeon_fence_reference(struct pipe_winsys *ws,
                                    struct pipe_fence_handle **ptr,
                                    struct pipe_fence_handle *pfence)
@@ -382,8 +325,6 @@ struct radeon_winsys* radeon_pipe_winsys(int fd)
     radeon_ws->base.get_name = radeon_get_name;
 
     radeon_ws->buffer_set_tiling = radeon_buffer_set_tiling;
-    radeon_ws->buffer_is_local = radeon_buffer_is_local;
-    radeon_ws->buffer_make_managed = radeon_buffer_make_managed;
 
     return radeon_ws;
 }
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h b/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
index c46abff793..de71cb2f42 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
@@ -77,8 +77,6 @@ struct radeon_winsys_priv {
     void *flush_data;
 };
 
-uint32_t radeon_domain_from_usage(unsigned usage);
-
 struct radeon_winsys* radeon_pipe_winsys(int fb);
 #if 0
 struct pipe_surface *radeon_surface_from_handle(struct radeon_context *radeon_context,
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.h b/src/gallium/winsys/drm/radeon/core/radeon_drm.h
index 077388ee02..ddd7983824 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_drm.h
+++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.h
@@ -81,7 +81,7 @@ void radeon_destroy_drm_api(struct drm_api* api);
 /* Guess at whether this chipset should use r300g.
  *
  * I believe that this check is valid, but I haven't been exhaustive. */
-static INLINE boolean is_r3xx(int pciid)
+static boolean is_r3xx(int pciid)
 {
     return (pciid > 0x3150) && (pciid < 0x796f);
 }
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_r300.c b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
index d759beaba1..0253bc2527 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_r300.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
@@ -81,13 +81,9 @@ static void radeon_write_cs_reloc(struct radeon_winsys* winsys,
                                   uint32_t flags)
 {
     int retval = 0;
-    struct radeon_pipe_buffer* radeon_buffer =
-        (struct radeon_pipe_buffer*)pbuffer;
 
-    assert(!radeon_buffer->pb);
-
-    retval = radeon_cs_write_reloc(winsys->priv->cs, radeon_buffer->bo,
-                                   rd, wd, flags);
+    retval = radeon_cs_write_reloc(winsys->priv->cs,
+            ((struct radeon_pipe_buffer*)pbuffer)->bo, rd, wd, flags);
 
     if (retval) {
         debug_printf("radeon: Relocation of %p (%d, %d, %d) failed!\n",
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_winsys.h b/src/gallium/winsys/drm/radeon/core/radeon_winsys.h
index 462fba844e..864082b99b 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_winsys.h
+++ b/src/gallium/winsys/drm/radeon/core/radeon_winsys.h
@@ -106,12 +106,6 @@ struct radeon_winsys {
                               uint32_t pitch,
                               boolean microtiled,
                               boolean macrotiled);
-
-    boolean (*buffer_is_local)(struct radeon_winsys* winsys,
-                               struct pipe_buffer* buffer);
-
-    void (*buffer_make_managed)(struct radeon_winsys* winsys,
-                                struct pipe_buffer* buffer);
 };
 
 #endif