Get max core profile on OSX

JakubValtar · JakubValtar · commit eb7da6903b82 · 2015-08-14T19:27:36.000-04:00
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -1689,6 +1689,8 @@ protected static String[] preprocessFragmentSource(String[] fragSrc0,
       fragSrc[0] = "#version " + version;
       fragSrc[1] = "out vec4 fragColor;";
 
+      PApplet.printArray(fragSrc);
+
       return fragSrc;
     }
     return fragSrc0;
@@ -1714,6 +1716,8 @@ protected static String[] preprocessVertexSource(String[] vertSrc0,
       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
@@ -1240,7 +1240,7 @@ protected Object getDerivedFont(Object font, float size) {
 
   @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 @@ protected String[] loadVertexShader(String filename, int version) {
 
   @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 @@ protected String[] loadFragmentShader(String filename, int version) {
   @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 @@ protected String[] loadFragmentShader(URL url, int version) {
   @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
@@ -195,7 +195,11 @@ protected void initGL() {
     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);
         }
