Merge remote-tracking branch 'tera/develop' into lwjgl3

# Conflicts: # engine/src/main/java/org/terasology/engine/subsystem/lwjgl/LwjglGraphics.java # engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java
MovingBlocks · Jun 8, 2020 · b377ec1 · b377ec1
2 parents 10f639b + ed19955
commit b377ec1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/engine/src/main/java/org/terasology/engine/subsystem/lwjgl/LwjglGraphics.java b/engine/src/main/java/org/terasology/engine/subsystem/lwjgl/LwjglGraphics.java
@@ -336,9 +336,6 @@ private void checkOpenGL() {
                 capabilities.OpenGL15,
                 capabilities.OpenGL20,
                 capabilities.OpenGL21,   // needed as we use GLSL 1.20
-                capabilities.OpenGL30,
-                capabilities.OpenGL32,
-                capabilities.OpenGL33,
 
                 capabilities.GL_ARB_framebuffer_object,  // Extensions eventually included in
                 capabilities.GL_ARB_texture_float,       // OpenGl 3.0 according to
@@ -349,9 +346,6 @@ private void checkOpenGL() {
                 "OpenGL15",
                 "OpenGL20",
                 "OpenGL21",
-                "OpenGL30",
-                "OpenGL32",
-                "OpenGL33",
                 "GL_ARB_framebuffer_object",
                 "GL_ARB_texture_float",
                 "GL_ARB_half_float_pixel"};

diff --git a/engine/src/main/java/org/terasology/particles/rendering/SpriteParticleRenderer.java b/engine/src/main/java/org/terasology/particles/rendering/SpriteParticleRenderer.java
@@ -20,6 +20,7 @@
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
+import org.lwjgl.opengl.GLContext;
 import org.terasology.engine.subsystem.DisplayDevice;
 import org.terasology.engine.subsystem.lwjgl.LwjglDisplayDevice;
 import org.terasology.entitySystem.systems.RegisterMode;
@@ -113,6 +114,9 @@ public void renderOpaque() {
 
     @Override
     public void renderAlphaBlend() {
+        if(!GLContext.getCapabilities().OpenGL33) {
+            return;
+        }
         PerspectiveCamera camera = (PerspectiveCamera) worldRenderer.getActiveCamera();
         Vector3f cameraPosition = camera.getPosition();
         Matrix4f viewProjection = new Matrix4f(camera.getViewProjectionMatrix())

diff --git a/engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java b/engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java
@@ -17,6 +17,7 @@
 
 import com.google.common.collect.Sets;
 import org.lwjgl.Version;
+import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
@@ -102,7 +103,11 @@ public void initShaders() {
         addShaderProgram("toneMapping");
         addShaderProgram("sky");
         addShaderProgram("chunk");
-        addShaderProgram("particle");
+        if (GL.createCapabilities().OpenGL33) { //TODO remove this "if" when rendering will use OpenGL3 by default
+            addShaderProgram("particle");
+        } else {
+            logger.warn("Your GPU or driver not supports OpenGL 3.3 , particles disabled");
+        }
         addShaderProgram("shadowMap");
         addShaderProgram("lightBufferPass");
         addShaderProgram("lightGeometryPass");