diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-23 07:34:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-23 07:34:10 +0000 |
| commit | e8d899178e9ebe174e6b4a53297d3dfced8003f0 (patch) | |
| tree | 407c4e3c78b0cc28e95e7f607d02975e2155a46f /mesalib/src/mesa/main | |
| parent | aa5b2e956fcc17b27d0f20ba7af65c52b34ef135 (diff) | |
| parent | fbb8c9a149047ccb27e749053c83acf94dedcbf9 (diff) | |
| download | vcxsrv-e8d899178e9ebe174e6b4a53297d3dfced8003f0.tar.gz vcxsrv-e8d899178e9ebe174e6b4a53297d3dfced8003f0.tar.bz2 vcxsrv-e8d899178e9ebe174e6b4a53297d3dfced8003f0.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/dlist.c | 8 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/imports.h | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index a6502bbb7..569a7d9ca 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -8419,8 +8419,6 @@ _mesa_CallList(GLuint list) GLboolean save_compile_flag;
GET_CURRENT_CONTEXT(ctx);
FLUSH_CURRENT(ctx, 0);
- /* VERY IMPORTANT: Save the CompileFlag status, turn it off, */
- /* execute the display list, and restore the CompileFlag. */
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glCallList %d\n", list);
@@ -8430,8 +8428,12 @@ _mesa_CallList(GLuint list) return;
}
-/* mesa_print_display_list( list ); */
+ if (0)
+ mesa_print_display_list( list );
+ /* VERY IMPORTANT: Save the CompileFlag status, turn it off,
+ * execute the display list, and restore the CompileFlag.
+ */
save_compile_flag = ctx->CompileFlag;
if (save_compile_flag) {
ctx->CompileFlag = GL_FALSE;
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index 9922f43e3..315c4119d 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -540,6 +540,12 @@ extern void _mesa_init_sqrt_table(void);
#ifdef __GNUC__
+
+#ifdef __MINGW32__
+#define ffs __builtin_ffs
+#define ffsll __builtin_ffsll
+#endif
+
#define _mesa_ffs(i) ffs(i)
#define _mesa_ffsll(i) ffsll(i)
|