Mesa (lp-binning): llvmpipe: remove old fence code, compile new lp_fence. c file

Brian Paul brianp at kemper.freedesktop.org
Fri Dec 11 17:01:21 PST 2009


Module: Mesa
Branch: lp-binning
Commit: 2876b684de39dbdf803b3f3d1ac231e76fb4357e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2876b684de39dbdf803b3f3d1ac231e76fb4357e

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Dec 11 17:32:45 2009 -0700

llvmpipe: remove old fence code, compile new lp_fence.c file

---

 src/gallium/drivers/llvmpipe/Makefile    |    1 +
 src/gallium/drivers/llvmpipe/SConscript  |    1 +
 src/gallium/drivers/llvmpipe/lp_buffer.c |   31 ------------------------------
 src/gallium/drivers/llvmpipe/lp_screen.c |    2 +
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 4cc4c88..7c4cf32 100644
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -32,6 +32,7 @@ C_SOURCES = \
 	lp_clear.c \
 	lp_context.c \
 	lp_draw_arrays.c \
+	lp_fence.c \
 	lp_flush.c \
 	lp_jit.c \
 	lp_prim_vbuf.c \
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 19ef686..bc725b6 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -45,6 +45,7 @@ llvmpipe = env.ConvenienceLibrary(
 		'lp_clear.c',
 		'lp_context.c',
 		'lp_draw_arrays.c',
+		'lp_fence.c',
 		'lp_flush.c',
 		'lp_jit.c',
 		'lp_prim_vbuf.c',
diff --git a/src/gallium/drivers/llvmpipe/lp_buffer.c b/src/gallium/drivers/llvmpipe/lp_buffer.c
index 66f1f8e..a5ef221 100644
--- a/src/gallium/drivers/llvmpipe/lp_buffer.c
+++ b/src/gallium/drivers/llvmpipe/lp_buffer.c
@@ -108,32 +108,6 @@ llvmpipe_user_buffer_create(struct pipe_screen *screen,
 }
 
 
-static void
-llvmpipe_fence_reference(struct pipe_screen *screen,
-                         struct pipe_fence_handle **ptr,
-                         struct pipe_fence_handle *fence)
-{
-}
-
-
-static int
-llvmpipe_fence_signalled(struct pipe_screen *screen,
-                         struct pipe_fence_handle *fence,
-                         unsigned flag)
-{
-   return 0;
-}
-
-
-static int
-llvmpipe_fence_finish(struct pipe_screen *screen,
-                      struct pipe_fence_handle *fence,
-                      unsigned flag)
-{
-   return 0;
-}
-
-
 void
 llvmpipe_init_screen_buffer_funcs(struct pipe_screen *screen)
 {
@@ -142,9 +116,4 @@ llvmpipe_init_screen_buffer_funcs(struct pipe_screen *screen)
    screen->buffer_map = llvmpipe_buffer_map;
    screen->buffer_unmap = llvmpipe_buffer_unmap;
    screen->buffer_destroy = llvmpipe_buffer_destroy;
-
-   screen->fence_reference = llvmpipe_fence_reference;
-   screen->fence_signalled = llvmpipe_fence_signalled;
-   screen->fence_finish = llvmpipe_fence_finish;
-
 }
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 87fddbd..017496e 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -32,6 +32,7 @@
 
 #include "lp_texture.h"
 #include "lp_buffer.h"
+#include "lp_fence.h"
 #include "lp_winsys.h"
 #include "lp_jit.h"
 #include "lp_screen.h"
@@ -253,6 +254,7 @@ llvmpipe_create_screen(struct llvmpipe_winsys *winsys)
 
    llvmpipe_init_screen_texture_funcs(&screen->base);
    llvmpipe_init_screen_buffer_funcs(&screen->base);
+   llvmpipe_init_screen_fence_funcs(&screen->base);
 
    lp_jit_screen_init(screen);
 



More information about the mesa-commit mailing list