From 08eeac7f3eafae35b485786624861f8a5e6a93ae Mon Sep 17 00:00:00 2001 From: jtsiomb Date: Sun, 17 Nov 2019 13:41:44 +0000 Subject: [PATCH 1/2] removed completed items off the todo list, and corrected html errors git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1862 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/web-src/freeglut-style.css | 5 +++++ freeglut/web-src/progress.php | 20 ++------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/freeglut/web-src/freeglut-style.css b/freeglut/web-src/freeglut-style.css index 64c0ed3..564adfd 100644 --- a/freeglut/web-src/freeglut-style.css +++ b/freeglut/web-src/freeglut-style.css @@ -113,3 +113,8 @@ h3 { border-bottom: 1px #111166 solid ; width: 100%; } + +th, td { + border-bottom: 1px solid #aaa; + vertical-align: top; +} diff --git a/freeglut/web-src/progress.php b/freeglut/web-src/progress.php index e717d3d..999091d 100644 --- a/freeglut/web-src/progress.php +++ b/freeglut/web-src/progress.php @@ -21,7 +21,7 @@ mailing list to discuss your plans, and get cracking!

FeatureStatusMilestone Android portBasic but complete functionality by Sylvain -Beucler, but there are todo +Beucler, but there are todo pointsBasic functionality as is now done: 3.0. Future enhancements: 3.0 or later. @@ -30,10 +30,6 @@ by Vinnie Simonetti.Basic functionality as is now done: 3.0. Future enhancements: 3.0 or later. -callbacks with closuresHave versions of each callback -that take an additional void* that is passed back to the user upon -invocation.3.2 - Windows 8 touch supportWindows 8 replaced how touch input works, so we need to implement support for that.3.2 @@ -42,10 +38,6 @@ currently does not. Unfinished effort to implement here.3.0 or later. -GL2+ and GLES 1/2 clean API for geometryDone for all (geometry like -cube, cone, etc, as well as the teapot and other parts of the -teaset)3.0 - handling non-western script input to windowsFor Windows, see associated github @@ -73,7 +65,7 @@ awareness for his work.Figure this out for 3.2 stroke fonts, we can use a similar approach as for the shapes, should thus be straightforward. For the bitmap fonts, this is more complex. John T suggested "using a glyph atlas texture with GL_STREAM_DRAW VBOs", -which would get us somewhere. Code could be ripped from his libdrawtext libraryThe sooner the better, but will have to wait for asap after 3.0. @@ -83,21 +75,14 @@ like SDL.Currently CMake variables define at compile time which of the two the library will be compiled against. No work has been done to move this to an at-runtime API.After 3.0 -Code reorganized such that platform-specific and display -server-specific code are decoupledDone, thanks John -Fay!3.0 - Position callbackDone: we now have a position callback to notify the client when the position of the window changed.3.0 - Carbon/Cocoa portNot started. As Carbon is legacy, one might want to port to Cocoa first or even forget about Carbon all together.Undecided -Wayland portNot started.Undecided - Unicode supportNot started, we'd need to discuss this carefully on the mailing list first to minimize impact on the API.Undecided @@ -111,6 +96,5 @@ specific display formats on at least one of the various window servers (Windows, X11 and Android/BlackBerry 10/EGL at the moment).Undecided -

From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 From: jtsiomb Date: Fri, 21 Feb 2020 22:25:31 +0000 Subject: [PATCH 2/2] Work-around for an issue which cropped up with the release of gcc-10. In their infinite wisdom, they decided to build with -fno-common as default from now on, breaking every piece of C code which used to declare common symbols in header files, as was the convention since the dawn of time. We now have to duplicate all declarations to an arbitrary source file, and change the header-file ones to prefix them with extern. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1863 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c index 38b0acb..54b4285 100644 --- a/freeglut/freeglut/src/fg_gl2.c +++ b/freeglut/freeglut/src/fg_gl2.c @@ -27,6 +27,20 @@ #include "fg_internal.h" #include "fg_gl2.h" +#ifndef GL_ES_VERSION_2_0 +/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed + * names are defined in fg_gl2.h header to reference them, for any other case, + * define them as function pointers here. + */ +FGH_PFNGLGENBUFFERSPROC fghGenBuffers; +FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; +FGH_PFNGLBINDBUFFERPROC fghBindBuffer; +FGH_PFNGLBUFFERDATAPROC fghBufferData; +FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; +FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; +FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; +#endif + void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { if (fgStructure.CurrentWindow != NULL) fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h index ab8ba5c..fb3d467 100644 --- a/freeglut/freeglut/src/fg_gl2.h +++ b/freeglut/freeglut/src/fg_gl2.h @@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -FGH_PFNGLBUFFERDATAPROC fghBufferData; -FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; +extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; +extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; +extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; +extern FGH_PFNGLBUFFERDATAPROC fghBufferData; +extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; +extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; +extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; # endif