st/egl: Add helper functions for use by backends.

There is only resource_surface for now.  It helps manage the resources
of a software-based native surface such as XImage or GDI.

diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript
index 855bc5b..c4d01d6 100644 (file)
--- a/src/gallium/state_trackers/egl/SConscript
+++ b/src/gallium/state_trackers/egl/SConscript
@@ -18,6 +18,7 @@ if 'egl' in env['statetrackers']:
         'common/egl_g3d_api.c',
         'common/egl_g3d_image.c',
         'common/egl_g3d_st.c',
+        'common/native_helper.c',
     ]
 
     gdi_sources = common_sources + [

diff --git a/src/gallium/state_trackers/egl/common/native_helper.c b/src/gallium/state_trackers/egl/common/native_helper.c
new file mode 100644 (file)
index 0000000..7832b2b
--- /dev/null
+++ b/src/gallium/state_trackers/egl/common/native_helper.c
@@ -0,0 +1,235 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.9
+ *
+ * Copyright (C) 2010 LunarG Inc.
+ *
+ * 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, sublicense,
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors:
+ *    Chia-I Wu <olv@lunarg.com>
+ */
+
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
+#include "pipe/p_screen.h"
+#include "pipe/p_context.h"
+#include "pipe/p_state.h"
+
+#include "native_helper.h"
+
+struct resource_surface {
+   struct pipe_screen *screen;
+   enum pipe_format format;
+   uint bind;
+
+   struct pipe_resource *resources[NUM_NATIVE_ATTACHMENTS];
+   struct pipe_surface *present_surfaces[NUM_NATIVE_ATTACHMENTS];
+   uint resource_mask;
+   uint width, height;
+};
+
+struct resource_surface *
+resource_surface_create(struct pipe_screen *screen,
+                        enum pipe_format format, uint bind)
+{
+   struct resource_surface *rsurf = CALLOC_STRUCT(resource_surface);
+
+   if (rsurf) {
+      rsurf->screen = screen;
+      rsurf->format = format;
+      rsurf->bind = bind;
+   }
+
+   return rsurf;
+}
+
+static void
+resource_surface_free_resources(struct resource_surface *rsurf)
+{
+   if (rsurf->resource_mask) {
+      int i;
+
+      for (i = 0; i < NUM_NATIVE_ATTACHMENTS; i++) {
+         if (rsurf->present_surfaces[i])
+            pipe_surface_reference(&rsurf->present_surfaces[i], NULL);
+         if (rsurf->resources[i])
+            pipe_resource_reference(&rsurf->resources[i], NULL);
+      }
+      rsurf->resource_mask = 0x0;
+   }
+}
+
+void
+resource_surface_destroy(struct resource_surface *rsurf)
+{
+   resource_surface_free_resources(rsurf);
+   FREE(rsurf);
+}
+
+boolean
+resource_surface_set_size(struct resource_surface *rsurf,
+                          uint width, uint height)
+{
+   boolean changed = FALSE;
+
+   if (rsurf->width != width || rsurf->height != height) {
+      resource_surface_free_resources(rsurf);
+      rsurf->width = width;
+      rsurf->height = height;
+      changed = TRUE;
+   }
+
+   return changed;
+}
+
+void
+resource_surface_get_size(struct resource_surface *rsurf,
+                          uint *width, uint *height)
+{
+   if (width)
+      *width = rsurf->width;
+   if (height)
+      *height = rsurf->height;
+}
+
+boolean
+resource_surface_add_resources(struct resource_surface *rsurf,
+                               uint resource_mask)
+{
+   struct pipe_resource templ;
+   int i;
+
+   resource_mask &= ~rsurf->resource_mask;
+   if (!resource_mask)
+      return TRUE;
+
+   if (!rsurf->width || !rsurf->height)
+      return FALSE;
+
+   memset(&templ, 0, sizeof(templ));
+   templ.target = PIPE_TEXTURE_2D;
+   templ.format = rsurf->format;
+   templ.bind = rsurf->bind;
+   templ.width0 = rsurf->width;
+   templ.height0 = rsurf->height;
+   templ.depth0 = 1;
+
+   for (i = 0; i < NUM_NATIVE_ATTACHMENTS; i++) {
+      if (resource_mask & (1 <<i)) {
+         assert(!rsurf->resources[i]);
+
+         rsurf->resources[i] =
+            rsurf->screen->resource_create(rsurf->screen, &templ);
+         if (rsurf->resources[i])
+            rsurf->resource_mask |= 1 << i;
+      }
+   }
+
+   return ((rsurf->resource_mask & resource_mask) == resource_mask);
+}
+
+
+void
+resource_surface_get_resources(struct resource_surface *rsurf,
+                               struct pipe_resource **resources,
+                               uint resource_mask)
+{
+   int i;
+
+   for (i = 0; i < NUM_NATIVE_ATTACHMENTS; i++) {
+      if (resource_mask & (1 << i)) {
+         resources[i] = NULL;
+         pipe_resource_reference(&resources[i], rsurf->resources[i]);
+      }
+   }
+}
+
+struct pipe_resource *
+resource_surface_get_single_resource(struct resource_surface *rsurf,
+                                     enum native_attachment which)
+{
+   struct pipe_resource *pres = NULL;
+   pipe_resource_reference(&pres, rsurf->resources[which]);
+   return pres;
+}
+
+static INLINE void
+pointer_swap(const void **p1, const void **p2)
+{
+   const void *tmp = *p1;
+   *p1 = *p2;
+   *p2 = tmp;
+}
+
+void
+resource_surface_swap_buffers(struct resource_surface *rsurf,
+                              enum native_attachment buf1,
+                              enum native_attachment buf2,
+                              boolean only_if_exist)
+{
+   const uint buf1_bit = 1 << buf1;
+   const uint buf2_bit = 1 << buf2;
+   uint mask;
+
+   if (only_if_exist && !(rsurf->resources[buf1] && rsurf->resources[buf2]))
+      return;
+
+   pointer_swap((const void **) &rsurf->resources[buf1],
+                (const void **) &rsurf->resources[buf2]);
+   pointer_swap((const void **) &rsurf->present_surfaces[buf1],
+                (const void **) &rsurf->present_surfaces[buf2]);
+
+   /* swap mask bits */
+   mask = rsurf->resource_mask & ~(buf1_bit | buf2_bit);
+   if (rsurf->resource_mask & buf1_bit)
+      mask |= buf2_bit;
+   if (rsurf->resource_mask & buf2_bit)
+      mask |= buf1_bit;
+
+   rsurf->resource_mask = mask;
+}
+
+boolean
+resource_surface_present(struct resource_surface *rsurf,
+                         enum native_attachment which,
+                         void *winsys_drawable_handle)
+{
+   struct pipe_resource *pres = rsurf->resources[which];
+   struct pipe_surface *psurf = rsurf->present_surfaces[which];
+
+   if (!pres)
+      return TRUE;
+
+   if (!psurf) {
+      psurf = rsurf->screen->get_tex_surface(rsurf->screen,
+            pres, 0, 0, 0, PIPE_BIND_DISPLAY_TARGET);
+      if (!psurf)
+         return FALSE;
+
+      rsurf->present_surfaces[which] = psurf;
+   }
+
+   assert(psurf->texture == pres);
+
+   rsurf->screen->flush_frontbuffer(rsurf->screen,
+         psurf, winsys_drawable_handle);
+
+   return TRUE;
+}

diff --git a/src/gallium/state_trackers/egl/common/native_helper.h b/src/gallium/state_trackers/egl/common/native_helper.h
new file mode 100644 (file)
index 0000000..62956d5
--- /dev/null
+++ b/src/gallium/state_trackers/egl/common/native_helper.h
@@ -0,0 +1,70 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.9
+ *
+ * Copyright (C) 2010 LunarG Inc.
+ *
+ * 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, sublicense,
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors:
+ *    Chia-I Wu <olv@lunarg.com>
+ */
+
+#include "native.h"
+
+struct resource_surface;
+
+struct resource_surface *
+resource_surface_create(struct pipe_screen *screen,
+                        enum pipe_format format, uint bind);
+
+void
+resource_surface_destroy(struct resource_surface *rsurf);
+
+boolean
+resource_surface_set_size(struct resource_surface *rsurf,
+                          uint width, uint height);
+
+void
+resource_surface_get_size(struct resource_surface *rsurf,
+                          uint *width, uint *height);
+
+boolean
+resource_surface_add_resources(struct resource_surface *rsurf,
+                               uint resource_mask);
+
+void
+resource_surface_get_resources(struct resource_surface *rsurf,
+                               struct pipe_resource **resources,
+                               uint resource_mask);
+
+struct pipe_resource *
+resource_surface_get_single_resource(struct resource_surface *rsurf,
+                                     enum native_attachment which);
+
+void
+resource_surface_swap_buffers(struct resource_surface *rsurf,
+                              enum native_attachment buf1,
+                              enum native_attachment buf2,
+                              boolean only_if_exist);
+
+boolean
+resource_surface_present(struct resource_surface *rsurf,
+                         enum native_attachment which,
+                         void *winsys_drawable_handle);