summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils/shader
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-07-06 08:08:52 +0200
committerGitHub <noreply@github.com>2024-07-06 08:08:52 +0200
commit7b3ed85d171c156f895fdbaeff4d18572fc0f18e (patch)
tree0bbfeca0a796bdd6494548f9f161edbc7fb6b700 /src/main/java/at/hannibal2/skyhanni/utils/shader
parent34ba8c5fb8304e7b568822f8d3f675a0f133c6da (diff)
downloadskyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.tar.gz
skyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.tar.bz2
skyhanni-7b3ed85d171c156f895fdbaeff4d18572fc0f18e.zip
Backend: Fixed typos everywhere (#2175)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils/shader')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
index c110d6d6e..83e812149 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
@@ -66,7 +66,7 @@ abstract class Shader(val vertex: String, val fragment: String) {
ShaderHelper.glLinkProgram(shaderProgram)
- if (ShaderHelper.glGetProgrami(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) {
+ if (ShaderHelper.glGetProgramInt(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) {
val errorMessage = "Failed to link vertex shader $vertex and fragment shader $fragment. Features that " +
"utilise this shader will not work correctly, if at all"
val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderProgram, 1024))
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
index 89efd7d9f..1e8062500 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
@@ -82,11 +82,11 @@ class ShaderHelper {
) else GL20.glGetProgramInfoLog(program, maxLength)
}
- fun glGetProgrami(program: Int, pname: Int): Int {
+ fun glGetProgramInt(program: Int, pName: Int): Int {
return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(
program,
- pname
- ) else GL20.glGetProgrami(program, pname)
+ pName
+ ) else GL20.glGetProgrami(program, pName)
}
fun glUseProgram(program: Int) {
@@ -115,11 +115,11 @@ class ShaderHelper {
if (USING_ARB_SHADERS) ARBShaderObjects.glCompileShaderARB(shader) else GL20.glCompileShader(shader)
}
- fun glGetShaderi(shader: Int, pname: Int): Int {
+ fun glGetShaderInt(shader: Int, pName: Int): Int {
return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(
shader,
- pname
- ) else GL20.glGetShaderi(shader, pname)
+ pName
+ ) else GL20.glGetShaderi(shader, pName)
}
fun glGetShaderInfoLog(shader: Int, maxLength: Int): String {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
index 057e0a031..39a2fe302 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
@@ -71,7 +71,7 @@ object ShaderManager {
ShaderHelper.glShaderSource(shaderID, source.toString())
ShaderHelper.glCompileShader(shaderID)
- if (ShaderHelper.glGetShaderi(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) {
+ if (ShaderHelper.glGetShaderInt(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) {
val errorMessage = "Failed to compile shader $fileName${type.extension}. Features that utilise this " +
"shader will not work correctly, if at all"
val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderID, 1024))