diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-24 19:08:21 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-24 19:08:21 +0100 |
| commit | e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006 (patch) | |
| tree | 78608f77c6db3ff1e61a58008bd54d114f32352c /wgpu/src/shader/image.frag | |
| parent | 7cb1452d29ddfdcd29fd7ecc7c96a79ea2681fce (diff) | |
| parent | fd7d9622e333a0a2cd5c2e8e6cc38cc09d7981e4 (diff) | |
| download | iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.tar.gz iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.tar.bz2 iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.zip | |
Merge branch 'master' into feature/text-selection
Diffstat (limited to '')
| -rw-r--r-- | wgpu/src/shader/image.frag | 6 | ||||
| -rw-r--r-- | wgpu/src/shader/image.frag.spv | bin | 684 -> 684 bytes |
2 files changed, 3 insertions, 3 deletions
diff --git a/wgpu/src/shader/image.frag b/wgpu/src/shader/image.frag index e35e455a..2809e9e6 100644 --- a/wgpu/src/shader/image.frag +++ b/wgpu/src/shader/image.frag @@ -1,12 +1,12 @@ #version 450 -layout(location = 0) in vec2 v_Uv; +layout(location = 0) in vec3 v_Uv; layout(set = 0, binding = 1) uniform sampler u_Sampler; -layout(set = 1, binding = 0) uniform texture2D u_Texture; +layout(set = 1, binding = 0) uniform texture2DArray u_Texture; layout(location = 0) out vec4 o_Color; void main() { - o_Color = texture(sampler2D(u_Texture, u_Sampler), v_Uv); + o_Color = texture(sampler2DArray(u_Texture, u_Sampler), v_Uv); } diff --git a/wgpu/src/shader/image.frag.spv b/wgpu/src/shader/image.frag.spv Binary files differindex ebee82ac..65b08aa3 100644 --- a/wgpu/src/shader/image.frag.spv +++ b/wgpu/src/shader/image.frag.spv |