5 files changed, 457 insertions, 0 deletions

diff --git a/src/gallium/winsys/sw/hgl/SConscript b/src/gallium/winsys/sw/hgl/SConscript
new file mode 100644
index 00000000000..e88125721ab
--- /dev/null
+++ b/src/gallium/winsys/sw/hgl/SConscript
@@ -0,0 +1,25 @@
+#######################################################################
+# SConscript for haiku winsys
+
+
+Import('*')
+
+if env['platform'] in ('haiku'):
+
+    env = env.Clone()
+
+    env.Append(CPPPATH = [
+        '#/src/gallium/include',
+        '#/src/gallium/auxiliary',
+        '#/src/gallium/drivers',
+    ])
+
+    ws_haiku = env.ConvenienceLibrary(
+        target = 'ws_haiku',
+        source = [
+           'hgl_sw_winsys.c',
+           'bitmap_wrapper.cpp',
+        ]
+    )
+    env.Alias('ws_haiku', ws_haiku)
+    Export('ws_haiku')
diff --git a/src/gallium/winsys/sw/hgl/bitmap_wrapper.cpp b/src/gallium/winsys/sw/hgl/bitmap_wrapper.cpp
new file mode 100644
index 00000000000..4015a226889
--- /dev/null
+++ b/src/gallium/winsys/sw/hgl/bitmap_wrapper.cpp
@@ -0,0 +1,134 @@
+/**************************************************************************
+ *
+ * Copyright 2009 Artur Wyszynski <[email protected]>
+ * Copyright 2013 Alexander von Gluck IV <[email protected]>
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+#include <stdio.h>
+#include <interface/Bitmap.h>
+#include <storage/File.h>
+#include <support/String.h>
+#include <translation/BitmapStream.h>
+#include <translation/TranslatorRoster.h>
+
+#include "bitmap_wrapper.h"
+
+
+extern "C" {
+static int frameNo = 0;
+
+
+Bitmap*
+create_bitmap(int32 width, int32 height, color_space colorSpace)
+{
+	BBitmap *bb = new BBitmap(BRect(0, 0, width, height), colorSpace);
+	if (bb)
+		return (Bitmap*)bb;
+	return NULL;
+}
+
+
+void
+get_bitmap_size(const Bitmap* bitmap, int32* width, int32* height)
+{
+	BBitmap *bb = (BBitmap*)bitmap;
+	if (bb && width && height) {
+		uint32 w = bb->Bounds().IntegerWidth() + 1;
+		uint32 h = bb->Bounds().IntegerHeight() + 1;
+		*width = w;
+		*height = h;
+	}
+}
+
+
+color_space
+get_bitmap_color_space(const Bitmap* bitmap)
+{
+	BBitmap *bb = (BBitmap*)bitmap;
+	if (bb)
+		return bb->ColorSpace();
+	return B_NO_COLOR_SPACE;
+}
+
+
+void
+copy_bitmap_bits(const Bitmap* bitmap, void* data, int32 length)
+{
+	BBitmap *bb = (BBitmap*)bitmap;
+	if (bb) {
+		color_space cs = bb->ColorSpace();
+		bb->ImportBits(data, length, bb->BytesPerRow(), 0, cs);
+	}
+}
+
+
+void
+delete_bitmap(Bitmap* bitmap)
+{
+	BBitmap *bb = (BBitmap*)bitmap;
+	delete bb;
+}
+
+
+int32
+get_bitmap_bytes_per_row(const Bitmap* bitmap)
+{
+	BBitmap *bb = (BBitmap*)bitmap;
+	if (bb)
+		return bb->BytesPerRow();
+	return 0;
+}
+
+
+int32
+get_bitmap_bits_length(const Bitmap* bitmap)
+{
+	BBitmap *bb = (BBitmap*)bitmap;
+	if (bb)
+		return bb->BitsLength();
+	return 0;
+}
+
+
+void
+dump_bitmap(const Bitmap* bitmap)
+{
+	BBitmap *bb = (BBitmap*)bitmap;
+	if (!bb)
+		return;
+
+	BString filename("/boot/home/frame_");
+	filename << (int32)frameNo << ".png";
+
+	BTranslatorRoster *roster = BTranslatorRoster::Default();
+	BBitmapStream stream(bb);
+	BFile dump(filename, B_CREATE_FILE | B_WRITE_ONLY);
+
+	roster->Translate(&stream, NULL, NULL, &dump, 0);
+
+	frameNo++;
+}
+
+}
diff --git a/src/gallium/winsys/sw/hgl/bitmap_wrapper.h b/src/gallium/winsys/sw/hgl/bitmap_wrapper.h
new file mode 100644
index 00000000000..7c5ff2d72f9
--- /dev/null
+++ b/src/gallium/winsys/sw/hgl/bitmap_wrapper.h
@@ -0,0 +1,59 @@
+/**************************************************************************
+ *
+ * Copyright 2009 Artur Wyszynski <[email protected]>
+ * Copyright 2013 Alexander von Gluck IV <[email protected]>
+ *
+ * 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.
+ *
+ **************************************************************************/
+#ifndef __BBITMAP_WRAPPER_H__
+#define __BBITMAP_WRAPPER_H__
+
+
+#include <interface/GraphicsDefs.h>
+#include <support/SupportDefs.h>
+
+
+typedef void Bitmap;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+Bitmap* create_bitmap(int32 width, int32 height, color_space colorSpace);
+void copy_bitmap_bits(const Bitmap* bitmap, void* data, int32 length);
+
+void get_bitmap_size(const Bitmap* bitmap, int32* width, int32* height);
+color_space get_bitmap_color_space(const Bitmap* bitmap);
+int32 get_bitmap_bytes_per_row(const Bitmap* bitmap);
+int32 get_bitmap_bits_length(const Bitmap* bitmap);
+
+void delete_bitmap(Bitmap* bitmap);
+void dump_bitmap(const Bitmap* bitmap);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* __BBITMAP_WRAPPER_H__ */
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
new file mode 100644
index 00000000000..1d51dd60ee8
--- /dev/null
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
@@ -0,0 +1,187 @@
+/**************************************************************************
+ *
+ * Copyright 2009 Artur Wyszynski <[email protected]>
+ * Copyright 2013 Alexander von Gluck IV <[email protected]>
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_format.h"
+#include "util/u_inlines.h"
+#include "util/u_format.h"
+#include "util/u_math.h"
+#include "util/u_memory.h"
+
+#include "hgl_sw_winsys.h"
+#include "bitmap_wrapper.h"
+
+
+// Cast
+static INLINE struct haiku_displaytarget*
+hgl_sw_displaytarget(struct sw_displaytarget* target)
+{
+	return (struct haiku_displaytarget *)target;
+}
+
+
+static void
+hgl_winsys_destroy(struct sw_winsys* winsys)
+{
+	FREE(winsys);
+}
+
+
+static boolean
+hgl_winsys_is_displaytarget_format_supported(struct sw_winsys* winsys,
+	unsigned textureUsage, enum pipe_format format)
+{
+	// TODO STUB
+	return true;
+}
+
+
+static struct sw_displaytarget*
+hgl_winsys_displaytarget_create(struct sw_winsys* winsys,
+	unsigned textureUsage, enum pipe_format format, unsigned width,
+	unsigned height, unsigned alignment, unsigned* stride)
+{
+	struct haiku_displaytarget* haikuDisplayTarget
+		= CALLOC_STRUCT(haiku_displaytarget);
+	assert(haikuDisplayTarget);
+
+	haikuDisplayTarget->format = format;
+	haikuDisplayTarget->width = width;
+	haikuDisplayTarget->height = height;
+
+	size_t formatStride = util_format_get_stride(format, width);
+	unsigned blockSize = util_format_get_nblocksy(format, height);
+
+	haikuDisplayTarget->stride = align(formatStride, alignment);
+	haikuDisplayTarget->size = haikuDisplayTarget->stride * blockSize;
+
+	haikuDisplayTarget->data
+		= align_malloc(haikuDisplayTarget->size, alignment);
+
+	assert(haikuDisplayTarget->data);
+
+	*stride = haikuDisplayTarget->stride;
+
+	// Cast to ghost sw_displaytarget type
+	return (struct sw_displaytarget*)haikuDisplayTarget;
+}
+
+
+static void
+hgl_winsys_displaytarget_destroy(struct sw_winsys* winsys,
+	struct sw_displaytarget* displayTarget)
+{
+	struct haiku_displaytarget* haikuDisplayTarget
+		= hgl_sw_displaytarget(displayTarget);
+
+	if (!haikuDisplayTarget)
+		return;
+
+	if (haikuDisplayTarget->data != NULL)
+		align_free(haikuDisplayTarget->data);
+
+	FREE(haikuDisplayTarget);
+}
+
+
+static struct sw_displaytarget*
+hgl_winsys_displaytarget_from_handle(struct sw_winsys* winsys,
+	const struct pipe_resource* templat, struct winsys_handle* whandle,
+	unsigned* stride)
+{
+	return NULL;
+}
+
+
+static boolean
+hgl_winsys_displaytarget_get_handle(struct sw_winsys* winsys,
+	struct sw_displaytarget* displayTarget, struct winsys_handle* whandle)
+{
+	return FALSE;
+}
+
+
+static void*
+hgl_winsys_displaytarget_map(struct sw_winsys* winsys,
+	struct sw_displaytarget* displayTarget, unsigned flags)
+{
+	struct haiku_displaytarget* haikuDisplayTarget
+		= hgl_sw_displaytarget(displayTarget);
+
+	return haikuDisplayTarget->data;
+}
+
+
+static void
+hgl_winsys_displaytarget_unmap(struct sw_winsys* winsys,
+	struct sw_displaytarget* disptarget)
+{
+	return;
+}
+
+
+static void
+hgl_winsys_displaytarget_display(struct sw_winsys* winsys,
+	struct sw_displaytarget* displayTarget, void* contextPrivate)
+{
+	assert(contextPrivate);
+
+	Bitmap* bitmap = (Bitmap*)contextPrivate;
+
+	struct haiku_displaytarget* haikuDisplayTarget
+		= hgl_sw_displaytarget(displayTarget);
+
+	copy_bitmap_bits(bitmap, haikuDisplayTarget->data,
+		haikuDisplayTarget->size);
+
+	return;
+}
+
+
+struct sw_winsys*
+hgl_create_sw_winsys()
+{
+	struct sw_winsys* winsys = CALLOC_STRUCT(sw_winsys);
+
+	if (!winsys)
+		return NULL;
+	
+	// Attach winsys hooks for Haiku
+	winsys->destroy = hgl_winsys_destroy;
+	winsys->is_displaytarget_format_supported
+		= hgl_winsys_is_displaytarget_format_supported;
+	winsys->displaytarget_create = hgl_winsys_displaytarget_create;
+	winsys->displaytarget_from_handle = hgl_winsys_displaytarget_from_handle;
+	winsys->displaytarget_get_handle = hgl_winsys_displaytarget_get_handle;
+	winsys->displaytarget_map = hgl_winsys_displaytarget_map;
+	winsys->displaytarget_unmap = hgl_winsys_displaytarget_unmap;
+	winsys->displaytarget_display = hgl_winsys_displaytarget_display;
+	winsys->displaytarget_destroy = hgl_winsys_displaytarget_destroy;
+
+	return winsys;
+}
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
new file mode 100644
index 00000000000..4c706a51233
--- /dev/null
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.h
@@ -0,0 +1,52 @@
+/**************************************************************************
+ *
+ * Copyright 2009 Artur Wyszynski <[email protected]>
+ * Copyright 2013 Alexander von Gluck IV <[email protected]>
+ *
+ * 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.
+ *
+ **************************************************************************/
+#ifndef _HGL_SOFTWAREWINSYS_H
+#define _HGL_SOFTWAREWINSYS_H
+
+
+#include "pipe/p_defines.h"
+#include "state_tracker/st_api.h"
+#include "state_tracker/sw_winsys.h"
+
+
+struct haiku_displaytarget
+{
+	enum pipe_format format;
+	unsigned width;
+	unsigned height;
+	unsigned stride;
+
+	unsigned size;
+
+	void* data;
+};
+
+
+struct sw_winsys* hgl_create_sw_winsys();
+
+
+#endif