Attachment 500 Details for Bug 821 – fix-bug821-commit-de2662a.patch

[patch] fix-bug821-commit-de2662a.patch

fix-bug821-commit-de2662a.patch (text/plain), 1.69 KB, created by Xerxes Rånby on 2013-08-29 15:57:09 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Xerxes Rånby

Created: 2013-08-29 15:57:09 CEST

Size: 1.69 KB

patch

obsolete

>commit de2662aaf4c3f6ac3a8c7fba70d62a809f2bca50
>Author: Xerxes RÃ¥nby <xerxes@zafena.se>
>Date:   Thu Aug 29 15:02:50 2013 +0200
>
>    Fix Bug 821: GLProfile: computeProfileImpl GL4 & GL3 impl not valid for GL2ES2 profile.
>    
>    Signed-off-by: Xerxes RÃ¥nby <xerxes@zafena.se>
>
>diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
>index 51b8224..9e181cd 100644
>--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
>+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
>@@ -1891,21 +1891,11 @@ public class GLProfile {
>             final boolean gles2Available = hasGLES3Impl && ( esCtxUndef || GLContext.isGLES2Available(device, es2HardwareRasterizer) );
>             final boolean gles2HWAvailable = gles2Available && es2HardwareRasterizer[0] ;
>             if(hasGL234Impl) {
>-                if(GLContext.isGL4Available(device, isHardwareRasterizer)) {
>-                    if(!gles2HWAvailable || isHardwareRasterizer[0]) {
>-                        return GL4;
>-                    }
>-                }
>                 if(GLContext.isGL4bcAvailable(device, isHardwareRasterizer)) {
>                     if(!gles2HWAvailable || isHardwareRasterizer[0]) {
>                         return GL4bc;
>                     }
>                 }
>-                if(GLContext.isGL3Available(device, isHardwareRasterizer)) {
>-                    if(!gles2HWAvailable || isHardwareRasterizer[0]) {
>-                        return GL3;
>-                    }
>-                }
>                 if(GLContext.isGL3bcAvailable(device, isHardwareRasterizer)) {
>                     if(!gles2HWAvailable || isHardwareRasterizer[0]) {
>                         return GL3bc;

Actions: View | Diff

Attachments on bug 821: 498 | 499 | 500