Skip to content

Commit 1d2ba9e

Browse files
committed
Fixup for 1.12
1 parent dde3cc4 commit 1d2ba9e

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NeuralGraphicsGL"
22
uuid = "263f7e6d-e369-49af-a86e-c85638573b76"
33
authors = ["Anton Smirnov <[email protected]>"]
4-
version = "0.4.0"
4+
version = "0.5.0"
55

66
[deps]
77
CImGui = "5d785b6c-b76f-510e-a07c-3070796c7e87"
@@ -14,7 +14,7 @@ ModernGL = "66fc600b-dfda-50eb-8b99-91cfa97b1301"
1414
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1515

1616
[compat]
17-
CImGui = "2.3"
17+
CImGui = "6"
1818
GLFW = "3.4"
1919
FileIO = "1.16"
2020
ImageCore = "0.10"

src/shader.jl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
struct Shader
22
id::UInt32
33
end
4-
5-
function Shader(type::UInt32, code::String)
6-
Shader(compile_shader(type, code))
7-
end
4+
Shader(type::UInt32, code::String) = Shader(compile_shader(type, code))
85

96
function compile_shader(type::UInt32, code::String)
107
id = @gl_check(glCreateShader(type))
118
id == 0 && error("Failed to create shader of type: $type")
129

13-
raw_code = pointer([convert(Ptr{UInt8}, pointer(code))])
14-
raw_code = convert(Ptr{UInt8}, raw_code)
10+
raw_code = Ref{Ptr{UInt8}}(pointer(code))
1511
@gl_check(glShaderSource(id, 1, raw_code, C_NULL))
16-
1712
@gl_check(glCompileShader(id))
1813
validate_shader(id)
19-
20-
id
14+
return id
2115
end
2216

2317
delete!(s::Shader) = @gl_check(glDeleteShader(s.id))

0 commit comments

Comments
 (0)