ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-11 16:49:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

fixed mpi-parallel visualization; added warning in mvdraw if running in parallel and direct rendering is enabled (which probably breaks parallel visualization)

Browse Source
This commit is contained in:
Lukas Kogler 2016-11-07 17:49:38 +01:00
parent 49aa2861d6
commit d778d9dcef
2 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/visualization/mvdraw.cpp
View File

@ -776,13 +776,16 @@ namespace netgen
{
string displname;
// Display * dpy = glXGetCurrentDisplay();
Display * dpy = glXGetCurrentDisplay();
GLXDrawable drawable = glXGetCurrentDrawable();
GLXContext ctx = glXGetCurrentContext();
GLXContextID xid = glXGetContextIDEXT (ctx);
displname = XDisplayName (0);
if( glXIsDirect ( dpy, ctx ) )
cout << "WARNING: direct rendering enabled; this might break mpi-parallel netgen (especially if X-forwarding is used! (to disable, change -indirect to true in ng/drawing.tcl)" << endl;
/*
cout << "Init Parallel GL" << endl;
cout << "DisplayName = " << displname << endl;

97
ng/parallelfunc.cpp
View File

@ -77,7 +77,6 @@ void ParallelRun()
while ( true )
{
message = MyMPI_RecvCmd();
if ( message.compare(0, 3, "ngs") == 0 )
{
// PrintMessage ( 1, "Starting NgSolve routine ", message ) ;
@ -138,7 +137,7 @@ void ParallelRun()
string redraw_cmd;
// MyMPI_Recv (redraw_cmd, 0, MPI_TAG_VIS);
redraw_cmd = MyMPI_RecvCmd();
// PrintMessage (1, "Redraw - ", redraw_cmd);
static string displname;
@ -147,17 +146,15 @@ void ParallelRun()
static Display * display = NULL;
static GLXContext context;
static XVisualInfo * visinfo = 0;
// if (!display)
if (redraw_cmd == "init")
{
MyMPI_Recv (displname, 0, MPI_TAG_VIS);
MyMPI_Recv (curDrawable, 0, MPI_TAG_VIS);
MyMPI_Recv (contextid, 0, MPI_TAG_VIS);
display = XOpenDisplay (displname.c_str());
display = XOpenDisplay (displname.c_str());
/*
PrintMessage (3, "displ - name = ", displname);
PrintMessage (3, "display = ", display,
@ -166,23 +163,26 @@ void ParallelRun()
" , h = ", XDisplayHeight (display, 0));
*/
Window win;
int wx, wy;
unsigned int ww, wh, bw, depth;
// cout << "got drawable: " << curDrawable << endl;
// Window win;
// int wx, wy;
// unsigned int ww, wh, bw, depth;
// cout << "got drawable: " << curDrawable << ", contextid: " << contextid << endl;
XGetGeometry(display, curDrawable, &win,
&wx, &wy, &ww, &wh,
&bw, &depth);
/*
cout << "P" << id << ": window-props: x = " << wx << ", y = " << wy
<< ", w = " << ww << ", h = " << wh << ", depth = " << depth << endl;
*/
// cout << "get geometriy..." << endl;
// XGetGeometry(display, curDrawable, &win,
// &wx, &wy, &ww, &wh,
// &bw, &depth);
// cout << "have!" << endl;
// cout << "P" << id << ": window-props: x = " << wx << ", y = " << wy
// << ", w = " << ww << ", h = " << wh << ", depth = " << depth << endl;
#define VISUAL
#ifdef VISUAL
#ifdef VISINFO_OLD
//this does not seem to work anymore (but might still be with togl1.7?)
// make a new GLXContext
// first, generate a visual (copied from togl)
@ -221,44 +221,66 @@ void ParallelRun()
attrib_list[attrib_count++] = GLX_DOUBLEBUFFER;
attrib_list[attrib_count++] = None;
{
int hi = 0;
std::cout << "min attribs = ";
while (attrib_list[hi] != None)
std::cout << attrib_list[hi++] << " ";
std::cout << std::endl;
}
cout << "choose visual!!" << endl;
visinfo = NULL;
visinfo = glXChooseVisual(display, 0,
attrib_list);
cout << "have vis?" << endl;
if (visinfo) {
/* found a GLX visual! */
// cout << "found VISINFO !!!" << endl;
cout << "found VISINFO !!!" << endl;
/*
int hi = 0;
std::cout << "attribs = ";
while (attrib_list[hi] != None)
int hi = 0;
std::cout << "attribs = ";
while (attrib_list[hi] != None)
std::cout << attrib_list[hi++] << " ";
std::cout << std::endl;
*/
std::cout << std::endl;
break;
}
}
if (!visinfo)
cerr << "no VISINFO found" << endl;
#else
//get all confs
int nconfs;
auto cptr = glXGetFBConfigs (display,0, &nconfs);
cout << "found " << nconfs << " valid confs " << endl;
Array<int> conf_ids(nconfs);
for(int k=0;k<nconfs;k++)
glXGetFBConfigAttrib(display, cptr[k], GLX_FBCONFIG_ID, &(conf_ids[k]));
//get drawable->FBConfig->visual and try with that
unsigned int d_fbc_id;
glXQueryDrawable( display, curDrawable, GLX_FBCONFIG_ID, &d_fbc_id);
GLXFBConfig d_fbc;
for(int k=0;k<nconfs;k++)
if(d_fbc_id==conf_ids[k])
d_fbc = cptr[k];
visinfo = glXGetVisualFromFBConfig(display,d_fbc);
#endif
// context = glXCreateContext( display, visinfo, 0, /* curContext, */ False );
context = glXCreateContext( display, visinfo, glXImportContextEXT ( display, contextid ), False);
// cout << "context = " << context << endl;
glXMakeCurrent (display, curDrawable, context);
#else
// try to get GLXcontext from the master.
// this needs an indirect context (BUT DOES NOT WORK ????)
context = glXImportContextEXT ( display, contextid );
PrintMessage (1, "GLX-contextid = " , contextid,
" imported context ", context);
//PrintMessage (1, "GLX-contextid = " , contextid,
// " imported context ", context);
glXMakeCurrent (display, curDrawable, context);
#endif
@ -283,7 +305,6 @@ void ParallelRun()
vsmesh.BuildFilledList (false);
}
if (redraw_cmd == "solsurfellist")
{
vssolution.DrawSurfaceElements();