radeon-gallium: DRI2 state tracker, part 3.

Properly setup the build process for adding in xorg and egl trackers,
and finally put radeon_context and radeon_screen to bed.

1 files changed, 0 insertions, 272 deletions

diff --git a/src/gallium/winsys/drm/radeon/radeon_context.c b/src/gallium/winsys/drm/radeon/radeon_context.c
deleted file mode 100644
index 13a7035fec..0000000000
--- a/src/gallium/winsys/drm/radeon/radeon_context.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/* 
- * Copyright © 2008 Jérôme Glisse
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * 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 THE COPYRIGHT HOLDERS, AUTHORS
- * 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.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- */
-/*
- * Authors:
- *      Jérôme Glisse <glisse@freedesktop.org>
- */
-#include <stdio.h>
-#include "dri_util.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_inlines.h"
-#include "state_tracker/st_public.h"
-#include "state_tracker/st_context.h"
-#include "radeon_screen.h"
-#include "radeon_context.h"
-#include "radeon_buffer.h"
-#include "radeon_winsys_softpipe.h"
-
-#define need_GL_ARB_point_parameters
-#define need_GL_ARB_vertex_buffer_object
-#define need_GL_EXT_cull_vertex
-#define need_GL_EXT_compiled_vertex_array
-#include "extension_helper.h"
-
-/**
- * Extension strings exported by the radeon driver.
- */
-const struct dri_extension radeon_card_extensions[] = {
-/* XXX these are technically not supported
-   {"GL_ARB_texture_rectangle", NULL},
-   {"GL_ARB_pixel_buffer_object", NULL}, */
-   {"GL_ARB_point_parameters", GL_ARB_point_parameters_functions},
-   {"GL_ARB_vertex_buffer_object", GL_ARB_vertex_buffer_object_functions},
-   {"GL_EXT_compiled_vertex_array", GL_EXT_compiled_vertex_array_functions},
-   {"GL_EXT_cull_vertex", GL_EXT_cull_vertex_functions},
-   {NULL, NULL}
-};
-
-static void radeon_update_renderbuffers(__DRIcontext *dri_context,
-                                     __DRIdrawable *dri_drawable)
-{
-    struct radeon_framebuffer *radeon_fb;
-    struct radeon_context *radeon_context;
-    unsigned attachments[10];
-    __DRIbuffer *buffers;
-    __DRIscreen *screen;
-    int i, count;
-
-    radeon_context = dri_context->driverPrivate;
-    screen = dri_drawable->driScreenPriv;
-    radeon_fb = dri_drawable->driverPrivate;
-    for (count = 0, i = 0; count < 6; count++) {
-        if (radeon_fb->attachments & (1 << count)) {
-            attachments[i++] = count;
-        }
-    }
-
-    buffers = (*screen->dri2.loader->getBuffers)(dri_drawable,
-                                                 &dri_drawable->w,
-                                                 &dri_drawable->h,
-                                                 attachments,
-                                                 i,
-                                                 &count,
-                                                 dri_drawable->loaderPrivate);
-    if (buffers == NULL) {
-        return;
-    }
-
-    /* set one cliprect to cover the whole dri_drawable */
-    dri_drawable->x = 0;
-    dri_drawable->y = 0;
-    dri_drawable->backX = 0;
-    dri_drawable->backY = 0;
-    dri_drawable->numClipRects = 1;
-    dri_drawable->pClipRects[0].x1 = 0;
-    dri_drawable->pClipRects[0].y1 = 0;
-    dri_drawable->pClipRects[0].x2 = dri_drawable->w;
-    dri_drawable->pClipRects[0].y2 = dri_drawable->h;
-    dri_drawable->numBackClipRects = 1;
-    dri_drawable->pBackClipRects[0].x1 = 0;
-    dri_drawable->pBackClipRects[0].y1 = 0;
-    dri_drawable->pBackClipRects[0].x2 = dri_drawable->w;
-    dri_drawable->pBackClipRects[0].y2 = dri_drawable->h;
-
-    for (i = 0; i < count; i++) {
-        struct pipe_surface *ps;
-        enum pipe_format format = 0;
-        int index = 0;
-
-        switch (buffers[i].attachment) {
-        case __DRI_BUFFER_FRONT_LEFT:
-            index = ST_SURFACE_FRONT_LEFT;
-            switch (buffers[i].cpp) {
-            case 4:
-                format = PIPE_FORMAT_A8R8G8B8_UNORM;
-                break;
-            case 2:
-                format = PIPE_FORMAT_R5G6B5_UNORM;
-                break;
-            default:
-                /* FIXME: error */
-                return;
-            }
-            break;
-        case __DRI_BUFFER_BACK_LEFT:
-            index = ST_SURFACE_BACK_LEFT;
-            switch (buffers[i].cpp) {
-            case 4:
-                format = PIPE_FORMAT_A8R8G8B8_UNORM;
-                break;
-            case 2:
-                format = PIPE_FORMAT_R5G6B5_UNORM;
-                break;
-            default:
-                /* FIXME: error */
-                return;
-            }
-            break;
-        case __DRI_BUFFER_STENCIL:
-        case __DRI_BUFFER_DEPTH:
-            index = ST_SURFACE_DEPTH;
-            switch (buffers[i].cpp) {
-            case 4:
-                format = PIPE_FORMAT_Z24S8_UNORM;
-                break;
-            case 2:
-                format = PIPE_FORMAT_Z16_UNORM;
-                break;
-            default:
-                /* FIXME: error */
-                return;
-            }
-            break;
-        case __DRI_BUFFER_ACCUM:
-        default:
-            fprintf(stderr,
-                    "unhandled buffer attach event, attacment type %d\n",
-                    buffers[i].attachment);
-            return;
-        }
-
-        ps = radeon_surface_from_handle(radeon_context,
-                                     buffers[i].name,
-                                     format,
-                                     dri_drawable->w,
-                                     dri_drawable->h,
-                                     buffers[i].pitch);
-        assert(ps);
-        st_set_framebuffer_surface(radeon_fb->st_framebuffer, index, ps);
-    }
-    st_resize_framebuffer(radeon_fb->st_framebuffer,
-                          dri_drawable->w,
-                          dri_drawable->h);
-}
-
-GLboolean radeon_context_create(const __GLcontextModes *visual,
-                             __DRIcontextPrivate *dri_context,
-                             void *shared_context)
-{
-    __DRIscreenPrivate *dri_screen;
-    struct radeon_context *radeon_context;
-    struct radeon_screen *radeon_screen;
-    struct pipe_context *pipe;
-    struct st_context *shared_st_context = NULL;
-
-    dri_context->driverPrivate = NULL;
-    radeon_context = calloc(1, sizeof(struct radeon_context));
-    if (radeon_context == NULL) {
-        return GL_FALSE;
-    }
-
-    if (shared_context) {
-        shared_st_context = ((struct radeon_context*)shared_context)->st_context;
-    }
-
-    dri_screen = dri_context->driScreenPriv;
-    radeon_screen = dri_screen->private;
-    radeon_context->dri_screen = dri_screen;
-    radeon_context->radeon_screen = radeon_screen;
-    radeon_context->drm_fd = dri_screen->fd;
-
-    radeon_context->pipe_winsys = radeon_pipe_winsys(radeon_screen);
-    if (radeon_context->pipe_winsys == NULL) {
-        free(radeon_context);
-        return GL_FALSE;
-    }
-
-    if (!getenv("RADEON_SOFTPIPE")) {
-        fprintf(stderr, "Creating r300 context...\n");
-        pipe =
-            r300_create_context(NULL,
-                                radeon_context->pipe_winsys,
-                                radeon_create_r300_winsys(radeon_context->drm_fd));
-        radeon_context->pipe_screen = pipe->screen;
-    } else {
-        pipe = radeon_create_softpipe(radeon_context);
-    }
-    radeon_context->st_context = st_create_context(pipe, visual,
-                                                shared_st_context);
-    driInitExtensions(radeon_context->st_context->ctx,
-                      radeon_card_extensions, GL_TRUE);
-    dri_context->driverPrivate = radeon_context;
-    return GL_TRUE;
-}
-
-void radeon_context_destroy(__DRIcontextPrivate *dri_context)
-{
-    struct radeon_context *radeon_context;
-
-    radeon_context = dri_context->driverPrivate;
-    st_finish(radeon_context->st_context);
-    st_destroy_context(radeon_context->st_context);
-    free(radeon_context);
-}
-
-GLboolean radeon_context_bind(__DRIcontextPrivate *dri_context,
-                           __DRIdrawablePrivate *dri_drawable,
-                           __DRIdrawablePrivate *dri_readable)
-{
-    struct radeon_framebuffer *drawable;
-    struct radeon_framebuffer *readable;
-    struct radeon_context *radeon_context;
-
-    if (dri_context == NULL) {
-        st_make_current(NULL, NULL, NULL);
-        return GL_TRUE;
-    }
-
-    radeon_context = dri_context->driverPrivate;
-    drawable = dri_drawable->driverPrivate;
-    readable = dri_readable->driverPrivate;
-    st_make_current(radeon_context->st_context,
-                    drawable->st_framebuffer,
-                    readable->st_framebuffer);
-
-    radeon_update_renderbuffers(dri_context, dri_drawable);
-    if (dri_drawable != dri_readable) {
-        radeon_update_renderbuffers(dri_context, dri_readable);
-    }
-    return GL_TRUE;
-}
-
-GLboolean radeon_context_unbind(__DRIcontextPrivate *dri_context)
-{
-    struct radeon_context *radeon_context;
-
-    radeon_context = dri_context->driverPrivate;
-    st_flush(radeon_context->st_context, PIPE_FLUSH_RENDER_CACHE, NULL);
-    return GL_TRUE;
-}