[Mesa-dev] [PATCH 4/4 dri] Revert "Duplicate state_tracker/dri/sw/dri_drawable.c"

nobled nobled at dreamwidth.org
Wed Oct 19 17:16:53 PDT 2011


This reverts commit 569bde1fa7d03fb7688d0d391b32e61e857ad44e.
---
 src/gallium/state_trackers/dri/sw/dri_drawable.c |  274 +---------------------
 1 files changed, 1 insertions(+), 273 deletions(-)
 mode change 100644 => 120000 src/gallium/state_trackers/dri/sw/dri_drawable.c

diff --git a/src/gallium/state_trackers/dri/sw/dri_drawable.c
b/src/gallium/state_trackers/dri/sw/dri_drawable.c
deleted file mode 100644
index 41e2a8d..0000000
--- a/src/gallium/state_trackers/dri/sw/dri_drawable.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2009, VMware, Inc.
- * 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 above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * 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 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.
- *
- **************************************************************************/
-/*
- * Author: Keith Whitwell <keithw at vmware.com>
- * Author: Jakob Bornecrantz <wallbraker at gmail.com>
- */
-
-#include "dri_screen.h"
-#include "dri_context.h"
-#include "dri_drawable.h"
-
-#include "pipe/p_screen.h"
-#include "util/u_format.h"
-#include "util/u_memory.h"
-#include "util/u_inlines.h"
-
-
-static boolean
-dri_st_framebuffer_validate(struct st_framebuffer_iface *stfbi,
-                            const enum st_attachment_type *statts,
-                            unsigned count,
-                            struct pipe_resource **out)
-{
-   struct dri_drawable *drawable =
-      (struct dri_drawable *) stfbi->st_manager_private;
-   struct dri_screen *screen = dri_screen(drawable->sPriv);
-   unsigned statt_mask, new_mask;
-   boolean new_stamp;
-   int i;
-
-   statt_mask = 0x0;
-   for (i = 0; i < count; i++)
-      statt_mask |= (1 << statts[i]);
-
-   /* record newly allocated textures */
-   new_mask = (statt_mask & ~drawable->texture_mask);
-
-   /*
-    * dPriv->pStamp is the server stamp.  It should be accessed with a lock, at
-    * least for DRI1.  dPriv->lastStamp is the client stamp.  It has the value
-    * of the server stamp when last checked.
-    */
-   new_stamp = (drawable->texture_stamp != drawable->dPriv->lastStamp);
-
-   if (new_stamp || new_mask || screen->broken_invalidate) {
-      if (new_stamp && drawable->update_drawable_info)
-         drawable->update_drawable_info(drawable);
-
-      drawable->allocate_textures(drawable, statts, count);
-
-      /* add existing textures */
-      for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
-         if (drawable->textures[i])
-            statt_mask |= (1 << i);
-      }
-
-      drawable->texture_stamp = drawable->dPriv->lastStamp;
-      drawable->texture_mask = statt_mask;
-   }
-
-   if (!out)
-      return TRUE;
-
-   for (i = 0; i < count; i++) {
-      out[i] = NULL;
-      pipe_resource_reference(&out[i], drawable->textures[statts[i]]);
-   }
-
-   return TRUE;
-}
-
-static boolean
-dri_st_framebuffer_flush_front(struct st_framebuffer_iface *stfbi,
-                               enum st_attachment_type statt)
-{
-   struct dri_drawable *drawable =
-      (struct dri_drawable *) stfbi->st_manager_private;
-
-   /* XXX remove this and just set the correct one on the framebuffer */
-   drawable->flush_frontbuffer(drawable, statt);
-
-   return TRUE;
-}
-
-/**
- * This is called when we need to set up GL rendering to a new X window.
- */
-boolean
-dri_create_buffer(__DRIscreen * sPriv,
-		  __DRIdrawable * dPriv,
-		  const struct gl_config * visual, boolean isPixmap)
-{
-   struct dri_screen *screen = sPriv->private;
-   struct dri_drawable *drawable = NULL;
-
-   if (isPixmap)
-      goto fail;		       /* not implemented */
-
-   drawable = CALLOC_STRUCT(dri_drawable);
-   if (drawable == NULL)
-      goto fail;
-
-   dri_fill_st_visual(&drawable->stvis, screen, visual);
-
-   /* setup the st_framebuffer_iface */
-   drawable->base.visual = &drawable->stvis;
-   drawable->base.flush_front = dri_st_framebuffer_flush_front;
-   drawable->base.validate = dri_st_framebuffer_validate;
-   drawable->base.st_manager_private = (void *) drawable;
-
-   drawable->screen = screen;
-   drawable->sPriv = sPriv;
-   drawable->dPriv = dPriv;
-   dPriv->driverPrivate = (void *)drawable;
-   p_atomic_set(&drawable->base.stamp, 1);
-
-   return GL_TRUE;
-fail:
-   FREE(drawable);
-   return GL_FALSE;
-}
-
-void
-dri_destroy_buffer(__DRIdrawable * dPriv)
-{
-   struct dri_drawable *drawable = dri_drawable(dPriv);
-   int i;
-
-   pipe_surface_reference(&drawable->drisw_surface, NULL);
-
-   for (i = 0; i < ST_ATTACHMENT_COUNT; i++)
-      pipe_resource_reference(&drawable->textures[i], NULL);
-
-   FREE(drawable);
-}
-
-/**
- * Validate the texture at an attachment.  Allocate the texture if it does not
- * exist.  Used by the TFP extension.
- */
-static void
-dri_drawable_validate_att(struct dri_drawable *drawable,
-                          enum st_attachment_type statt)
-{
-   enum st_attachment_type statts[ST_ATTACHMENT_COUNT];
-   unsigned i, count = 0;
-
-   /* check if buffer already exists */
-   if (drawable->texture_mask & (1 << statt))
-      return;
-
-   /* make sure DRI2 does not destroy existing buffers */
-   for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
-      if (drawable->texture_mask & (1 << i)) {
-         statts[count++] = i;
-      }
-   }
-   statts[count++] = statt;
-
-   drawable->texture_stamp = drawable->dPriv->lastStamp - 1;
-
-   drawable->base.validate(&drawable->base, statts, count, NULL);
-}
-
-/**
- * These are used for GLX_EXT_texture_from_pixmap
- */
-static void
-dri_set_tex_buffer2(__DRIcontext *pDRICtx, GLint target,
-                    GLint format, __DRIdrawable *dPriv)
-{
-   struct dri_context *ctx = dri_context(pDRICtx);
-   struct dri_drawable *drawable = dri_drawable(dPriv);
-   struct pipe_resource *res;
-
-   dri_drawable_validate_att(drawable, ST_ATTACHMENT_FRONT_LEFT);
-
-   /* Use the pipe resource associated with the X drawable */
-   res = drawable->textures[ST_ATTACHMENT_FRONT_LEFT];
-
-   if (res) {
-      enum pipe_format internal_format = res->format;
-
-      if (format == __DRI_TEXTURE_FORMAT_RGB)  {
-         /* only need to cover the formats recognized by dri_fill_st_visual */
-         switch (internal_format) {
-         case PIPE_FORMAT_B8G8R8A8_UNORM:
-            internal_format = PIPE_FORMAT_B8G8R8X8_UNORM;
-            break;
-         case PIPE_FORMAT_A8R8G8B8_UNORM:
-            internal_format = PIPE_FORMAT_X8R8G8B8_UNORM;
-            break;
-         default:
-            break;
-         }
-      }
-
-      ctx->copy_drawable(ctx, dPriv, res);
-
-      ctx->st->teximage(ctx->st,
-            (target == GL_TEXTURE_2D) ? ST_TEXTURE_2D : ST_TEXTURE_RECT,
-            0, internal_format, res, FALSE);
-
-   }
-}
-
-static void
-dri_set_tex_buffer(__DRIcontext *pDRICtx, GLint target,
-                   __DRIdrawable *dPriv)
-{
-   dri_set_tex_buffer2(pDRICtx, target, __DRI_TEXTURE_FORMAT_RGBA, dPriv);
-}
-
-const __DRItexBufferExtension driTexBufferExtension = {
-    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
-   dri_set_tex_buffer,
-   dri_set_tex_buffer2,
-   NULL,
-};
-
-/**
- * Get the format and binding of an attachment.
- */
-void
-dri_drawable_get_format(struct dri_drawable *drawable,
-                        enum st_attachment_type statt,
-                        enum pipe_format *format,
-                        unsigned *bind)
-{
-   switch (statt) {
-   case ST_ATTACHMENT_FRONT_LEFT:
-   case ST_ATTACHMENT_BACK_LEFT:
-   case ST_ATTACHMENT_FRONT_RIGHT:
-   case ST_ATTACHMENT_BACK_RIGHT:
-      *format = drawable->stvis.color_format;
-      *bind = PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW;
-      break;
-   case ST_ATTACHMENT_DEPTH_STENCIL:
-      *format = drawable->stvis.depth_stencil_format;
-      *bind = PIPE_BIND_DEPTH_STENCIL; /* XXX sampler? */
-      break;
-   default:
-      *format = PIPE_FORMAT_NONE;
-      *bind = 0;
-      break;
-   }
-}
-
-/* vim: set sw=3 ts=8 sts=3 expandtab: */
diff --git a/src/gallium/state_trackers/dri/sw/dri_drawable.c
b/src/gallium/state_trackers/dri/sw/dri_drawable.c
new file mode 120000
index 0000000..0fc19be
--- /dev/null
+++ b/src/gallium/state_trackers/dri/sw/dri_drawable.c
@@ -0,0 +1 @@
+../common/dri_drawable.c
\ No newline at end of file
-- 
1.7.6.msysgit.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-Revert-Duplicate-state_tracker-dri-sw-dri_drawable.c.patch
Type: application/octet-stream
Size: 9505 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20111019/894ca30c/attachment-0001.obj>


More information about the mesa-dev mailing list