Skip to content

Commit b4bfe36

Browse files
committed
Fix: Make getUniformLocation behaviour consistent
1 parent 8d27df4 commit b4bfe36

File tree

2 files changed

+12
-2
lines changed
  • kgl-ios/src/nativeMain/kotlin/com.danielgergely.kgl
  • kgl-lwjgl/src/main/kotlin/com/danielgergely/kgl

2 files changed

+12
-2
lines changed

kgl-ios/src/nativeMain/kotlin/com.danielgergely.kgl/KglIos.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,12 @@ object KglIos : Kgl {
123123
}
124124

125125
override fun getUniformLocation(programId: Program, name: String): UniformLocation? {
126-
return glGetUniformLocation(programId.toUInt(), name)
126+
val location = glGetUniformLocation(programId.toUInt(), name)
127+
return if (location < 0) {
128+
null
129+
} else {
130+
location
131+
}
127132
}
128133

129134
override fun getAttribLocation(programId: Program, name: String): Int {

kgl-lwjgl/src/main/kotlin/com/danielgergely/kgl/KglLwjgl.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,12 @@ object KglLwjgl : Kgl {
164164
}
165165

166166
override fun getUniformLocation(programId: Program, name: String): UniformLocation? {
167-
return GL.glGetUniformLocation(programId, name)
167+
val location = GL.glGetUniformLocation(programId, name)
168+
return if (location < 0) {
169+
null
170+
} else {
171+
location
172+
}
168173
}
169174

170175
override fun linkProgram(programId: Program) {

0 commit comments

Comments
 (0)