[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.6-106-ge43a14c

Robin Cornelius robin.cornelius at gmail.com
Mon Nov 17 12:26:15 UTC 2008


The following commit has been merged in the master branch:
commit 8e572529dc8763137c22cba2b83b1df9d8a9c821
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Sun Nov 2 20:51:22 2008 +0000

    Fix compile if nvidia gl.h is present

diff --git a/debian/patches/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.patch b/debian/patches/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.patch
new file mode 100644
index 0000000..5991d90
--- /dev/null
+++ b/debian/patches/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.patch
@@ -0,0 +1,62 @@
+diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
+index 843bc79..42d24bc 100644
+--- a/indra/llrender/llgl.cpp
++++ b/indra/llrender/llgl.cpp
+@@ -252,6 +252,12 @@ PFNWGLSWAPINTERVALEXTPROC			wglSwapIntervalEXT = NULL;
+ PFNGLCOLORTABLEEXTPROC glColorTableEXT = NULL;
+ #endif // LL_LINUX
+ 
++#if LL_LINUX && defined(WINGDIAPI)
++PFNGLACTIVETEXTUREARBPROC	glActiveTextureARB=NULL;
++PFNGLCLIENTACTIVETEXTUREARBPROC	glClientActiveTextureARB=NULL;
++PFNGLDRAWRANGEELEMENTSPROC 	glDrawRangeElements=NULL;
++#endif
++
+ #endif
+ 
+ LLGLManager gGLManager;
+@@ -779,15 +785,21 @@ void LLGLManager::initExtensions()
+ 		glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGetFramebufferAttachmentParameterivEXT");
+ 		glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenerateMipmapEXT");
+ 	}
+-#if !LL_LINUX
+-	// This is expected to be a static symbol on Linux GL implementations
++#if !LL_LINUX || (LL_LINUX && defined(WINGDIAPI))
++	// This is expected to be a static symbol on Linux GL implementations, except if we use the nvidia headers
+ 	glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawRangeElements");
+ 	if (!glDrawRangeElements)
+ 	{
+ 		mGLMaxVertexRange = 0;
+ 		mGLMaxIndexRange = 0;
+ 	}
+-#endif // !LL_LINUX
++#endif //!LL_LINUX
++
++#if LL_LINUX && defined(WINGDIAPI)
++	glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glActiveTextureARB");
++	glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glClientActiveTextureARB");
++#endif
++
+ #if LL_LINUX
+ 	// On Linux we need to get glColorTableEXT dynamically.
+ 	if (mHasPalettedTextures)
+diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
+index f047262..9d04f1c 100644
+--- a/indra/llrender/llglheaders.h
++++ b/indra/llrender/llglheaders.h
+@@ -76,6 +76,15 @@
+ #undef Status
+ #endif // LL_LINUX && !LL_MESA_HEADLESS
+ 
++#if LL_LINUX && defined(WINGDIAPI)
++// WINGDIAPI gets set if we are using the linux nvidia gl.h header which needs the 
++// functions below setting up
++// Missing functions when using nvidia header
++extern PFNGLACTIVETEXTUREARBPROC	glActiveTextureARB;
++extern PFNGLCLIENTACTIVETEXTUREARBPROC	glClientActiveTextureARB;
++extern PFNGLDRAWRANGEELEMENTSPROC 	glDrawRangeElements;
++
++#endif
+ 
+ // GL_ARB_vertex_buffer_object
+ extern PFNGLBINDBUFFERARBPROC		glBindBufferARB;

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids



More information about the Pkg-games-commits mailing list