OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/glthread: remove HAVE_PTHREAD guards

Browse Source 
we are switching to util_queue.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Marek Olšák
2017-06-21 12:24:33 +02:00
parent 6884c95ab4
commit 1e37a5054b
5 changed files with 1 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mapi/glapi/gen/gl_marshal.py
View File

@@ -66,8 +66,6 @@ class PrintCode(gl_XML.gl_print_base):
def printRealHeader(self): def printRealHeader(self):
print header print header
print '#ifdef HAVE_PTHREAD'
print
print 'static inline int safe_mul(int a, int b)' print 'static inline int safe_mul(int a, int b)'
print '{' print '{'
print ' if (a < 0 || b < 0) return -1;' print ' if (a < 0 || b < 0) return -1;'
@@ -78,8 +76,7 @@ class PrintCode(gl_XML.gl_print_base):
print print
def printRealFooter(self): def printRealFooter(self):
print pass
print '#endif'
def print_sync_call(self, func): def print_sync_call(self, func):
call = 'CALL_{0}(ctx->CurrentServerDispatch, ({1}))'.format( call = 'CALL_{0}(ctx->CurrentServerDispatch, ({1}))'.format(

4
src/mesa/main/glthread.c
View File

@@ -38,8 +38,6 @@
#include "main/marshal_generated.h" #include "main/marshal_generated.h"
#include "util/u_thread.h" #include "util/u_thread.h"
#ifdef HAVE_PTHREAD
static void static void
glthread_allocate_batch(struct gl_context *ctx) glthread_allocate_batch(struct gl_context *ctx)
{ {
@@ -284,5 +282,3 @@ _mesa_glthread_finish(struct gl_context *ctx)
pthread_mutex_unlock(&glthread->mutex); pthread_mutex_unlock(&glthread->mutex);
} }
#endif

30
src/mesa/main/glthread.h
View File

@@ -29,8 +29,6 @@
/* Command size is a number of bytes stored in a short. */ /* Command size is a number of bytes stored in a short. */
#define MARSHAL_MAX_CMD_SIZE 65535 #define MARSHAL_MAX_CMD_SIZE 65535
#ifdef HAVE_PTHREAD
#include <inttypes.h> #include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include <pthread.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_flush_batch(struct gl_context *ctx);
void _mesa_glthread_finish(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*/ #endif /* _GLTHREAD_H*/

4
src/mesa/main/marshal.c
View File

@@ -33,8 +33,6 @@
#include "dispatch.h" #include "dispatch.h"
#include "marshal_generated.h" #include "marshal_generated.h"
#ifdef HAVE_PTHREAD
struct marshal_cmd_Flush struct marshal_cmd_Flush
{ {
struct marshal_cmd_base cmd_base; struct marshal_cmd_base cmd_base;
@@ -589,5 +587,3 @@ _mesa_marshal_ClearBufferfv(GLenum buffer, GLint drawbuffer,
(buffer, drawbuffer, value)); (buffer, drawbuffer, value));
} }
} }
#endif

27
src/mesa/main/marshal.h
View File

@@ -47,8 +47,6 @@ struct marshal_cmd_base
uint16_t cmd_size; uint16_t cmd_size;
}; };
#ifdef HAVE_PTHREAD
static inline void * static inline void *
_mesa_glthread_allocate_command(struct gl_context *ctx, _mesa_glthread_allocate_command(struct gl_context *ctx,
uint16_t cmd_id, 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; 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 #define DEBUG_MARSHAL_PRINT_CALLS 0
/** /**