Merge remote-tracking branch 'mesa-public/master' into vulkan

1 files changed, 146 insertions, 0 deletions

diff --git a/src/gallium/drivers/virgl/virgl_resource.h b/src/gallium/drivers/virgl/virgl_resource.h
new file mode 100644
index 00000000000..bab9bcb9b4e
--- /dev/null
+++ b/src/gallium/drivers/virgl/virgl_resource.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2014, 2015 Red Hat.
+ *
+ * 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
+ * on 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
+ * THE AUTHOR(S) AND/OR THEIR 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.
+ */
+
+#ifndef VIRGL_RESOURCE_H
+#define VIRGL_RESOURCE_H
+
+#include "util/u_resource.h"
+#include "util/u_range.h"
+#include "util/list.h"
+#include "util/u_transfer.h"
+
+#include "virgl_hw.h"
+#define VR_MAX_TEXTURE_2D_LEVELS 15
+
+struct winsys_handle;
+struct virgl_screen;
+struct virgl_context;
+
+struct virgl_resource {
+   struct u_resource u;
+   struct virgl_hw_res *hw_res;
+   boolean clean;
+};
+
+struct virgl_buffer {
+   struct virgl_resource base;
+
+   struct list_head flush_list;
+   boolean on_list;
+
+   /* The buffer range which is initialized (with a write transfer,
+    * streamout, DMA, or as a random access target). The rest of
+    * the buffer is considered invalid and can be mapped unsynchronized.
+    *
+    * This allows unsychronized mapping of a buffer range which hasn't
+    * been used yet. It's for applications which forget to use
+    * the unsynchronized map flag and expect the driver to figure it out.
+    */
+   struct util_range valid_buffer_range;
+};
+
+struct virgl_texture {
+   struct virgl_resource base;
+
+   unsigned long level_offset[VR_MAX_TEXTURE_2D_LEVELS];
+   unsigned stride[VR_MAX_TEXTURE_2D_LEVELS];
+};
+
+struct virgl_transfer {
+   struct pipe_transfer base;
+   uint32_t offset;
+   struct virgl_resource *resolve_tmp;
+};
+
+void virgl_resource_destroy(struct pipe_screen *screen,
+                            struct pipe_resource *resource);
+
+void virgl_init_screen_resource_functions(struct pipe_screen *screen);
+
+void virgl_init_context_resource_functions(struct pipe_context *ctx);
+
+struct pipe_resource *virgl_texture_create(struct virgl_screen *vs,
+                                           const struct pipe_resource *templ);
+
+struct pipe_resource *virgl_texture_from_handle(struct virgl_screen *vs,
+                                                const struct pipe_resource *templ,
+                                                struct winsys_handle *whandle);
+
+static inline struct virgl_resource *virgl_resource(struct pipe_resource *r)
+{
+   return (struct virgl_resource *)r;
+}
+
+static inline struct virgl_buffer *virgl_buffer(struct pipe_resource *r)
+{
+   return (struct virgl_buffer *)r;
+}
+
+static inline struct virgl_texture *virgl_texture(struct pipe_resource *r)
+{
+   return (struct virgl_texture *)r;
+}
+
+static inline struct virgl_transfer *virgl_transfer(struct pipe_transfer *trans)
+{
+   return (struct virgl_transfer *)trans;
+}
+
+struct pipe_resource *virgl_buffer_create(struct virgl_screen *vs,
+                                          const struct pipe_resource *templ);
+
+static inline unsigned pipe_to_virgl_bind(unsigned pbind)
+{
+   unsigned outbind = 0;
+   if (pbind & PIPE_BIND_DEPTH_STENCIL)
+      outbind |= VIRGL_BIND_DEPTH_STENCIL;
+   if (pbind & PIPE_BIND_RENDER_TARGET)
+      outbind |= VIRGL_BIND_RENDER_TARGET;
+   if (pbind & PIPE_BIND_SAMPLER_VIEW)
+      outbind |= VIRGL_BIND_SAMPLER_VIEW;
+   if (pbind & PIPE_BIND_VERTEX_BUFFER)
+      outbind |= VIRGL_BIND_VERTEX_BUFFER;
+   if (pbind & PIPE_BIND_INDEX_BUFFER)
+      outbind |= VIRGL_BIND_INDEX_BUFFER;
+   if (pbind & PIPE_BIND_CONSTANT_BUFFER)
+      outbind |= VIRGL_BIND_CONSTANT_BUFFER;
+   if (pbind & PIPE_BIND_DISPLAY_TARGET)
+      outbind |= VIRGL_BIND_DISPLAY_TARGET;
+   if (pbind & PIPE_BIND_STREAM_OUTPUT)
+      outbind |= VIRGL_BIND_STREAM_OUTPUT;
+   if (pbind & PIPE_BIND_CURSOR)
+      outbind |= VIRGL_BIND_CURSOR;
+   if (pbind & PIPE_BIND_CUSTOM)
+      outbind |= VIRGL_BIND_CUSTOM;
+   if (pbind & PIPE_BIND_SCANOUT)
+      outbind |= VIRGL_BIND_SCANOUT;
+   return outbind;
+}
+
+bool virgl_res_needs_flush_wait(struct virgl_context *vctx,
+                                struct virgl_resource *res,
+                                unsigned usage);
+bool virgl_res_needs_readback(struct virgl_context *vctx,
+                              struct virgl_resource *res,
+                              unsigned usage);
+#endif