diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-25 20:25:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:33:18 +0000 |
| commit | 482d7ce61b423600b41b459eb26a2cc221cd0acf (patch) | |
| tree | 8da6edb8200889d93f0b344e61ed779c037a590f /external/epoxy/epoxy.windows.api.patch | |
| parent | Don't leave WW8AnchorConvResult::m_bConverted uninitialized (diff) | |
| download | core-482d7ce61b423600b41b459eb26a2cc221cd0acf.tar.gz core-482d7ce61b423600b41b459eb26a2cc221cd0acf.zip | |
change from glew to epoxy
because that works under wayland out of the box and gtk3 uses it already
Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/epoxy/epoxy.windows.api.patch')
| -rw-r--r-- | external/epoxy/epoxy.windows.api.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/external/epoxy/epoxy.windows.api.patch b/external/epoxy/epoxy.windows.api.patch new file mode 100644 index 000000000000..12d2afb6a6ad --- /dev/null +++ b/external/epoxy/epoxy.windows.api.patch @@ -0,0 +1,90 @@ +--- include/epoxy/gl.h ++++ include/epoxy/gl.h +@@ -59,7 +59,8 @@ + + #else + #ifndef APIENTRY +-#define APIENTRY __stdcall ++#define WINAPI __stdcall ++#define APIENTRY WINAPI + #endif + + #ifndef GLAPIENTRY +--- src/egl_generated_dispatch.c ++++ src/egl_generated_dispatch.c +@@ -128,7 +128,11 @@ + }; + + #if USING_DISPATCH_TABLE ++#if defined (_MSC_VER) ++static __inline struct dispatch_table * ++#else + static inline struct dispatch_table * ++#endif + get_dispatch_table(void); + + #endif +@@ -1642,7 +1646,11 @@ + uint32_t egl_tls_index; + uint32_t egl_tls_size = sizeof(struct dispatch_table); + ++#if defined (_MSC_VER) ++static __inline struct dispatch_table * ++#else + static inline struct dispatch_table * ++#endif + get_dispatch_table(void) + { + return TlsGetValue(egl_tls_index); +--- src/gl_generated_dispatch.c ++++ src/gl_generated_dispatch.c +@@ -3122,7 +3122,11 @@ + }; + + #if USING_DISPATCH_TABLE ++#if defined (_MSC_VER) ++static __inline struct dispatch_table * ++#else + static inline struct dispatch_table * ++#endif + get_dispatch_table(void); + + #endif +@@ -51507,7 +51511,11 @@ + uint32_t gl_tls_index; + uint32_t gl_tls_size = sizeof(struct dispatch_table); + ++#if defined (_MSC_VER) ++static __inline struct dispatch_table * ++#else + static inline struct dispatch_table * ++#endif + get_dispatch_table(void) + { + return TlsGetValue(gl_tls_index); +--- src/wgl_generated_dispatch.c ++++ src/wgl_generated_dispatch.c +@@ -157,7 +157,11 @@ + }; + + #if USING_DISPATCH_TABLE ++#if defined (_MSC_VER) ++static __inline struct dispatch_table * ++#else + static inline struct dispatch_table * ++#endif + get_dispatch_table(void); + + #endif +@@ -1701,7 +1705,11 @@ + uint32_t wgl_tls_index; + uint32_t wgl_tls_size = sizeof(struct dispatch_table); + ++#if defined (_MSC_VER) ++static __inline struct dispatch_table * ++#else + static inline struct dispatch_table * ++#endif + get_dispatch_table(void) + { + return TlsGetValue(wgl_tls_index); |