<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Nov 12, 2015 at 3:17 PM, Brian Paul <span dir="ltr"><<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div>On 11/12/2015 04:03 PM, Nanley Chery wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
From: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com" target="_blank">nanley.g.chery@intel.com</a>><br>
<br>
Hopefully fixes the MSVC build error reported by Roland.<br>
<br>
Signed-off-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com" target="_blank">nanley.g.chery@intel.com</a>><br>
---<br>
<br>
I'm not sure why the array size being unknown is an issue. Please let<br>
me know if this fixes the build issue.<br>
<br>
src/mesa/main/extensions.c | 2 +-<br>
src/mesa/main/extensions.h | 17 ++++++++---------<br>
2 files changed, 9 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c<br>
index b81bcc5..83c9bff 100644<br>
--- a/src/mesa/main/extensions.c<br>
+++ b/src/mesa/main/extensions.c<br>
@@ -53,7 +53,7 @@ static char *cant_disable_extensions = NULL;<br>
/**<br>
* \brief Table of supported OpenGL extensions for all API's.<br>
*/<br>
-const struct mesa_extension _mesa_extension_table[] = {<br>
+const struct mesa_extension _mesa_extension_table[MESA_EXTENSION_COUNT] = {<br>
#define EXT(name_str, driver_cap, gll_ver, glc_ver, gles_ver, gles2_ver, yyyy) \<br>
{ .name = "GL_" #name_str, .offset = o(driver_cap), \<br>
.version = { \<br>
diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h<br>
index e4671be..ba47b68 100644<br>
--- a/src/mesa/main/extensions.h<br>
+++ b/src/mesa/main/extensions.h<br>
@@ -55,6 +55,13 @@ _mesa_get_extension_count(struct gl_context *ctx);<br>
extern const GLubyte *<br>
_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index);<br>
<br>
+/* Generate enums for the generated functions below */<br>
+enum {<br>
+#define EXT(name_str, ...) MESA_EXTENSION_##name_str,<br>
+#include "extensions_table.h"<br>
+#undef EXT<br>
+ MESA_EXTENSION_COUNT<br>
+};<br>
<br>
/**<br>
* \brief An element of the \c extension_table.<br>
@@ -75,15 +82,7 @@ struct mesa_extension {<br>
/** Year the extension was proposed or approved. Used to sort the<br>
* extension string chronologically. */<br>
uint16_t year;<br>
-} extern const _mesa_extension_table[];<br>
-<br>
-<br>
-/* Generate enums for the functions below */<br>
-enum {<br>
-#define EXT(name_str, ...) MESA_EXTENSION_##name_str,<br>
-#include "extensions_table.h"<br>
-#undef EXT<br>
-};<br>
+} extern const _mesa_extension_table[MESA_EXTENSION_COUNT];<br>
</blockquote>
<br></div></div>
The patch I posted which simply moves the extern array declaration to a separate statement fixes my MSVC build here.<span><font color="#888888"><br>
<br></font></span></blockquote><div><br></div><div>Thank you for fixing the build. Sorry for breaking it.<br><br></div><div>Regards,<br></div><div>Nanley<br></div><div> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span><font color="#888888">
-Brian<br>
<br>
</font></span></blockquote></div><br></div></div>