Browse Source

Noop dispatch: move warning code out of the generated functions

This reduces libGL size by 11% here, going from 360968 bytes to
320008 bytes.
tags/7.8-rc1
Kristian Høgsberg 15 years ago
parent
commit
c3047e73f7
1 changed files with 7 additions and 21 deletions
  1. 7
    21
      src/mesa/glapi/glapi.c

+ 7
- 21
src/mesa/glapi/glapi.c View File

@@ -73,7 +73,6 @@
#include "glapioffsets.h"
#include "glapitable.h"


/***** BEGIN NO-OP DISPATCH *****/

static GLboolean WarnFlag = GL_FALSE;
@@ -97,23 +96,18 @@ _glapi_set_warning_func( _glapi_warning_func func )
warning_func = func;
}

static GLboolean
warn(void)
static int
warn(const char *func)
{
#if !defined(_WIN32_WCE)
if ((WarnFlag || getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG"))
&& warning_func) {
return GL_TRUE;
}
else {
return GL_FALSE;
warning_func(NULL, "GL User Error: called without context: %s", func);
}
#else
return GL_FALSE;
#endif
return 0;
}


#define KEYWORD1 static
#define KEYWORD1_ALT static
#define KEYWORD2 GLAPIENTRY
@@ -122,15 +116,10 @@ warn(void)
#define F NULL

#define DISPATCH(func, args, msg) \
if (warn()) { \
warning_func(NULL, "GL User Error: called without context: %s", #func); \
}
warn(#func);

#define RETURN_DISPATCH(func, args, msg) \
if (warn()) { \
warning_func(NULL, "GL User Error: called without context: %s", #func); \
} \
return 0
return warn(#func);

#define DISPATCH_TABLE_NAME __glapi_noop_table
#define UNUSED_TABLE_NAME __unused_noop_functions
@@ -139,10 +128,7 @@ warn(void)

static GLint NoOpUnused(void)
{
if (warn()) {
warning_func(NULL, "GL User Error: calling extension function without a current context\n");
}
return 0;
return warn("extension function");
}

#include "glapitemp.h"

Loading…
Cancel
Save