glx: use dispatch.h instead of glapioffsets.h

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Ian Romanick 2011-12-08 12:07:38 -08:00
parent 66e6037c33
commit d26cb70272
4 changed files with 4 additions and 1178 deletions

View File

@ -44,9 +44,11 @@
#endif #endif
#include "glapi.h" #include "glapi.h"
#include "glapioffsets.h" #include "dispatch.h"
#include "glapitable.h" #include "glapitable.h"
#define FIRST_DYNAMIC_OFFSET (sizeof(struct _glapi_table) / sizeof(void *))
#if defined(PTHREADS) || defined(GLX_USE_TLS) #if defined(PTHREADS) || defined(GLX_USE_TLS)
static void init_glapi_relocs(void); static void init_glapi_relocs(void);
#endif #endif
@ -380,7 +382,7 @@ PUBLIC int
_glapi_add_dispatch( const char * const * function_names, _glapi_add_dispatch( const char * const * function_names,
const char * parameter_signature ) const char * parameter_signature )
{ {
static int next_dynamic_offset = _gloffset_FIRST_DYNAMIC; static int next_dynamic_offset = FIRST_DYNAMIC_OFFSET;
const char * const real_sig = (parameter_signature != NULL) const char * const real_sig = (parameter_signature != NULL)
? parameter_signature : ""; ? parameter_signature : "";
struct _glapi_function * entry[8]; struct _glapi_function * entry[8];

File diff suppressed because it is too large Load Diff

View File

@ -44,7 +44,6 @@
#include "glapi.h" #include "glapi.h"
#include "glthread.h" #include "glthread.h"
#include "dispatch.h" #include "dispatch.h"
#include "glapioffsets.h"
static int DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte *pc, static int DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte *pc,
unsigned get_programiv_offset, unsigned get_program_string_offset, unsigned get_programiv_offset, unsigned get_program_string_offset,

View File

@ -37,7 +37,6 @@
#include "glapi.h" #include "glapi.h"
#include "glthread.h" #include "glthread.h"
#include "dispatch.h" #include "dispatch.h"
#include "glapioffsets.h"
#include "glxbyteorder.h" #include "glxbyteorder.h"
static int DoSwapInterval(__GLXclientState *cl, GLbyte *pc, int do_swap); static int DoSwapInterval(__GLXclientState *cl, GLbyte *pc, int do_swap);