From 56efb3c6e755ae1412c62255243e7bc6a39b5daf Mon Sep 17 00:00:00 2001
From: Jakub Valtar <jakub.valtar@gmail.com>
Date: Fri, 14 Aug 2015 19:27:36 -0400
Subject: [PATCH] Get max core profile on OSX

---
 core/src/processing/opengl/PGL.java          | 4 ++++
 core/src/processing/opengl/PJOGL.java        | 8 ++++----
 core/src/processing/opengl/PSurfaceJOGL.java | 6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
index c1bb0b087..ba3b65f60 100644
--- a/core/src/processing/opengl/PGL.java
+++ b/core/src/processing/opengl/PGL.java
@@ -1689,6 +1689,8 @@ public abstract class PGL {
       fragSrc[0] = "#version " + version;
       fragSrc[1] = "out vec4 fragColor;";
 
+      PApplet.printArray(fragSrc);
+
       return fragSrc;
     }
     return fragSrc0;
@@ -1714,6 +1716,8 @@ public abstract class PGL {
       String[] vertSrc = preprocessShaderSource(vertSrc0, search, replace, 1);
       vertSrc[0] = "#version " + version;
 
+      PApplet.printArray(vertSrc);
+
       return vertSrc;
     }
     return vertSrc0;
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
index 29651057b..f68230bb9 100644
--- a/core/src/processing/opengl/PJOGL.java
+++ b/core/src/processing/opengl/PJOGL.java
@@ -1240,7 +1240,7 @@ public class PJOGL extends PGL {
 
   @Override
   protected String[] loadVertexShader(String filename, int version) {
-    if (PApplet.platform == PConstants.MACOSX) {
+    if (PApplet.platform == PConstants.WINDOWS) {
       String[] fragSrc0 = pg.parent.loadStrings(filename);
       return preprocessFragmentSource(fragSrc0, 130);
     } else {
@@ -1251,7 +1251,7 @@ public class PJOGL extends PGL {
 
   @Override
   protected String[] loadFragmentShader(String filename, int version) {
-    if (PApplet.platform == PConstants.MACOSX) {
+    if (PApplet.platform == PConstants.WINDOWS) {
       String[] vertSrc0 = pg.parent.loadStrings(filename);
       return preprocessVertexSource(vertSrc0, 130);
     } else {
@@ -1263,7 +1263,7 @@ public class PJOGL extends PGL {
   @Override
   protected String[] loadFragmentShader(URL url, int version) {
     try {
-      if (PApplet.platform == PConstants.MACOSX) {
+      if (PApplet.platform == PConstants.WINDOWS) {
         String[] fragSrc0 = PApplet.loadStrings(url.openStream());
         return preprocessFragmentSource(fragSrc0, 130);
       } else {
@@ -1279,7 +1279,7 @@ public class PJOGL extends PGL {
   @Override
   protected String[] loadVertexShader(URL url, int version) {
     try {
-      if (PApplet.platform == PConstants.MACOSX) {
+      if (PApplet.platform == PConstants.WINDOWS) {
         String[] vertSrc0 = PApplet.loadStrings(url.openStream());
         return preprocessVertexSource(vertSrc0, 130);
       } else {
diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java
index cecfd0d0e..f9d7bbbd2 100644
--- a/core/src/processing/opengl/PSurfaceJOGL.java
+++ b/core/src/processing/opengl/PSurfaceJOGL.java
@@ -195,7 +195,11 @@ public class PSurfaceJOGL implements PSurface {
     if (profile == null) {
       if (PJOGL.profile == 2) {
         try {
-          profile = GLProfile.getGL2ES2();
+          if (PApplet.platform == PConstants.MACOSX) {
+            profile = GLProfile.getMaxProgrammableCore(true);
+          } else {
+            profile = GLProfile.getGL2ES2();
+          }
         } catch (GLException ex) {
           profile = GLProfile.getMaxProgrammable(true);
         }