mesalib git update 22/1/2011

3 files changed, 103 insertions, 103 deletions

diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index 28dd7df16..d2bc3bafc 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -17,6 +17,11 @@ if env['platform'] != 'winddk':
             '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers

             'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers

         ])

+        if env['gles']:

+            env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])

+        else:

+            # prevent _glapi_* from being declared __declspec(dllimport)

+            env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])

 

     env.Append(CPPPATH = [

         '#/src/mapi',

diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index e53cfbf2c..1d4ac4674 100644
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -45,11 +45,6 @@
 #define _GLAPI_H

 

 

-/* opengl.dll does not export _glapi_* */

-#if defined(_WIN32)

-#define _GLAPI_NO_EXPORTS

-#endif

-

 #ifdef _GLAPI_NO_EXPORTS

 #  define _GLAPI_EXPORT

 #else /* _GLAPI_NO_EXPORTS */

diff --git a/mesalib/src/mapi/mapi/entry.c b/mesalib/src/mapi/mapi/entry.c
index f378ccfda..410a68f2b 100644
--- a/mesalib/src/mapi/mapi/entry.c
+++ b/mesalib/src/mapi/mapi/entry.c
@@ -1,98 +1,98 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.9
- *
- * Copyright (C) 2010 LunarG Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
- */
-
-#include "entry.h"
-#include "u_current.h"
-#include "u_macros.h"
-
-/* define macros for use by assembly dispatchers */
-#define ENTRY_CURRENT_TABLE U_STRINGIFY(u_current_table)
-
-/* in bridge mode, mapi is a user of glapi */
-#ifdef MAPI_MODE_BRIDGE
-#define ENTRY_CURRENT_TABLE_GET "_glapi_get_dispatch"
-#else
-#define ENTRY_CURRENT_TABLE_GET "u_current_get_internal"
-#endif
-
-#if defined(USE_X86_ASM) && defined(__GNUC__)
-#   ifdef GLX_USE_TLS
-#      include "entry_x86_tls.h"
-#   else                 
-#      include "entry_x86_tsd.h"
-#   endif
-#elif defined(USE_X86_64_ASM) && defined(__GNUC__) && defined(GLX_USE_TLS)
-#   include "entry_x86-64_tls.h"
-#else
-
-#include <stdlib.h>
-
-static INLINE const struct mapi_table *
-entry_current_get(void)
-{
-#ifdef MAPI_MODE_BRIDGE
-   return GET_DISPATCH();
-#else
-   return u_current_get();
-#endif
-}
-
-/* C version of the public entries */
-#define MAPI_TMP_DEFINES
-#define MAPI_TMP_PUBLIC_DECLARES
-#define MAPI_TMP_PUBLIC_ENTRIES
-#include "mapi_tmp.h"
-
-#ifndef MAPI_MODE_BRIDGE
-
-void
-entry_patch_public(void)
-{
-}
-
-mapi_func
-entry_get_public(int slot)
-{
-   /* pubic_entries are defined by MAPI_TMP_PUBLIC_ENTRIES */
-   return public_entries[slot];
-}
-
-mapi_func
-entry_generate(int slot)
-{
-   return NULL;
-}
-
-void
-entry_patch(mapi_func entry, int slot)
-{
-}
-
-#endif /* MAPI_MODE_BRIDGE */
-
-#endif /* asm */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.9

+ *

+ * Copyright (C) 2010 LunarG Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ *

+ * Authors:

+ *    Chia-I Wu <olv@lunarg.com>

+ */

+

+#include "entry.h"

+#include "u_current.h"

+#include "u_macros.h"

+

+/* define macros for use by assembly dispatchers */

+#define ENTRY_CURRENT_TABLE U_STRINGIFY(u_current_table)

+

+/* in bridge mode, mapi is a user of glapi */

+#ifdef MAPI_MODE_BRIDGE

+#define ENTRY_CURRENT_TABLE_GET "_glapi_get_dispatch"

+#else

+#define ENTRY_CURRENT_TABLE_GET U_STRINGIFY(u_current_get_internal)

+#endif

+

+#if defined(USE_X86_ASM) && defined(__GNUC__)

+#   ifdef GLX_USE_TLS

+#      include "entry_x86_tls.h"

+#   else                 

+#      include "entry_x86_tsd.h"

+#   endif

+#elif defined(USE_X86_64_ASM) && defined(__GNUC__) && defined(GLX_USE_TLS)

+#   include "entry_x86-64_tls.h"

+#else

+

+#include <stdlib.h>

+

+static INLINE const struct mapi_table *

+entry_current_get(void)

+{

+#ifdef MAPI_MODE_BRIDGE

+   return GET_DISPATCH();

+#else

+   return u_current_get();

+#endif

+}

+

+/* C version of the public entries */

+#define MAPI_TMP_DEFINES

+#define MAPI_TMP_PUBLIC_DECLARES

+#define MAPI_TMP_PUBLIC_ENTRIES

+#include "mapi_tmp.h"

+

+#ifndef MAPI_MODE_BRIDGE

+

+void

+entry_patch_public(void)

+{

+}

+

+mapi_func

+entry_get_public(int slot)

+{

+   /* pubic_entries are defined by MAPI_TMP_PUBLIC_ENTRIES */

+   return public_entries[slot];

+}

+

+mapi_func

+entry_generate(int slot)

+{

+   return NULL;

+}

+

+void

+entry_patch(mapi_func entry, int slot)

+{

+}

+

+#endif /* MAPI_MODE_BRIDGE */

+

+#endif /* asm */