<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fdfde1cab68a378ce11dab12ec75957f5f123771">https://github.com/macports/macports-ports/commit/fdfde1cab68a378ce11dab12ec75957f5f123771</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fdfde1cab68 mesa: peg at 17.x on < 10.7
</span>fdfde1cab68 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fdfde1cab68a378ce11dab12ec75957f5f123771
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Feb 4 09:43:09 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> mesa: peg at 17.x on < 10.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> newer versions of mesa are not building
</span><span style='display:block; white-space:pre;color:#404040;'> on older systems at present
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/62203
</span>---
x11/mesa/Portfile | 31 ++++++--
...cmds-Fix-a-typo-in-the-__APPLE__-codepath.patch | 29 ++++++++
...-missing-include-of-stddef.h-for-ptrdiff_.patch | 27 +++++++
...-Provide-requirements-of-_SET_DrawBuffers.patch | 60 ++++++++++++++++
...ith-size-differences-between-GLuint-and-G.patch | 82 ++++++++++++++++++++++
5 files changed, 223 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/Portfile b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e7495b9136..caa7df4f867 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,12 +48,6 @@ patchfiles \
</span> 0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
0002-Fall-back-on-clock_gettime-when-timespec_get-is-unav.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Older gcc fail to do -Werror=missing-prototypes correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/46827
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append no-missing-prototypes-error.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,6 +78,25 @@ compiler.blacklist gcc-3.3 gcc-4.0 gcc-4.2 llvm-gcc-4.2 {clang < 800}
</span>
platform darwin {
if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # versions > 17 do not presently compile on systems prior to 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 17.1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums sha1 2acc201e24ea67c5231074d6746a42a747228ed6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 43a9b758462316ad344ccdccf72d6d0ce295620e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9868932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this option does nothing in mesa 17.x and generates warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --enable-autotools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # overwrite previous patchfiles, and then add as needed below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://bugs.freedesktop.org/show_bug.cgi?id=89088
configure.env-append INDENT=cat
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,6 +137,12 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Older gcc fail to do -Werror=missing-prototypes correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/46827
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append no-missing-prototypes-error.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cppflags-delete -I${prefix}/include
variant python27 description {Use python 2.7} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch b/x11/mesa/files/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..67b8532f9f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c1c4c18a80bb36946b1596f14c0397d4fb029f6e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 17 Aug 2017 15:08:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/4] glxcmds: Fix a typo in the __APPLE__ codepath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+s/DummyContext/dummyContext/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Regressed-in: 5d9b50e596c9d81c37ce0844ae0f8c9da3f6bea6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/glx/glxcmds.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 290c86c6cd..44992f18cf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,7 +820,7 @@ glXSwapBuffers(Display * dpy, GLXDrawable drawable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GLX_USE_APPLEGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct glx_context * gc = __glXGetCurrentContext();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(gc != &DummyContext && apple_glx_is_current_drawable(dpy, gc->driContext, drawable)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(gc != &dummyContext && apple_glx_is_current_drawable(dpy, gc->driContext, drawable)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apple_glx_swap_buffers(gc->driContext);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __glXSendError(dpy, GLXBadCurrentWindow, 0, X_GLXSwapBuffers, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch b/x11/mesa/files/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6c403527e70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3c10f5eda8ce7586f86e5254c5994de5cf720e81 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 11 Feb 2015 12:32:56 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/4] glext.h: Add missing include of stddef.h for ptrdiff_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://www.khronos.org/bugzilla/show_bug.cgi?id=1345
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/GL/glext.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/GL/glext.h b/include/GL/glext.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b7f6119072..d8ae2016e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/GL/glext.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/GL/glext.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4670,6 +4670,7 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef GL_ARB_vertex_buffer_object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GL_ARB_vertex_buffer_object 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ptrdiff_t GLsizeiptrARB;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ptrdiff_t GLintptrARB;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GL_BUFFER_SIZE_ARB 0x8764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..524b67e295f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 73dd69f869cf60f2b1c9208f3e713cd30440f88c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 12 May 2014 16:30:26 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/4] applegl: Provide requirements of _SET_DrawBuffers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libmesa for remap.c. libmesa requires the C++ linker.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also need to arrange to call _mesa_init_remap_table() to initialize the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+remap table.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+XXX: There has to be a better way fixing this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@freedesktop.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/glx/Makefile.am | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/glx/apple/apple_glapi.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34600475d9..4b2b746816 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,10 @@ libglx_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ applegl_glx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS += apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libglx_la_LIBADD += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(builddir)/apple/libappleglx.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_builddir)/src/mesa/libmesa.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_WINDOWSDRI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4d19f7f6a3..849044bb8e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "main/glheader.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "main/remap.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glapi.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glapitable.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "main/dispatch.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +55,8 @@ static void _apple_glapi_create_table(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__applegl_api)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _mesa_init_remap_table();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __ogl_framework_api = _glapi_create_table_from_handle(apple_cgl_get_dl_handle(), "gl");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(__ogl_framework_api);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch b/x11/mesa/files/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f67186afe3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a7f5cb4bdda7cae3a592093f4783399d1e5b6fa4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 8 May 2016 00:47:10 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/4] mesa: Deal with size differences between GLuint and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLhandleARB in GetAttachedObjectsARB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Nicolai Hähnle <nhaehnle@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Matt Turner <mattst88@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Ian Romanick <idr@freedesktop.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Brian Paul <brianp@vmware.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mesa/main/shaderapi.c | 22 +++++++++++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 15 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6dd617be7e..7282435583 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -513,10 +513,12 @@ detach_shader_no_error(struct gl_context *ctx, GLuint program, GLuint shader)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Return list of shaders attached to shader program.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * \param objOut returns GLuint ids
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * \param handleOut returns GLhandleARB handles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GLsizei *count, GLuint *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLsizei *countOut, GLuint *objOut, GLhandleARB *handleOut)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct gl_shader_program *shProg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -531,14 +533,20 @@ get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (shProg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLuint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- obj[i] = shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (objOut) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ objOut[i] = shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (handleOut) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ handleOut[i] = (GLhandleARB) shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (countOut) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *countOut = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *count = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * glGetHandleARB() - return ID/name of currently bound shader program.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1575,7 +1583,7 @@ _mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLsizei * count, GLhandleARB * obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GET_CURRENT_CONTEXT(ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_attached_shaders(ctx, container, maxCount, count, obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_attached_shaders(ctx, (GLuint)container, maxCount, count, NULL, obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,7 +1592,7 @@ _mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLsizei *count, GLuint *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GET_CURRENT_CONTEXT(ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_attached_shaders(ctx, program, maxCount, count, obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_attached_shaders(ctx, program, maxCount, count, obj, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>