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

accidentally changed to indirect rendering - reverted that. formatting

Browse Source
This commit is contained in:
Lukas Kogler 2016-11-08 13:01:40 +01:00
parent 37e0e17919
commit 9890e74429
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng/drawing.tcl
View File

@ -21,7 +21,7 @@ puts "togl-version : $toglversion"
set toglok 0 set toglok 0
if { [Ng_GetToglVersion] == 2 } { if { [Ng_GetToglVersion] == 2 } {
# Togl 2.x # Togl 2.x
if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create init -display draw -reshape reshape }] } { if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect false -create init -display draw -reshape reshape }] } {
puts "no OpenGL" puts "no OpenGL"
} { } {
# puts "have Togl 2.1" # puts "have Togl 2.1"
@ -29,7 +29,7 @@ if { [Ng_GetToglVersion] == 2 } {
} }
} { } {
# Togl 1.7 # Togl 1.7
if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect true }] } { if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect false }] } {
puts "no OpenGL" puts "no OpenGL"
} { } {
# puts "have Togl 1.7" # puts "have Togl 1.7"

19
ng/parallelfunc.cpp
View File

@ -138,7 +138,7 @@ void ParallelRun()
string redraw_cmd; string redraw_cmd;
// MyMPI_Recv (redraw_cmd, 0, MPI_TAG_VIS); // MyMPI_Recv (redraw_cmd, 0, MPI_TAG_VIS);
redraw_cmd = MyMPI_RecvCmd(); redraw_cmd = MyMPI_RecvCmd();
// PrintMessage (1, "Redraw - ", redraw_cmd); // PrintMessage (1, "Redraw - ", redraw_cmd);
static string displname; static string displname;
@ -147,16 +147,17 @@ void ParallelRun()
static Display * display = NULL; static Display * display = NULL;
static GLXContext context; static GLXContext context;
static XVisualInfo * visinfo = 0; static XVisualInfo * visinfo = 0;
// if (!display) // if (!display)
if (redraw_cmd == "init") if (redraw_cmd == "init")
{ {
MyMPI_Recv (displname, 0, MPI_TAG_VIS); MyMPI_Recv (displname, 0, MPI_TAG_VIS);
MyMPI_Recv (curDrawable, 0, MPI_TAG_VIS); MyMPI_Recv (curDrawable, 0, MPI_TAG_VIS);
MyMPI_Recv (contextid, 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, "displ - name = ", displname);
PrintMessage (3, "display = ", display, PrintMessage (3, "display = ", display,
@ -179,8 +180,8 @@ void ParallelRun()
cout << "P" << id << ": window-props: x = " << wx << ", y = " << wy cout << "P" << id << ": window-props: x = " << wx << ", y = " << wy
<< ", w = " << ww << ", h = " << wh << ", depth = " << depth << endl; << ", w = " << ww << ", h = " << wh << ", depth = " << depth << endl;
*/ */
#define VISUAL #define VISUAL
#ifdef VISUAL #ifdef VISUAL
@ -269,20 +270,22 @@ void ParallelRun()
// context = glXCreateContext( display, visinfo, 0, /* curContext, */ False ); // context = glXCreateContext( display, visinfo, 0, /* curContext, */ False );
context = glXCreateContext( display, visinfo, glXImportContextEXT ( display, contextid ), False); context = glXCreateContext( display, visinfo, glXImportContextEXT ( display, contextid ), False);
glXMakeCurrent (display, curDrawable, context); glXMakeCurrent (display, curDrawable, context);
#else #else
// try to get GLXcontext from the master. // try to get GLXcontext from the master.
// this needs an indirect context (BUT DOES NOT WORK ????) // this needs an indirect context (BUT DOES NOT WORK ????)
context = glXImportContextEXT ( display, contextid ); context = glXImportContextEXT ( display, contextid );
//PrintMessage (1, "GLX-contextid = " , contextid, PrintMessage (1, "GLX-contextid = " , contextid,
// " imported context ", context); " imported context ", context);
glXMakeCurrent (display, curDrawable, context); glXMakeCurrent (display, curDrawable, context);
#endif #endif
// PrintMessage (1, "redraw - init complete"); // PrintMessage (1, "redraw - init complete");
} }
if (redraw_cmd == "broadcast") if (redraw_cmd == "broadcast")
{ {