Mesa (gallium-screen-context): st/python: more dead create_context wrapper removal

Keith Whitwell keithw at kemper.freedesktop.org
Thu Feb 4 16:42:57 UTC 2010


Module: Mesa
Branch: gallium-screen-context
Commit: cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Feb  4 16:42:05 2010 +0000

st/python: more dead create_context wrapper removal

---

 src/gallium/state_trackers/python/st_device.c      |    3 +--
 .../state_trackers/python/st_hardpipe_winsys.c     |   17 +----------------
 .../state_trackers/python/st_llvmpipe_winsys.c     |    9 +--------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/gallium/state_trackers/python/st_device.c b/src/gallium/state_trackers/python/st_device.c
index bf1b135..faa8e23 100644
--- a/src/gallium/state_trackers/python/st_device.c
+++ b/src/gallium/state_trackers/python/st_device.c
@@ -80,8 +80,7 @@ st_device_create_from_st_winsys(const struct st_winsys *st_ws)
 {
    struct st_device *st_dev;
    
-   if(!st_ws->screen_create ||
-      !st_ws->context_create)
+   if(!st_ws->screen_create)
       return NULL;
    
    st_dev = CALLOC_STRUCT(st_device);
diff --git a/src/gallium/state_trackers/python/st_hardpipe_winsys.c b/src/gallium/state_trackers/python/st_hardpipe_winsys.c
index 43aaaab..a3110a1 100644
--- a/src/gallium/state_trackers/python/st_hardpipe_winsys.c
+++ b/src/gallium/state_trackers/python/st_hardpipe_winsys.c
@@ -217,21 +217,6 @@ st_hardpipe_screen_create(void)
 }
 
 
-static struct pipe_context *
-st_hardpipe_context_create(struct pipe_screen *screen)
-{
-   if(st_hardpipe_load()) {
-      if(screen == pfnGetGalliumScreenMESA())
-         return pfnCreateGalliumContextMESA();
-      else
-         return NULL;
-   }
-   else
-      return st_softpipe_winsys.context_create(screen);
-}
-
-
 const struct st_winsys st_hardpipe_winsys = {
-   &st_hardpipe_screen_create,
-   &st_hardpipe_context_create
+   &st_hardpipe_screen_create
 };
diff --git a/src/gallium/state_trackers/python/st_llvmpipe_winsys.c b/src/gallium/state_trackers/python/st_llvmpipe_winsys.c
index 32d2f66..73a06d2 100644
--- a/src/gallium/state_trackers/python/st_llvmpipe_winsys.c
+++ b/src/gallium/state_trackers/python/st_llvmpipe_winsys.c
@@ -135,14 +135,7 @@ no_winsys:
 }
 
 
-static struct pipe_context *
-st_llvmpipe_context_create(struct pipe_screen *screen)
-{
-   return screen->context_create(screen, NULL);
-}
-
 
 const struct st_winsys st_softpipe_winsys = {
-   &st_llvmpipe_screen_create,
-   &st_llvmpipe_context_create,
+   &st_llvmpipe_screen_create
 };




More information about the mesa-commit mailing list