python: Allow hardware support.

8 files changed, 96 insertions, 13 deletions

diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript
index 687c46bfd76..b284d2020bc 100644
--- a/src/gallium/state_trackers/python/SConscript
+++ b/src/gallium/state_trackers/python/SConscript
@@ -15,12 +15,19 @@ if 'python' in env['statetrackers']:
     
     env.Append(CPPPATH = '.')
 
-    env.SharedLibrary(
-        target = '_gallium',
+    pyst = env.ConvenienceLibrary(
+        target = 'pyst',
         source = [
             'gallium.i',
             'st_device.c',
             'st_softpipe_winsys.c',
         ],
-        LIBS = softpipe + auxiliaries + env['LIBS'],
+    )
+
+    env.SharedLibrary(
+        target = '_gallium',
+        source = [
+            'st_hardpipe_winsys.c',
+        ],
+        LIBS = [pyst, softpipe] + auxiliaries + env['LIBS'],
     )
diff --git a/src/gallium/state_trackers/python/gallium.i b/src/gallium/state_trackers/python/gallium.i
index 60f8e503005..967840a063d 100644
--- a/src/gallium/state_trackers/python/gallium.i
+++ b/src/gallium/state_trackers/python/gallium.i
@@ -100,7 +100,7 @@ struct st_context {
 
 %extend st_device {
    
-   st_device(int hardware = 0) {
+   st_device(int hardware = 1) {
       return st_device_create(hardware ? TRUE : FALSE);
    }
 
diff --git a/src/gallium/state_trackers/python/samples/tri.py b/src/gallium/state_trackers/python/samples/tri.py
index 7a10905ddbc..f915c262153 100644
--- a/src/gallium/state_trackers/python/samples/tri.py
+++ b/src/gallium/state_trackers/python/samples/tri.py
@@ -185,7 +185,7 @@ def test(dev):
 
 
 def main():
-    dev = Device(hardware = False)
+    dev = Device()
     test(dev)
 
 
diff --git a/src/gallium/state_trackers/python/st_device.c b/src/gallium/state_trackers/python/st_device.c
index 25b5a4fa8c1..d88d2de3c61 100644
--- a/src/gallium/state_trackers/python/st_device.c
+++ b/src/gallium/state_trackers/python/st_device.c
@@ -82,12 +82,10 @@ st_device_create_from_st_winsys(const struct st_winsys *st_ws)
 
 struct st_device *
 st_device_create(boolean hardware) {
-#if 0
    if(hardware)
-      return st_device_create_from_st_winsys(&st_hardware_winsys);
+      return st_device_create_from_st_winsys(&st_hardpipe_winsys);
    else
-#endif
-      return st_device_create_from_st_winsys(&st_software_winsys);
+      return st_device_create_from_st_winsys(&st_softpipe_winsys);
 }
 
 
diff --git a/src/gallium/state_trackers/python/st_hardpipe_winsys.c b/src/gallium/state_trackers/python/st_hardpipe_winsys.c
new file mode 100644
index 00000000000..33b75637b37
--- /dev/null
+++ b/src/gallium/state_trackers/python/st_hardpipe_winsys.c
@@ -0,0 +1,78 @@
+/**************************************************************************
+ * 
+ * Copyright 2008 Tungsten Graphics, Inc., Bismarck, ND., USA
+ * 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.
+ * 
+ * 
+ **************************************************************************/
+
+/**
+ * @file
+ * Stub for hardware pipe driver support.
+ */
+
+
+#include "pipe/p_compiler.h"
+
+#include "st_winsys.h"
+
+
+extern void init_gallium(void);
+
+void (*force_init_gallium_linkage)(void) = &init_gallium;
+
+
+static void 
+st_hardpipe_screen_destroy(struct pipe_screen *screen)
+{
+   st_softpipe_winsys.screen_destroy(screen);
+}
+
+
+static struct pipe_screen *
+st_hardpipe_screen_create(void)
+{
+   return st_softpipe_winsys.screen_create();
+}
+
+
+static void
+st_hardpipe_context_destroy(struct pipe_context *pipe)
+{
+   st_softpipe_winsys.context_destroy(pipe);
+}
+
+
+static struct pipe_context *
+st_hardpipe_context_create(struct pipe_screen *screen)
+{
+   return st_softpipe_winsys.context_create(screen);
+}
+
+
+const struct st_winsys st_hardpipe_winsys = {
+   &st_hardpipe_screen_create,
+   &st_hardpipe_screen_destroy,
+   &st_hardpipe_context_create,
+   &st_hardpipe_context_destroy
+};
diff --git a/src/gallium/state_trackers/python/st_softpipe_winsys.c b/src/gallium/state_trackers/python/st_softpipe_winsys.c
index 964d60de1d8..1fda70ca00f 100644
--- a/src/gallium/state_trackers/python/st_softpipe_winsys.c
+++ b/src/gallium/state_trackers/python/st_softpipe_winsys.c
@@ -313,7 +313,7 @@ st_softpipe_context_create(struct pipe_screen *screen)
 }
 
 
-const struct st_winsys st_software_winsys = {
+const struct st_winsys st_softpipe_winsys = {
    &st_softpipe_screen_create,
    &st_softpipe_screen_destroy,
    &st_softpipe_context_create,
diff --git a/src/gallium/state_trackers/python/st_winsys.h b/src/gallium/state_trackers/python/st_winsys.h
index 992fc9ab4ba..43db8b6bff1 100644
--- a/src/gallium/state_trackers/python/st_winsys.h
+++ b/src/gallium/state_trackers/python/st_winsys.h
@@ -50,9 +50,9 @@ struct st_winsys
 };
 
 
-extern const struct st_winsys st_software_winsys;
+extern const struct st_winsys st_softpipe_winsys;
 
-extern const struct st_winsys st_hardware_winsys;
+extern const struct st_winsys st_hardpipe_winsys;
 
 
 #endif /* ST_WINSYS_H_ */
diff --git a/src/gallium/state_trackers/python/tests/texture.py b/src/gallium/state_trackers/python/tests/texture.py
index d0b657423ea..ad11e8dcc90 100644
--- a/src/gallium/state_trackers/python/tests/texture.py
+++ b/src/gallium/state_trackers/python/tests/texture.py
@@ -227,7 +227,7 @@ class TextureTest(Test):
 
 
 def main():
-    dev = Device(hardware = False)
+    dev = Device()
     test = TextureTest(dev = dev)
     test.run()