From 1873b8abad2ca82516c318e6681d90542ce1d5a1 Mon Sep 17 00:00:00 2001 From: austin Date: Mon, 2 Sep 2024 09:09:56 -0400 Subject: [PATCH] always run debug pipeline --- Jenkinsfile | 2 +- pom.xml | 2 +- .../java/electrosphere/renderer/framebuffer/Framebuffer.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5ef78421..5f4345e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,7 @@ pipeline { catchError { sh 'mvn test -P integration' } - sh 'if ! grep -q "Errors: 2" ./target/surefire-reports/*; then touch ./testsuccess; fi' + // sh 'if ! grep -q "Errors: 2" ./target/surefire-reports/*; then touch ./testsuccess; fi' } } } diff --git a/pom.xml b/pom.xml index 104d188f..8c0a4b74 100644 --- a/pom.xml +++ b/pom.xml @@ -447,7 +447,7 @@ maven-surefire-plugin 2.22.2 - -javaagent:./lwjglx-debug-1.0.0.jar=t;o=trace.log + -javaagent:./lwjglx-debug-1.0.0.jar=t;e=*GL40*;o=trace.log diff --git a/src/main/java/electrosphere/renderer/framebuffer/Framebuffer.java b/src/main/java/electrosphere/renderer/framebuffer/Framebuffer.java index c82ac968..2818103e 100644 --- a/src/main/java/electrosphere/renderer/framebuffer/Framebuffer.java +++ b/src/main/java/electrosphere/renderer/framebuffer/Framebuffer.java @@ -211,6 +211,7 @@ public class Framebuffer { throw new IllegalStateException("Trying to attach uninitialized image to frame buffer!"); } openGLState.glBindFramebuffer(GL40.GL_FRAMEBUFFER, this.framebufferPointer); + texture.bind(openGLState); //texture must be bound at least once so that the object is created prior to attaching to framebuffer GL40.glFramebufferTexture2D(GL40.GL_FRAMEBUFFER, GL40.GL_COLOR_ATTACHMENT0 + attachmentNum, GL40.GL_TEXTURE_2D, texture.getTexturePointer(), 0); Globals.renderingEngine.checkError(); openGLState.glBindFramebuffer(GL40.GL_FRAMEBUFFER, 0); @@ -224,6 +225,7 @@ public class Framebuffer { public void setDepthAttachment(OpenGLState openGLState, Texture depthTexture){ openGLState.glBindFramebuffer(GL40.GL_FRAMEBUFFER, this.framebufferPointer); this.depthTexture = depthTexture; + depthTexture.bind(openGLState); //texture must be bound at least once so that the object is created prior to attaching to framebuffer GL40.glFramebufferTexture2D(GL40.GL_FRAMEBUFFER, GL40.GL_DEPTH_ATTACHMENT, GL40.GL_TEXTURE_2D, depthTexture.getTexturePointer(), 0); Globals.renderingEngine.checkError(); openGLState.glBindFramebuffer(GL40.GL_FRAMEBUFFER, 0);