aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphil <[email protected]>2016-10-31 19:30:40 +1300
committerphil <[email protected]>2016-10-31 19:30:40 +1300
commit917d2938fd3f9bd1745a3a955bb55b5ca124f8e4 (patch)
treeaba8407cfbc65444e156b0903af1b06f1644300e
parentf054688c24cea7adfd4e5134575e1eec25c97d05 (diff)
Bug 1334 - Java 3D 1.6 under Parallels fails
j3dcore: avoid calls to glColor4f in material reset paths This causes crashes in the Parallels driver, possibly due to the calls occurring on a non-current glContext, this appears to not cause other issues as the glColor calls are always issued before rendering anyway and can avoid being reset here.
-rw-r--r--src/main/java/org/jogamp/java3d/JoglPipeline.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/jogamp/java3d/JoglPipeline.java b/src/main/java/org/jogamp/java3d/JoglPipeline.java
index 43eb579..d9cd032 100644
--- a/src/main/java/org/jogamp/java3d/JoglPipeline.java
+++ b/src/main/java/org/jogamp/java3d/JoglPipeline.java
@@ -6791,7 +6791,8 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
if (VERBOSE) System.err.println("JoglPipeline.updateMaterialColor()");
GL2 gl = context(ctx).getGL().getGL2();
- gl.glColor4f(r, g, b, a);
+ // FIXME: Removed call to glColor4f because of segfault issues in Parallels Desktop driver
+ // gl.glColor4f(r, g, b, a);
gl.glDisable(GL2.GL_LIGHTING);
}
@@ -7223,7 +7224,8 @@ void swapBuffers(Canvas3D cv, Context ctx, Drawable drawable) {
GL2 gl = context(ctx).getGL().getGL2();
if (!enableLight) {
- gl.glColor4f(r, g, b, a);
+ // FIXME: Removed call to glColor4f because of segfault issues in Parallels Desktop driver
+ // gl.glColor4f(r, g, b, a);
}
gl.glShadeModel(GL2.GL_SMOOTH);
}