diff options
| author | Julien Gouesse <[email protected]> | 2013-06-24 19:05:45 +0200 |
|---|---|---|
| committer | Julien Gouesse <[email protected]> | 2013-06-24 19:05:45 +0200 |
| commit | 54bf17ce5c591d10bc7a371567b042e5962a1cea (patch) | |
| tree | 6518c185a7d8f8d9a2e9a915d1dfc395b2f63038 | |
| parent | 1dbe6a9d1aec9240be294e0dca74df79377cfc05 (diff) | |
Requires OpenGL 3.1 to use draw instancing
| -rw-r--r-- | ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglContextCapabilities.java | 2 | ||||
| -rw-r--r-- | ardor3d-lwjgl/src/main/java/com/ardor3d/renderer/lwjgl/LwjglContextCapabilities.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglContextCapabilities.java b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglContextCapabilities.java index 036f9d3..3516e43 100644 --- a/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglContextCapabilities.java +++ b/ardor3d-jogl/src/main/java/com/ardor3d/renderer/jogl/JoglContextCapabilities.java @@ -76,7 +76,7 @@ public class JoglContextCapabilities extends ContextCapabilities { _geometryShader4Supported = gl.isExtensionAvailable("GL_ARB_geometry_shader4") && _glslSupported; _geometryInstancingSupported = gl.isExtensionAvailable("GL_EXT_draw_instanced") - || gl.isExtensionAvailable("GL_VERSION_3_0"); + || gl.isExtensionAvailable("GL_VERSION_3_1"); _tessellationShadersSupported = gl.isExtensionAvailable("GL_ARB_tessellation_shader") && _glslSupported; diff --git a/ardor3d-lwjgl/src/main/java/com/ardor3d/renderer/lwjgl/LwjglContextCapabilities.java b/ardor3d-lwjgl/src/main/java/com/ardor3d/renderer/lwjgl/LwjglContextCapabilities.java index 9855987..fcc3758 100644 --- a/ardor3d-lwjgl/src/main/java/com/ardor3d/renderer/lwjgl/LwjglContextCapabilities.java +++ b/ardor3d-lwjgl/src/main/java/com/ardor3d/renderer/lwjgl/LwjglContextCapabilities.java @@ -69,7 +69,7 @@ public class LwjglContextCapabilities extends ContextCapabilities { _geometryShader4Supported = caps.GL_ARB_geometry_shader4 && _glslSupported; - _geometryInstancingSupported = caps.GL_EXT_draw_instanced || caps.OpenGL30; + _geometryInstancingSupported = caps.GL_EXT_draw_instanced || caps.OpenGL31; if (_glslSupported) { GL11.glGetInteger(ARBVertexShader.GL_MAX_VERTEX_ATTRIBS_ARB, buf); |