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

Fixes to silence warnings in code generated by glapi scripts.

Browse Source
This commit is contained in:
Kristian Høgsberg
2006-03-29 22:32:38 +00:00
parent cec74532bf
commit 3a6d968f37
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/glapi/Makefile
View File

@@ -24,7 +24,9 @@ GLX_DIR = $(XORG_BASE)/GL/glx
SERVER_OUTPUTS = $(GLX_DIR)/indirect_dispatch.c \ SERVER_OUTPUTS = $(GLX_DIR)/indirect_dispatch.c \
$(GLX_DIR)/indirect_dispatch_swap.c \ $(GLX_DIR)/indirect_dispatch_swap.c \
$(GLX_DIR)/indirect_dispatch.h $(GLX_DIR)/indirect_dispatch.h \
$(GLX_DIR)/indirect_size_get.c \
$(GLX_DIR)/indirect_size_get.h
COMMON = gl_XML.py license.py gl_API.xml typeexpr.py COMMON = gl_XML.py license.py gl_API.xml typeexpr.py
COMMON_GLX = $(COMMON) glX_XML.py glX_proto_common.py COMMON_GLX = $(COMMON) glX_XML.py glX_proto_common.py

4
src/mesa/glapi/glX_proto_recv.py
View File

@@ -237,7 +237,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
for param in f.parameterIterator(): for param in f.parameterIterator():
if param.is_counter or param.is_image() or param.is_output or len(param.count_parameter_list): if param.is_counter or param.is_image() or param.is_output or param.name in f.count_parameter_list or len(param.count_parameter_list):
location = param.name location = param.name
else: else:
location = self.fetch_param(param) location = self.fetch_param(param)
@@ -360,6 +360,8 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
else: else:
swap_func = self.swap_name(sub[0]) swap_func = self.swap_name(sub[0])
print ' %s = (%s) %s( (%s *) (pc + %s), %s ); break;' % (param.name, param.type_string(), swap_func, self.real_types[sub[0]], o, count_name) print ' %s = (%s) %s( (%s *) (pc + %s), %s ); break;' % (param.name, param.type_string(), swap_func, self.real_types[sub[0]], o, count_name)
print ' default:'
print ' return;'
print ' }' print ' }'
else: else:
swap_func = self.swap_name(type_size) swap_func = self.swap_name(type_size)

2
src/mesa/glapi/glX_proto_size.py
View File

@@ -316,6 +316,8 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
print '#include <GL/gl.h>' print '#include <GL/gl.h>'
if self.emit_get: if self.emit_get:
print '#include "indirect_size_get.h"' print '#include "indirect_size_get.h"'
print '#include "glxserver.h"'
print '#include "indirect_util.h"'
print '#include "indirect_size.h"' print '#include "indirect_size.h"'

4
src/mesa/glapi/glapi.c
View File

@@ -60,7 +60,9 @@
static GLboolean WarnFlag = GL_FALSE; static GLboolean WarnFlag = GL_FALSE;
static _glapi_warning_func warning_func; static _glapi_warning_func warning_func;
#if defined(PTHREADS) || defined(GLX_USE_TLS)
static void init_glapi_relocs(void); static void init_glapi_relocs(void);
#endif
static _glapi_proc generate_entrypoint(GLuint functionOffset); static _glapi_proc generate_entrypoint(GLuint functionOffset);
static void fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset); static void fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset);
@@ -1013,6 +1015,7 @@ _glapi_check_table(const struct _glapi_table *table)
} }
#if defined(PTHREADS) || defined(GLX_USE_TLS)
/** /**
* Perform platform-specific GL API entry-point fixups. * Perform platform-specific GL API entry-point fixups.
* *
@@ -1033,3 +1036,4 @@ init_glapi_relocs( void )
} }
#endif /* defined( USE_X86_ASM ) && defined( GLX_USE_TLS ) */ #endif /* defined( USE_X86_ASM ) && defined( GLX_USE_TLS ) */
} }
#endif