OpenGL modernization #66

publixsubfan · 2018-07-23T18:17:09Z

Modernizes the OpenGL API usage of GLVis. Highlights:

Prepare*() functions now load vertices into a gl3::GlDrawable container, which replaces the previously-defined display lists and wrap the vertex buffers to be provided to OpenGL
A gl3::GlBuilder object can be created from a gl3::GlDrawable to partially emulate fixed-function OpenGL calls and load the generated vertices into vertex buffers
Two OpenGL backends are defined: gl3::FFGLRenderer, for OpenGL implementations lacking shaders; and gl3::CoreGLRenderer, which uses shaders to draw vertex buffers
A gl3::MeshRenderer object accepts the GlDrawable objects to be rendered per-frame, and directs buffering operations, draw calls, and state changes to one of the two backend classes
To support native windows and modern OpenGL contexts on non-Linux platforms, X11 is replaced with SDL for window and event management, with operations on the application window and the event loop encapsulated by the SdlWindow class.

Miscellaneous improvements:

For print-to-PDF functionality, handle the parsing of transform feedback buffers ourselves; allows us to support printing in texture mode and for both OpenGL backends
Transparency for texture mode is supported by generating an alpha texture for the mesh values
Removed non-texture rendering mode, since both printing and transparency support textured rendering mode now
Text is printed to screen with a font atlas texture (hard dependency on FreeType)
Support building to a JavaScript library with Emscripten – requires MFEM to be built with Emscripten first
Various refactorings

PR	Author	Editor	Reviewers	Assignment	Approval	Merge
#66	@kanye-quest	@tzanio	@v-dobrev + @jakubcerveny + @jandrej + @camierjs	04/25/20	⌛due 06/29/20	⌛due 07/06/20

v-dobrev · 2020-11-23T05:26:49Z

One issue that is still outstanding: #66 (comment). @kanye-quest, do you have a specific reason for those changes? Unless I'm missing something, I think we need to revert back to the explicit synchronous window re-drawing.

publixsubfan · 2020-11-23T05:48:53Z

I can't actually remember why I made that change; I'll see if I can change the SendExposeEvent calls back to MyExpose.

v-dobrev · 2020-11-23T06:04:13Z

The window content is not dynamically updated while resizing the window. It will be nice to fix that.

v-dobrev · 2020-11-23T06:47:15Z

I can't actually remember why I made that change; I'll see if I can change the SendExposeEvent calls back to MyExpose.

Looking at the code of SendExposeEvent, I see that it's behavior is now quite different from what it used to be. Maybe renaming it to something like SingalExpose() or TriggerExpose() will be a better name. It looks like it triggers MyExpose calls directly from the SDL main loop (and between calls to the idle function and the glvis_command queue), so using it instead of MyExpose seems fine. It also triggers SDL_GL_SwapWindow which is probably necessary to actually update the window content?

publixsubfan · 2020-11-23T17:55:09Z

If I understand correctly, the main issue is that when a screenshot is requested via a character key sequence, we only want the commands up to that point to be executed and displayed; but with SendExposeEvent, MyExpose is only called after the entire character key sequence is processed.

I think we can achieve this asynchronously by exiting out of the event loop in SdlWindow early if a screenshot command has been queued. Then the MyExpose command, window swap, and Screenshot will be executed immediately.

publixsubfan · 2020-11-30T18:52:22Z

@v-dobrev, I made some changes to switch from SendExposeEvent() back to MyExpose() for the stuff in threads.cpp and glvis.cpp.

The original reason I changed it to SendExposeEvent() was because the back-to-front buffer swap was only called in the SDL window loop. With the new changes, calling MyExpose() will signal to the SdlWindow that the back buffer needs to be swapped in on the next iteration of the event loop. Screenshot() has been modified to be able to capture either the back or the front buffer: if the back buffer has been updated but not yet swapped in, the image data is pulled from the back buffer; if no swap is pending, the image data is pulled from the front buffer.

tzanio · 2020-12-01T02:17:50Z

Thanks for the hi-res icon, @kanye-quest!

v-dobrev · 2020-12-01T04:11:39Z

@v-dobrev, I made some changes to switch from SendExposeEvent() back to MyExpose() for the stuff in threads.cpp and glvis.cpp.

The original reason I changed it to SendExposeEvent() was because the back-to-front buffer swap was only called in the SDL window loop. With the new changes, calling MyExpose() will signal to the SdlWindow that the back buffer needs to be swapped in on the next iteration of the event loop. Screenshot() has been modified to be able to capture either the back or the front buffer: if the back buffer has been updated but not yet swapped in, the image data is pulled from the back buffer; if no swap is pending, the image data is pulled from the front buffer.

Is there a reason not to do the swap inside MyExpose? At that point the back buffer has the full image and the swap should be fast. This will also simplify the logic in a few places.

GLVis is idle -- only for X11, for now, with placeholders for Cocoa on Mac. When using non-X11 subsystem, use SDL_WaitEvent() in the event loop instead of generating pauses with SDL_WaitEventTimeout(). In this case the GLVis communication thread will "wake up" the main thread by sending it a user-defined SDL event. Re-enable the screensaver since SDL disables it by default. When using the X11 subsystem, disable the XInput extension events since they are generated even outside the GLVis window.

publixsubfan · 2020-12-03T05:16:18Z

lib/sdl_mac.m

+void GLVis_Cocoa_WaitEvent()
+{ @autoreleasepool
+{
+   [NSApp nextEventMatchingMask:NSEventMaskAny


tzanio · 2020-12-03T15:33:20Z

@v-dobrev and @kanye-quest -- are we all set for merging today from your perspective?

publixsubfan · 2020-12-03T19:06:02Z

lib/sdl.cpp

+{
+   SDL_Event e;
+   static bool useIdle = false;
+   if (SDL_PollEvent(&e))


@v-dobrev, I think we need to go back to while (SDL_PollEvent(&e)) here - there's noticeable response lag introduced when moving with mouse on a remote X11 connection to LC.

I don't think this should block today's merge though.

termi-official · 2020-12-03T20:16:53Z

Hi @v-dobrev ,

with commit fc9276b the broke build for me on OpenSUSE and current MFEM master.

In file included from /home/termi/Repos/glvis/lib/sdl.cpp:15:
In file included from /home/termi/Repos/glvis/lib/visual.hpp:17:
In file included from /home/termi/Repos/glvis/lib/vsdata.hpp:18:
In file included from /home/termi/builds/mfem/mfem.hpp:3:
In file included from /home/termi/Repos/mfem/mfem.hpp:18:
In file included from /home/termi/Repos/mfem/general/device.hpp:15:
In file included from /home/termi/Repos/mfem/general/globals.hpp:19:
In file included from /home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/mpi.h:2693:
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/mpicxx.h:177:3: error: declaration of
      anonymous class must be a definition
  class Status;
  ^
In file included from /home/termi/Repos/glvis/lib/sdl.cpp:15:
In file included from /home/termi/Repos/glvis/lib/visual.hpp:17:
In file included from /home/termi/Repos/glvis/lib/vsdata.hpp:18:
In file included from /home/termi/builds/mfem/mfem.hpp:3:
In file included from /home/termi/Repos/mfem/mfem.hpp:18:
In file included from /home/termi/Repos/mfem/general/device.hpp:15:
In file included from /home/termi/Repos/mfem/general/globals.hpp:19:
In file included from /home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/mpi.h:2693:
In file included from /home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/mpicxx.h:219:
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/status.h:24:1: error: declaration of
      anonymous class must be a definition
class Status {
^
In file included from /home/termi/Repos/glvis/lib/sdl.cpp:15:
In file included from /home/termi/Repos/glvis/lib/visual.hpp:17:
In file included from /home/termi/Repos/glvis/lib/vsdata.hpp:18:
In file included from /home/termi/builds/mfem/mfem.hpp:3:
In file included from /home/termi/Repos/mfem/mfem.hpp:18:
In file included from /home/termi/Repos/mfem/general/device.hpp:15:
In file included from /home/termi/Repos/mfem/general/globals.hpp:19:
In file included from /home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/mpi.h:2693:
In file included from /home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/mpicxx.h:224:
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:166:11: error: expected
      unqualified-id
            MPI::Status& status);
                 ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:166:6: error: expected
      parameter declarator
            MPI::Status& status);
            ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:166:11: error: expected ')'
            MPI::Status& status);
                 ^
/usr/include/X11/Xlib.h:83:16: note: expanded from macro 'Status'
#define Status int
               ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:165:12: note: to match this
      '('
  void Read(void* buf, int count, const MPI::Datatype& datatype,
           ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:165:8: error: class member
      cannot be redeclared
  void Read(void* buf, int count, const MPI::Datatype& datatype,
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:163:8: note: previous
      declaration is here
  void Read(void* buf, int count, const MPI::Datatype& datatype);
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:171:8: error: expected
      unqualified-id
                MPI::Status& status);
                     ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:171:3: error: expected
      parameter declarator
                MPI::Status& status);
                ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:171:8: error: expected ')'
                MPI::Status& status);
                     ^
/usr/include/X11/Xlib.h:83:16: note: expanded from macro 'Status'
#define Status int
               ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:170:16: note: to match this
      '('
  void Read_all(void* buf, int count, const MPI::Datatype& datatype,
               ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:170:8: error: class member
      cannot be redeclared
  void Read_all(void* buf, int count, const MPI::Datatype& datatype,
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:168:8: note: previous
      declaration is here
  void Read_all(void* buf, int count, const MPI::Datatype& datatype);
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:178:37: error: expected
      unqualified-id
  void Read_all_end(void* buf, MPI::Status& status);
                                    ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:178:32: error: expected
      parameter declarator
  void Read_all_end(void* buf, MPI::Status& status);
                               ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:178:37: error: expected ')'
  void Read_all_end(void* buf, MPI::Status& status);
                                    ^
/usr/include/X11/Xlib.h:83:16: note: expanded from macro 'Status'
#define Status int
               ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:178:20: note: to match this
      '('
  void Read_all_end(void* buf, MPI::Status& status);
                   ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:178:8: error: class member
      cannot be redeclared
  void Read_all_end(void* buf, MPI::Status& status);
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:176:8: note: previous
      declaration is here
  void Read_all_end(void* buf);
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:184:45: error: expected
      unqualified-id
               const MPI::Datatype& datatype, MPI::Status& status);
                                                   ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:184:40: error: expected
      parameter declarator
               const MPI::Datatype& datatype, MPI::Status& status);
                                              ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:184:45: error: expected ')'
               const MPI::Datatype& datatype, MPI::Status& status);
                                                   ^
/usr/include/X11/Xlib.h:83:16: note: expanded from macro 'Status'
#define Status int
               ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:183:15: note: to match this
      '('
  void Read_at(MPI::Offset offset, void* buf, int count,
              ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:183:8: error: class member
      cannot be redeclared
  void Read_at(MPI::Offset offset, void* buf, int count,
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:180:8: note: previous
      declaration is here
  void Read_at(MPI::Offset offset,
       ^
/home/termi/Repos/spack/opt/spack/linux-opensuse_leap15-zen/clang-8.0.0/openmpi-3.1.4-6esuakacee44dvnr3af32nhn5auvqufg/include/openmpi/ompi/mpi/cxx/file.h:190:42: error: expected
      unqualified-id
                   const MPI::Datatype& datatype, MPI::Status& status);
                                                       ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.

I think this error is due to

fc9276b#diff-65fa73f3701f40e95286291d439656a479415073bf5cb2bcb81c80e19d9b235bR16-R24 pulling in some X11 macros.

until the queue is empty or another type event is processed. This helps improve mouse-drag lag over remote ssh connections.

psocratis · 2020-12-03T22:36:29Z

The latest pull seems to be working fine for me too

publixsubfan added 30 commits May 18, 2018 15:45

Initial commit

ec2b67b

Add texture coordinate support to vertex buffer

fe5383f

XQuartz + OpenGL is still on 1.4, thanks Apple

a1a3e01

Changes to makefile

186b768

Add LoopLineBuffer, attempts at fixing glGenBuffers

61f699a

Fixes for smooth shading

2cd74a4

Initial SDL modifications

506a617

Begin replacing auxKeyFunc calls, remove unused code

15ba073

Finish moving to SDL key bindings

b19ec5b

More SDL refactor changes+bugfixes

769e008

Fix multiple expose event bug

2b2a4ba

Purge ARB stuff, enable resizing

b760005

Added a line builder shim, makefile changes

7d336d4

Fix an incomplete rename, bugfixes

59d5660

Fix quit keybind, shift+key actions

693096c

Convert border list to vbo

67d2161

Fix antialiasing

8704df6

Create new TextBuffer class

67246b8

Let VertexBuffer hold data for all derived types

3c97bc7

convert axeslist to VBO + some vertex buffer bugfixes

82fdc25

Copyright messages

c3beb2d

Attempts to squash axes display bug

3ac1cf2

Try 2d texture coordinates

51c7880

Fix VBO corruption issue

feb9473

Fix coordinate axes generation

51cc95c

Refactor cutting plane call list to VBO

f949cf3

Use textures to render text

80e442f

Generate all palette textures ahead of time

f0a9c3a

Fix color buffer bug, hack for testing shift+1

0fb4d43

Initial shader implementation

0b7a197

Fix std::isalpha segfaulting on some platforms

c80a979

Synchronous event handling fixes

a545dd7

Add high-res icon

9f2df22

v-dobrev and others added 4 commits December 2, 2020 12:37

make style

a885c2a

Reduce cpu usage on non-X11 window managers

fdf140d

On Mac, avoid using CPU cycles when GLVis is idle.

22d2729

publixsubfan commented Dec 3, 2020

View reviewed changes

tzanio and others added 2 commits December 3, 2020 07:33

make style

e9617d4

Move platform-specific code behind abstract interface

31987fe

publixsubfan commented Dec 3, 2020

View reviewed changes

Build fix for x11 systems

8740324

publixsubfan and others added 2 commits December 3, 2020 12:26

Prune unneeded headers

8fe6bdd

In the SDL event loop, keep processing mouse motion events

1921b39

until the queue is empty or another type event is processed. This helps improve mouse-drag lag over remote ssh connections.

v-dobrev approved these changes Dec 3, 2020

View reviewed changes

fix emscripten build

077f4f8

publixsubfan merged commit 60f3761 into master Dec 3, 2020

tzanio deleted the upstream/modern-ogl-dev branch December 3, 2020 23:37

v-dobrev mentioned this pull request Dec 4, 2020

Building issue with MFEM built with MPI support on Linux #120

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OpenGL modernization #66

OpenGL modernization #66

publixsubfan commented Jul 23, 2018 •

edited by tzanio

Loading

v-dobrev commented Nov 23, 2020

publixsubfan commented Nov 23, 2020

v-dobrev commented Nov 23, 2020

v-dobrev commented Nov 23, 2020

publixsubfan commented Nov 23, 2020

publixsubfan commented Nov 30, 2020

tzanio commented Dec 1, 2020

v-dobrev commented Dec 1, 2020

publixsubfan Dec 3, 2020

tzanio commented Dec 3, 2020

publixsubfan Dec 3, 2020

publixsubfan Dec 3, 2020

termi-official commented Dec 3, 2020

psocratis commented Dec 3, 2020

OpenGL modernization #66

OpenGL modernization #66

Conversation

publixsubfan commented Jul 23, 2018 • edited by tzanio Loading

v-dobrev commented Nov 23, 2020

publixsubfan commented Nov 23, 2020

v-dobrev commented Nov 23, 2020

v-dobrev commented Nov 23, 2020

publixsubfan commented Nov 23, 2020

publixsubfan commented Nov 30, 2020

tzanio commented Dec 1, 2020

v-dobrev commented Dec 1, 2020

publixsubfan Dec 3, 2020

Choose a reason for hiding this comment

tzanio commented Dec 3, 2020

publixsubfan Dec 3, 2020

Choose a reason for hiding this comment

publixsubfan Dec 3, 2020

Choose a reason for hiding this comment

termi-official commented Dec 3, 2020

psocratis commented Dec 3, 2020

publixsubfan commented Jul 23, 2018 •

edited by tzanio

Loading