mesa/glthread: remove HAVE_PTHREAD guards

we are switching to util_queue.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py
index f52b9b7b810499512ab76e8d2e7e1654a5057814..062afe566fd44cbd0b63b61bb5faec57003fe040 100644 (file)
--- a/src/mapi/glapi/gen/gl_marshal.py
+++ b/src/mapi/glapi/gen/gl_marshal.py
@@ -66,8 +66,6 @@ class PrintCode(gl_XML.gl_print_base):
 
     def printRealHeader(self):
         print header
-        print '#ifdef HAVE_PTHREAD'
-        print
         print 'static inline int safe_mul(int a, int b)'
         print '{'
         print '    if (a < 0 || b < 0) return -1;'
@@ -78,8 +76,7 @@ class PrintCode(gl_XML.gl_print_base):
         print
 
     def printRealFooter(self):
-        print
-        print '#endif'
+        pass
 
     def print_sync_call(self, func):
         call = 'CALL_{0}(ctx->CurrentServerDispatch, ({1}))'.format(

diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c
index 455b829cd8db7e048465a4a4ae7cd2d41d0e2ca2..e90709c0870ddffb3367dc397faef78234c2c724 100644 (file)
--- a/src/mesa/main/glthread.c
+++ b/src/mesa/main/glthread.c
@@ -38,8 +38,6 @@
 #include "main/marshal_generated.h"
 #include "util/u_thread.h"
 
-#ifdef HAVE_PTHREAD
-
 static void
 glthread_allocate_batch(struct gl_context *ctx)
 {
@@ -284,5 +282,3 @@ _mesa_glthread_finish(struct gl_context *ctx)
 
    pthread_mutex_unlock(&glthread->mutex);
 }
-
-#endif

diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index 50c1db2548872858c7f705f5246a8c1f4c1cf8a7..07bed380cbfd654d7c7df5843ae9339408c0a231 100644 (file)
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -29,8 +29,6 @@
 /* Command size is a number of bytes stored in a short. */
 #define MARSHAL_MAX_CMD_SIZE 65535
 
-#ifdef HAVE_PTHREAD
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <pthread.h>
@@ -124,32 +122,4 @@ void _mesa_glthread_restore_dispatch(struct gl_context *ctx);
 void _mesa_glthread_flush_batch(struct gl_context *ctx);
 void _mesa_glthread_finish(struct gl_context *ctx);
 
-#else /* HAVE_PTHREAD */
-
-static inline void
-_mesa_glthread_init(struct gl_context *ctx)
-{
-}
-
-static inline void
-_mesa_glthread_destroy(struct gl_context *ctx)
-{
-}
-
-static inline void
-_mesa_glthread_finish(struct gl_context *ctx)
-{
-}
-
-static inline void
-_mesa_glthread_restore_dispatch(struct gl_context *ctx)
-{
-}
-
-static inline void
-_mesa_glthread_flush_batch(struct gl_context *ctx)
-{
-}
-
-#endif /* !HAVE_PTHREAD */
 #endif /* _GLTHREAD_H*/

diff --git a/src/mesa/main/marshal.c b/src/mesa/main/marshal.c
index d4c46a2717547288ea6d6daaee2033d5e1dbce60..8db4531440309cd4a4a81a899679fe131439c304 100644 (file)
--- a/src/mesa/main/marshal.c
+++ b/src/mesa/main/marshal.c
@@ -33,8 +33,6 @@
 #include "dispatch.h"
 #include "marshal_generated.h"
 
-#ifdef HAVE_PTHREAD
-
 struct marshal_cmd_Flush
 {
    struct marshal_cmd_base cmd_base;
@@ -589,5 +587,3 @@ _mesa_marshal_ClearBufferfv(GLenum buffer, GLint drawbuffer,
                          (buffer, drawbuffer, value));
    }
 }
-
-#endif

diff --git a/src/mesa/main/marshal.h b/src/mesa/main/marshal.h
index 46f76634fb647e8df7e545faaf69a387097cee88..a6cff8bcbfda0a39006504133f58b574f913e136 100644 (file)
--- a/src/mesa/main/marshal.h
+++ b/src/mesa/main/marshal.h
@@ -47,8 +47,6 @@ struct marshal_cmd_base
    uint16_t cmd_size;
 };
 
-#ifdef HAVE_PTHREAD
-
 static inline void *
 _mesa_glthread_allocate_command(struct gl_context *ctx,
                                 uint16_t cmd_id,
@@ -94,31 +92,6 @@ _mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
    return ctx->API != API_OPENGL_CORE && !glthread->element_array_is_vbo;
 }
 
-#else
-
-/* FIXME: dummy functions for non PTHREAD platforms */
-static inline void *
-_mesa_glthread_allocate_command(struct gl_context *ctx,
-                                uint16_t cmd_id,
-                                size_t size)
-{
-   return NULL;
-}
-
-static inline bool
-_mesa_glthread_is_non_vbo_vertex_attrib_pointer(const struct gl_context *ctx)
-{
-   return false;
-}
-
-static inline bool
-_mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
-{
-   return false;
-}
-
-#endif
-
 #define DEBUG_MARSHAL_PRINT_CALLS 0
 
 /**