diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-06 08:33:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-06 08:33:58 +0100 |
| commit | ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446 (patch) | |
| tree | 30d7b35b3c3d34b4539b57e1d92951ac5c8a3dfe /mesalib/src/mapi | |
| parent | 68320ff05946f092b6836754c6267b1dff2f4633 (diff) | |
| parent | ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a (diff) | |
| download | vcxsrv-ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446.tar.gz vcxsrv-ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446.tar.bz2 vcxsrv-ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/glapi_nop.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/glapi_nop.c b/mesalib/src/mapi/glapi/glapi_nop.c index 365a6e1c8..f34075e70 100644 --- a/mesalib/src/mapi/glapi/glapi_nop.c +++ b/mesalib/src/mapi/glapi/glapi_nop.c @@ -51,7 +51,11 @@ _glapi_set_warning_func(_glapi_proc func) { } -#ifdef DEBUG +/* + * When GLAPIENTRY is __stdcall (i.e. Windows), the stack is popped by the + * callee making the number/type of arguments significant. + */ +#if defined(_WIN32) || defined(DEBUG) /** * Called by each of the no-op GL entrypoints. @@ -59,7 +63,7 @@ _glapi_set_warning_func(_glapi_proc func) static int Warn(const char *func) { -#if !defined(_WIN32_WCE) +#if defined(DEBUG) && !defined(_WIN32_WCE) if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) { fprintf(stderr, "GL User Error: gl%s called without a rendering context\n", func); |