studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add yoga double free minimization
Some checks reported errors
studiorailgun/Renderer/pipeline/head Something is wrong with the build of this commit
Details

Browse Source
This commit is contained in:
austin 2024-08-28 21:36:46 -04:00
parent bca1789457
commit fc4730c24a
11 changed files with 97 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/electrosphere/renderer/OpenGLState.java
View File

@ -6,6 +6,7 @@ import java.util.Map;
import org.joml.Vector2i;
import org.lwjgl.opengl.GL40;
import electrosphere.engine.Globals;
import electrosphere.renderer.shader.ShaderProgram;
/**
@ -179,6 +180,7 @@ public class OpenGLState {
if(DISABLE_CACHING || program != activeShader){
activeShader = program;
GL40.glUseProgram(activeShader.getShaderId());
Globals.renderingEngine.checkError();
renderPipelineState.setCurrentShaderPointer(activeShader.getShaderId());
}
}

8
src/main/java/electrosphere/renderer/light/LightManager.java
View File

@ -9,11 +9,13 @@ import org.joml.Vector3f;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL31;
import org.lwjgl.opengl.GL40;
import electrosphere.engine.Globals;
import electrosphere.entity.types.camera.CameraEntityUtils;
import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.OpenGLState;
import electrosphere.renderer.RenderingEngine;
import electrosphere.renderer.shader.ShaderProgram;
/**
@ -158,7 +160,11 @@ public class LightManager {
public void bindBuffer(OpenGLState openGLState){
//get position of lights object in shader
int bufferIndex = GL31.glGetUniformBlockIndex(openGLState.getActiveShader().getShaderId(), "Lights");
Globals.renderingEngine.checkError();
int glErrorCode = Globals.renderingEngine.getError();
//TODO: fix manually ignoring GL_INVALID_VALUE from call
if(glErrorCode != 0 && glErrorCode != GL40.GL_INVALID_VALUE){
LoggerInterface.loggerRenderer.DEBUG_LOOP(RenderingEngine.getErrorInEnglish(glErrorCode));
}
if(bufferIndex == ShaderProgram.INVALID_UNIFORM_NAME){
LoggerInterface.loggerRenderer.INFO("Tried to buffer light manager to shader that does not have it active.");
} else {

1
src/main/java/electrosphere/renderer/model/Mesh.java
View File

@ -365,7 +365,6 @@ public class Mesh {
selectedProgram = shader;
}
openGLState.setActiveShader(renderPipelineState, selectedProgram);
Globals.renderingEngine.checkError();
}
if(renderPipelineState.getUseLight()){

27
src/main/java/electrosphere/renderer/ui/elements/BitmapCharacter.java
View File

@ -7,6 +7,7 @@ import electrosphere.renderer.RenderPipelineState;
import electrosphere.renderer.model.Material;
import electrosphere.renderer.model.Model;
import electrosphere.renderer.ui.elementtypes.DrawableElement;
import electrosphere.renderer.ui.elementtypes.Element;
import electrosphere.renderer.ui.events.Event;
import electrosphere.renderer.ui.font.Font;
import org.joml.Vector3f;
@ -127,18 +128,20 @@ public class BitmapCharacter extends StandardElement implements DrawableElement
@Override
public void applyYoga(int parentX, int parentY) {
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
//apply the values to this component
this.internalPositionX = (int)leftRaw;
this.internalPositionY = (int)topRaw;
this.internalWidth = (int)Yoga.YGNodeLayoutGetWidth(yogaNode);
this.internalHeight = (int)Yoga.YGNodeLayoutGetHeight(yogaNode);
//calculate absolute values
if(!useAbsolutePosition){
this.absoluteX = parentX + internalPositionX;
this.absoluteY = parentY + internalPositionY;
if(this.yogaNode != Element.NULL_YOGA_ELEMENT){
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
//apply the values to this component
this.internalPositionX = (int)leftRaw;
this.internalPositionY = (int)topRaw;
this.internalWidth = (int)Yoga.YGNodeLayoutGetWidth(yogaNode);
this.internalHeight = (int)Yoga.YGNodeLayoutGetHeight(yogaNode);
//calculate absolute values
if(!useAbsolutePosition){
this.absoluteX = parentX + internalPositionX;
this.absoluteY = parentY + internalPositionY;
}
}
}

2
src/main/java/electrosphere/renderer/ui/elements/Label.java
View File

@ -76,7 +76,7 @@ public class Label extends StandardContainerElement implements DrawableElement {
void generateLetters(){
//free children
for(Element child : childList){
Yoga.YGNodeFree(child.getYogaNode());
child.destroy();
}
childList.clear();
int accumulatingWidth = 0;

46
src/main/java/electrosphere/renderer/ui/elements/StandardContainerElement.java
View File

@ -238,31 +238,35 @@ public class StandardContainerElement extends StandardElement implements Contain
for(Element child : childList){
child.destroy();
}
Yoga.YGNodeFree(this.yogaNode);
if(this.yogaNode != Element.NULL_YOGA_ELEMENT){
Yoga.YGNodeFree(this.yogaNode);
}
}
@Override
public void applyYoga(int parentX, int parentY) {
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
float widthRaw = Yoga.YGNodeLayoutGetWidth(yogaNode);
float heightRaw = Yoga.YGNodeLayoutGetHeight(yogaNode);
LoggerInterface.loggerUI.DEBUG("" + this);
LoggerInterface.loggerUI.DEBUG("pos(" + leftRaw + "," + topRaw + ") dim(" + widthRaw + "," + heightRaw + ")");
//apply the values to this component
if(!useAbsolutePosition){
this.internalPositionX = (int)leftRaw;
this.internalPositionY = (int)topRaw;
this.internalWidth = (int)widthRaw;
this.internalHeight = (int)heightRaw;
//calculate absolute values
this.absoluteX = parentX + internalPositionX;
this.absoluteY = parentY + internalPositionY;
}
//apply yoga values to all children
for(Element child : this.getChildren()){
child.applyYoga(parentX + internalPositionX,parentY + internalPositionY);
if(this.yogaNode != Element.NULL_YOGA_ELEMENT){
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
float widthRaw = Yoga.YGNodeLayoutGetWidth(yogaNode);
float heightRaw = Yoga.YGNodeLayoutGetHeight(yogaNode);
LoggerInterface.loggerUI.DEBUG("" + this);
LoggerInterface.loggerUI.DEBUG("pos(" + leftRaw + "," + topRaw + ") dim(" + widthRaw + "," + heightRaw + ")");
//apply the values to this component
if(!useAbsolutePosition){
this.internalPositionX = (int)leftRaw;
this.internalPositionY = (int)topRaw;
this.internalWidth = (int)widthRaw;
this.internalHeight = (int)heightRaw;
//calculate absolute values
this.absoluteX = parentX + internalPositionX;
this.absoluteY = parentY + internalPositionY;
}
//apply yoga values to all children
for(Element child : this.getChildren()){
child.applyYoga(parentX + internalPositionX,parentY + internalPositionY);
}
}
}

35
src/main/java/electrosphere/renderer/ui/elements/StandardElement.java
View File

@ -157,7 +157,10 @@ public class StandardElement implements Element {
@Override
public void destroy(){
Yoga.YGNodeFree(this.yogaNode);
if(this.yogaNode != Element.NULL_YOGA_ELEMENT){
Yoga.YGNodeFree(this.yogaNode);
this.yogaNode = Element.NULL_YOGA_ELEMENT;
}
}
@Override
@ -167,20 +170,22 @@ public class StandardElement implements Element {
@Override
public void applyYoga(int parentX, int parentY) {
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
float widthRaw = Yoga.YGNodeLayoutGetWidth(yogaNode);
float heightRaw = Yoga.YGNodeLayoutGetHeight(yogaNode);
if(!useAbsolutePosition){
//apply the values to this component
this.internalPositionX = (int)leftRaw;
this.internalPositionY = (int)topRaw;
this.internalWidth = (int)widthRaw;
this.internalHeight = (int)heightRaw;
//calculate absolute values
this.absoluteX = parentX + internalPositionX;
this.absoluteY = parentY + internalPositionY;
if(this.yogaNode != Element.NULL_YOGA_ELEMENT){
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
float widthRaw = Yoga.YGNodeLayoutGetWidth(yogaNode);
float heightRaw = Yoga.YGNodeLayoutGetHeight(yogaNode);
if(!useAbsolutePosition){
//apply the values to this component
this.internalPositionX = (int)leftRaw;
this.internalPositionY = (int)topRaw;
this.internalWidth = (int)widthRaw;
this.internalHeight = (int)heightRaw;
//calculate absolute values
this.absoluteX = parentX + internalPositionX;
this.absoluteY = parentY + internalPositionY;
}
}
}

4
src/main/java/electrosphere/renderer/ui/elements/TextBox.java
View File

@ -1,7 +1,5 @@
package electrosphere.renderer.ui.elements;
import org.lwjgl.util.yoga.Yoga;
import electrosphere.engine.Globals;
import electrosphere.renderer.OpenGLState;
import electrosphere.renderer.RenderPipelineState;
@ -110,7 +108,7 @@ public class TextBox extends StandardDrawableContainerElement {
void generateLetters(){
//free children
for(Element child : childList){
Yoga.YGNodeFree(child.getYogaNode());
child.destroy();
}
childList.clear();
String[] words = text.split(" ");

38
src/main/java/electrosphere/renderer/ui/elements/Window.java
View File

@ -355,24 +355,26 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme
@Override
public void applyYoga(int parentX, int parentY) {
Yoga.YGNodeStyleSetWidth(parentWindowYogaNode, Globals.WINDOW_WIDTH);
Yoga.YGNodeStyleSetHeight(parentWindowYogaNode, Globals.WINDOW_HEIGHT);
//calculate yoga layout
Yoga.YGNodeCalculateLayout(parentWindowYogaNode, width, height, Yoga.YGDirectionInherit);
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
float widthRaw = Yoga.YGNodeLayoutGetWidth(yogaNode);
float heightRaw = Yoga.YGNodeLayoutGetHeight(yogaNode);
// //apply the values to this component
this.positionX = (int)leftRaw;
this.positionY = (int)topRaw;
this.width = (int)widthRaw;
this.height = (int)heightRaw;
//apply yoga values to all children
LoggerInterface.loggerUI.DEBUG("==Apply yoga to windoow==");
for(Element child : this.getChildren()){
child.applyYoga(this.positionX,this.positionY);
if(this.yogaNode != Element.NULL_YOGA_ELEMENT){
Yoga.YGNodeStyleSetWidth(parentWindowYogaNode, Globals.WINDOW_WIDTH);
Yoga.YGNodeStyleSetHeight(parentWindowYogaNode, Globals.WINDOW_HEIGHT);
//calculate yoga layout
Yoga.YGNodeCalculateLayout(parentWindowYogaNode, width, height, Yoga.YGDirectionInherit);
//get the values from yoga
float leftRaw = Yoga.YGNodeLayoutGetLeft(yogaNode);
float topRaw = Yoga.YGNodeLayoutGetTop(yogaNode);
float widthRaw = Yoga.YGNodeLayoutGetWidth(yogaNode);
float heightRaw = Yoga.YGNodeLayoutGetHeight(yogaNode);
// //apply the values to this component
this.positionX = (int)leftRaw;
this.positionY = (int)topRaw;
this.width = (int)widthRaw;
this.height = (int)heightRaw;
//apply yoga values to all children
LoggerInterface.loggerUI.DEBUG("==Apply yoga to windoow==");
for(Element child : this.getChildren()){
child.applyYoga(this.positionX,this.positionY);
}
}
}

4
src/main/java/electrosphere/renderer/ui/elements/Word.java
View File

@ -1,7 +1,5 @@
package electrosphere.renderer.ui.elements;
import org.lwjgl.util.yoga.Yoga;
import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface;
import electrosphere.renderer.OpenGLState;
@ -88,7 +86,7 @@ public class Word extends StandardDrawableContainerElement {
void generateLetters(){
//free children
for(Element child : childList){
Yoga.YGNodeFree(child.getYogaNode());
child.destroy();
}
childList.clear();
for(int i = 0; i < text.length(); i++){

5
src/main/java/electrosphere/renderer/ui/elementtypes/Element.java
View File

@ -4,6 +4,11 @@ import electrosphere.renderer.ui.events.Event;
public interface Element {
/**
* A yoga element that either hasn't been created or has already been destroyed
*/
public static final int NULL_YOGA_ELEMENT = -1;
//width and height
public int getWidth();
public int getHeight();