Skip to content

Commit

Permalink
Merge branch 'master' into sd/better-colorbuffer
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonDanisch authored Jul 21, 2023
2 parents 703efc5 + 7997b50 commit b612eba
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions GLMakie/src/GLAbstraction/GLTexture.jl
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ Colors from Colors.jl should mostly work as well
Texture(image::Array{T, NDim}; kw_args...) where {T <: GLArrayEltypes, NDim} =
Texture(pointer(image), size(image); kw_args...)::Texture{T, NDim}

Texture(image::AbstractArray{T, NDim}; kw_args...) where {T <: GLArrayEltypes, NDim} =
Texture(collect(image); kw_args...)

function Texture(s::ShaderAbstractions.Sampler{T, N}; kwargs...) where {T, N}
tex = Texture(
pointer(s.data), size(s.data),
Expand Down

0 comments on commit b612eba

Please sign in to comment.