From 2a08e83ca45789813879fd63b671c2b91c8f7084 Mon Sep 17 00:00:00 2001 From: JupiterRider <60042618+JupiterRider@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:56:50 +0100 Subject: [PATCH 1/2] Fix typo and data-types --- raylib/rlgl_cgo.go | 6 +++--- raylib/rlgl_purego.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/raylib/rlgl_cgo.go b/raylib/rlgl_cgo.go index af82f71..c39a2eb 100644 --- a/raylib/rlgl_cgo.go +++ b/raylib/rlgl_cgo.go @@ -9,7 +9,7 @@ import "C" import ( "unsafe" ) - +rlLoadComputeShaderProgram // SetMatrixProjection - Set a custom projection matrix (replaces internal projection matrix) func SetMatrixProjection(proj Matrix) { cproj := proj.cptr() @@ -668,9 +668,9 @@ func SetUniformSampler(locIndex int32, textureId uint32) { } // LoadComputeShaderProgram - -func LoadComputeShaderProgram(shaderID uint) uint { +func LoadComputeShaderProgram(shaderID uint32) uint32 { cshaderID := C.uint(shaderID) - return uint(C.rlLoadComputeShaderProgram(cshaderID)) + return uint32(C.rlLoadComputeShaderProgram(cshaderID)) } // ComputeShaderDispatch - Dispatch compute shader (equivalent to *draw* for graphics pilepine) diff --git a/raylib/rlgl_purego.go b/raylib/rlgl_purego.go index 1c168d6..ccb5029 100644 --- a/raylib/rlgl_purego.go +++ b/raylib/rlgl_purego.go @@ -108,7 +108,7 @@ var rlUnloadShaderProgram func(id uint32) var rlGetLocationUniform func(shaderId uint32, uniformName string) int32 var rlGetLocationAttrib func(shaderId uint32, attribName string) int32 var rlSetUniformSampler func(locIndex int32, textureId uint32) -var rlLoadComputeShaderProgram func(shaderID uint) uint +var rlLoadComputeShaderProgram func(shaderID uint32) uint32 var rlComputeShaderDispatch func(groupX uint32, groupY uint32, groupZ uint32) var rlLoadShaderBuffer func(size uint32, data unsafe.Pointer, usageHint int32) uint32 var rlUnloadShaderBuffer func(id uint32) @@ -233,7 +233,7 @@ func initRlglPurego() { purego.RegisterLibFunc(&rlLoadComputeShaderProgram, raylibDll, "rlLoadComputeShaderProgram") purego.RegisterLibFunc(&rlComputeShaderDispatch, raylibDll, "rlComputeShaderDispatch") purego.RegisterLibFunc(&rlLoadShaderBuffer, raylibDll, "rlLoadShaderBuffer") - purego.RegisterLibFunc(&rlUnloadShaderBuffer, "rlUnloadShaderBuffer") + purego.RegisterLibFunc(&rlUnloadShaderBuffer, raylibDll, "rlUnloadShaderBuffer") purego.RegisterLibFunc(&rlUpdateShaderBuffer, raylibDll, "rlUpdateShaderBuffer") purego.RegisterLibFunc(&rlBindShaderBuffer, raylibDll, "rlBindShaderBuffer") purego.RegisterLibFunc(&rlReadShaderBuffer, raylibDll, "rlReadShaderBuffer") @@ -772,7 +772,7 @@ func ComputeShaderDispatch(groupX uint32, groupY uint32, groupZ uint32) { // LoadShaderBuffer loads a shader storage buffer object (SSBO) func LoadShaderBuffer(size uint32, data unsafe.Pointer, usageHint int32) uint32 { - rlLoadShaderBuffer(size, data, usageHint) + return rlLoadShaderBuffer(size, data, usageHint) } // UnloadShaderBuffer - Unload shader storage buffer object (SSBO) From 3bc33ec8b7402f1de548de9767a5b4b199962ee0 Mon Sep 17 00:00:00 2001 From: JupiterRider <60042618+JupiterRider@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:58:33 +0100 Subject: [PATCH 2/2] Update rlgl_cgo.go --- raylib/rlgl_cgo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/raylib/rlgl_cgo.go b/raylib/rlgl_cgo.go index c39a2eb..15f0067 100644 --- a/raylib/rlgl_cgo.go +++ b/raylib/rlgl_cgo.go @@ -9,7 +9,7 @@ import "C" import ( "unsafe" ) -rlLoadComputeShaderProgram + // SetMatrixProjection - Set a custom projection matrix (replaces internal projection matrix) func SetMatrixProjection(proj Matrix) { cproj := proj.cptr()