Attachment 161576 Details for Bug 203455 – glclock.diff

[patch] glclock.diff

glclock.diff (text/plain), 2.96 KB, created by Walter Schwarzenfeld on 2015-09-30 15:48:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2015-09-30 15:48:41 UTC

Size: 2.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 398221)
>+++ Makefile	(working copy)
>@@ -10,8 +10,6 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	OpenGL spinning pocket watch demo and benchmark utility
> 
>-BROKEN=		fails to link
>-
> USE_XORG=	xi xmu xext x11
> USE_GL=		gl glu glut
> MAKEFILE=	makefile
>Index: files/patch-GLextensions_cpp
>===================================================================
>--- files/patch-GLextensions_cpp	(revision 0)
>+++ files/patch-GLextensions_cpp	(working copy)
>@@ -0,0 +1,38 @@
>+--- GLextensions.cpp.orig	2015-09-27 12:58:19 UTC
>++++ GLextensions.cpp
>+@@ -57,7 +57,7 @@ PFNGLBINDTEXTUREEXTPROC				glBindTexture
>+ PFNGLISTEXTUREEXTPROC				glIsTextureEXT      = NULL ;
>+ 
>+ // EXT_polygon_offset
>+-PFNGLPOLYGONOFFSETEXTPROC			glPolygonOffsetEXT  = NULL ;
>++PFNGLPOLYGONOFFSETEXTPROC			glPolygonOffset  = NULL ;
>+ 
>+ #endif	// #if defined(WIN32) && !defined(MESA)
>+ 
>+@@ -1083,7 +1083,7 @@ char *IsSupported_texture_object(int fla
>+ #ifdef GL_EXT_polygon_offset
>+ 	if (has_EXT_polygon_offset)
>+ 	{
>+-		glPolygonOffsetEXT(units, bias) ;
>++		glPolygonOffset(units, bias) ;
>+ 		glEnable(GL_POLYGON_OFFSET_EXT) ;
>+ 
>+ 		glGetFloatv(GL_POLYGON_OFFSET_FACTOR_EXT, &facter) ;
>+@@ -1102,13 +1102,13 @@ int IsSupported_EXT_polygon_offset()
>+ 
>+ 	// Get proc address (WGL only)
>+ #if defined(WIN32) && !defined(MESA)
>+-	if (!(glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)wglGetProcAddress("glPolygonOffsetEXT")) &&
>+-		!(glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)OpenGLDLLCtrl::openGLDLLCtrl.GetProcAddress("glPolygonOffsetEXT")) &&		// ¾å¤Ç¼èÆÀ¤Ç¤¤Ê¤«¤Ã¤¿¤È¤¤Ï¡¢DLL ¤«¤é¥¤¥ó¥Ý¡¼¥È¡ÊMesa DLL ÍÑ¡Ë
>+-		!(glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)OpenGLDLLCtrl::openGLDLLCtrl.GetProcAddress("_glPolygonOffsetEXT@8")))	// ¾å¤Ç¼èÆÀ¤Ç¤¤Ê¤«¤Ã¤¿¤È¤¤Ï¡¢DLL ¤«¤é¥¤¥ó¥Ý¡¼¥È¡ÊMesa DLL ÍÑ¡Ë
>++	if (!(glPolygonOffset = (PFNGLPOLYGONOFFSETEXTPROC)wglGetProcAddress("glPolygonOffset")) &&
>++		!(glPolygonOffset = (PFNGLPOLYGONOFFSETEXTPROC)OpenGLDLLCtrl::openGLDLLCtrl.GetProcAddress("glPolygonOffset")) &&		// ¾å¤Ç¼èÆÀ¤Ç¤¤Ê¤«¤Ã¤¿¤È¤¤Ï¡¢DLL ¤«¤é¥¤¥ó¥Ý¡¼¥È¡ÊMesa DLL ÍÑ¡Ë
>++		!(glPolygonOffset = (PFNGLPOLYGONOFFSETEXTPROC)OpenGLDLLCtrl::openGLDLLCtrl.GetProcAddress("_glPolygonOffset@8")))	// ¾å¤Ç¼èÆÀ¤Ç¤¤Ê¤«¤Ã¤¿¤È¤¤Ï¡¢DLL ¤«¤é¥¤¥ó¥Ý¡¼¥È¡ÊMesa DLL ÍÑ¡Ë
>+ 		return FALSE ;
>+ #endif	// #if defined(WIN32) && !defined(MESA)
>+ 
>+-	p_glPolygonOffset = glPolygonOffsetEXT ;
>++	p_glPolygonOffset = glPolygonOffset ;
>+ 
>+ 	DEF_GL_POLYGON_OFFSET_POINT  = GL_POLYGON_OFFSET_EXT ;	// EXT_polygon_offset ¤Ç¤Ï¡¢¤¹¤Ù¤Æ¶¦ÄÌ¡ÊÍ¸ú¤Ê¤Î¤Ï FILL ¤Î¤ß¡©¡Ë
>+ 	DEF_GL_POLYGON_OFFSET_LINE   = GL_POLYGON_OFFSET_EXT ;
>
>Property changes on: files/patch-GLextensions_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 203455: 161576