Commit Graph

474 Commits (f111c33cba9d9eee724f06698363700f939190ce)

Author SHA1 Message Date
TonalidadeHidrica 125353a710 Fix typo: know -> known 3 years ago
TonalidadeHidrica 083d8f0640 Fix typo: were -> where 3 years ago
rhysd 54121a5c54 fix some typos 3 years ago
Ben Hansen c0843b3f92 fixes #285 3 years ago
Ben Hansen 611b299072 missed multiview in tutorial3 3 years ago
Ben Hansen ef72161771 Merge branch 'master' of github.com:sotrh/learn-wgpu 3 years ago
Ben Hansen 4ae6c3f89f added 0.12.md and examples now compile 3 years ago
Ben Hansen 2073b0fbc1 updated to 0.12 3 years ago
Niklas Eicker 064a0a5efd Some small fixes for beginner tutorials 1 to 5 3 years ago
Marek Fajkus f0b3e72740
suggest clarification 3 years ago
Marek Fajkus 88209a1650
few more 3 years ago
Marek Fajkus 0c9236000a
few more fixes 3 years ago
Marek Fajkus 75c9d21fa0
more fixes 3 years ago
Marek Fajkus 7cb3cc9ddc
improve wording in beginner/tutorial2-surface 3 years ago
Josh015 110743247f Whoops 3 years ago
Josh015 a90a168280 Fixed flipped tex_coords in tutorial5-textures 3 years ago
sotrh aa204f2178
Merge pull request #266 from nxsy/cgmath-prelude-import
Add cgmath prelude import in tutorial 7
3 years ago
sotrh be7aa893d6
Merge pull request #267 from nxsy/tutorial9-rgba-as-reference
Provide explanation why rgba is no longer a reference
3 years ago
sotrh fc9d31f87c
Merge pull request #268 from nxsy/tutorial9-import-trait
Explain why model::Vertex needs to be imported in tutorial 9
3 years ago
Neil Blakey-Milner 85fa2ccea9 Simplify the bind_group flow in tutorial 9 3 years ago
Neil Blakey-Milner 0821b6fd9a Explain why model::Vertex needs to be imported in tutorial 9 3 years ago
Neil Blakey-Milner 02e99b66ab Provide explanation why rgba is no longer a reference 3 years ago
Neil Blakey-Milner f9cfd79d95 Add cgmath prelude import in tutorial 7 3 years ago
sotrh b0d9ac3245
Merge pull request #261 from Paulo-21/patch-1
Update docs.rs link to 0.11.0
3 years ago
Arif Driessen f0035b6b9b
Remove redundant 'NEW' comment from label
PipelineLayoutDescriptor already has its label set when we get to this point in the tutorial.

(It's set at docs/beginner/tutorial3-pipeline/README.md, line 154)
3 years ago
Arif Driessen 87c380517d
small typo 3 years ago
Pmimo d9ef1e241e
Update docs.rs link to 0.11.0 3 years ago
sotrh 75948417e7
Merge pull request #257 from FrankenApps/shader-entrypoints
Name shader entry points differently.
3 years ago
sotrh 667d7c16d9
Merge pull request #259 from arifd/master
Rust resolver 2 default in 2021 edition
3 years ago
sotrh d4f5429bbb
Merge pull request #256 from PhilipK/fix-typo-tutorial2
Fix typo in tutorial2-surface README.md
3 years ago
Arif Driessen 6042b6e821
Update README.md 3 years ago
Ferdinand Schäffler bd46bdb243 Converted docs. 3 years ago
Philip Kristoffersen f31af2d2cb
Fix typo in tutorial2-surface README.md
Add a missing "to"
3 years ago
Pmimo d26d61e4be
Update link to 0.11 docs.rs 3 years ago
laalsaas 297923e578
fix typo kronos to khronos 3 years ago
Ben Hansen e0e52584a6 fixed pong for 0.11 3 years ago
Ben Hansen 7cc67f5678 migrated to 0.11 3 years ago
sotrh e15fc946ac
Merge pull request #242 from PAUL-BERNARD/master
Fix some typos
3 years ago
sotrh b40fbb6121
Merge pull request #243 from chrisboyce/chrisboyce-tut2-fix
No "first()" method on Iterator
3 years ago
sotrh ff43b83a89
Merge pull request #244 from SuperSamus/master
model.rs: added "_bind_group" where appropriate
3 years ago
Spencer Imbleau 172a65ad72
Fixed typo: BackendBit::Primary is from a previous version 3 years ago
Martino Fontana 11b24cebc5 model.rs: added "_bind_group" where appropriate 3 years ago
Chris Boyce bb32dbdb52
No "first()" method on Iterator
As far as I can tell looking at the docs, there is no "first" method for the Iterator trait, but I believe "next" accomplishes getting the first item in this instance.
3 years ago
Paul BERNARD 1dad054540 typos 3 years ago
Fabian Kloiber 6546507acf Fix wording
Remove duplicate "the" and shuffle some words around
3 years ago
Fabian Kloiber 85857948bf Update field name `attachment`
In the section on `RenderPassColorAttachment` the text uses the old name `attachment` for the field which now is called `view`.
3 years ago
Fabian Kloiber da913a90af Update link to wgpu docs
Link to `wgpu::Limits` pointed to old version 0.7
3 years ago
Ben Hansen 778a7d907b fixed #239 3 years ago
Kuroki Keiichiro 29a084b1b1 Update an explaining comment for its code
The code has been updated for wgpu-0.10 (`wgpu::TextureUsage::SAMPLED`
-> `wgpu::TextureUsages::TEXTURE_BINDING`), but its comment was not
updated at the same time.
3 years ago
sotrh bba4376e34
Merge pull request #233 from rukai/env_logger
Add section on why env_logger is needed
3 years ago
sotrh c013b28f59
Merge pull request #234 from chrisboyce/master
Fixed mask field name in text
3 years ago
sotrh d63ab6f8d5
Merge pull request #237 from TheBlueFireFox/master
Fixed issue with code example was not ported to 0.10.x
3 years ago
sotrh 432077c7d0
Merge pull request #236 from schnippl0r/master
Fixed code snippet.
3 years ago
Adrian Hornung 6654cae15b Fixed issue with code example was not ported to 0.10.x 3 years ago
Mario Kilies e281746334 Fixed code example.
'instance' and 'adapter' are not defined (and not needed) in State.
3 years ago
Onirik79 651da2ff23
Updated a link to wgpu docs 3 years ago
Chris Boyce 1ab24facf2
Fixed mask field name in text 3 years ago
Lucas Kent f2c0f2aa3c Add section on why env_logger is needed 3 years ago
Ben Hansen a2285094c2 fixed #231 3 years ago
Ben Hansen 6d600965f4 some typos 3 years ago
sotrh 316c429d2f
Merge pull request #228 from VillSnow/patch-1
fix type name Camera to CameraUniform
3 years ago
Ben Hansen 5ddd876d4f Merge branch '0.10' 3 years ago
Ben Hansen 7c90669f89 migrated beginner tutorials 3 years ago
Ben Hansen 358ecb55af migrate tutorial5 docs 3 years ago
Ben Hansen c0754f9dd3 migrated tutorial5 3 years ago
Ben Hansen 57d7eb763f migrated tutorial4 3 years ago
Ben Hansen 0f618a2ff8 migrated tutorial3 3 years ago
Ben Hansen 012dff0de0 renamed tutorial2 3 years ago
Ben Hansen b322b8f6b8 reworked swapchain tutorial to use surface 3 years ago
VillSnow d13ba88020 fix type name Camera to CameraUniform 3 years ago
Ben Hansen 30c5693fb9 no more validation errors 3 years ago
Ben Hansen 822f2d6191 started 0.10 3 years ago
Onirik79 cd5c440cc1
minor typo 3 years ago
Martino Fontana 372082ae90 Rename "Uniform" to "Camera" in labels too 3 years ago
Martino Fontana b2b77294f6 Change "uniform" naming to "camera" 3 years ago
Norbert Pozar f467e54f7a Fix location syntax (GLSL -> WGSL)
Also outdated `VertexFormat` variants.
3 years ago
sotrh ed186bf229
Merge pull request #215 from rokonio/patch-3
Another tiny fix
3 years ago
sotrh 0b1adb463f
Merge pull request #217 from rokonio/patch-4
Fix on vert_attr_array
3 years ago
sotrh 59bc306c32
Merge pull request #214 from rokonio/patch-2
Found a typo
3 years ago
Sitong Peng 4211abcc12
your -> you'll 3 years ago
Rokonio aa5856fa91
Fix on vert_attr_array 3 years ago
Rokonio aadd2e67b6
Another tiny fix 3 years ago
Rokonio ab78dcf7a7
Found a typo 3 years ago
sotrh 1030f47529
Merge pull request #212 from rokonio/master
Fixing #200
3 years ago
sotrh 5a51bf47f9
Merge pull request #210 from SuperSamus/master
Miscellaneous improvements
3 years ago
Ben Hansen 58eca592c1 fixed #202 3 years ago
Rokonio 1c26da1757
Fixing #200 3 years ago
Epacnoss d9e6c4a326
Change Float3 to Float32 3 years ago
Martino Fontana 2941cf7cd9 Updated dependencies where I can just change the number (not "tobj" and "gif") ("compute" can't start a trace) (didn't touch "pong" and "imgui-demo") 3 years ago
Martino Fontana c55ea96d0d Removed unnecessary .clone() 3 years ago
Martino Fontana 467cec5367 Removed unnecessary borrows 3 years ago
Martino Fontana 2c811f43a4 Truncated excessive float precision 3 years ago
Martino Fontana c80b5a9ae2 Collapsed event_loop match 3 years ago
Martino Fontana b5af53b272 Simplify DrawModel and DrawLight lifetimes 3 years ago
Ben Hansen 12c7ba6de8 fixed #182 3 years ago
Ben Hansen 87c6fa9971 fixed #158 3 years ago
Joshua Barretto 12ba9bed0c Switched to pollster 3 years ago
Ben Hansen 0813fd03a4 Merge branch 'master' into 0.9 3 years ago
Rokonio 0f63cee02e
Update README.md
When the vertex class is updated, the `bytemuck`s trait were missing
3 years ago
Ben Hansen b5ce220c2b upgraded to 0.9 3 years ago
Ben Hansen c22808f17a fixed #162 3 years ago
Gwenhwyfar Hartshaw 55c9a7f44c
Add missing fields in PrimitiveState
The render pipeline page was missing the `clamp_depth` and `conservative` fields of the `wgpu::PrimitiveState` struct, added with wgpu 0.8.  These were correct in the full code, but not the snippets in the doc.
3 years ago
Ben Hansen 5f77f40ec1 fixes #191 3 years ago
Aevyrie 2eeffbb84a
Rename RenderPassDepthStencilAttachmentDescriptor
Rename RenderPassDepthStencilAttachmentDescriptor -> RenderPassDepthStencilAttachment

See: https://docs.rs/wgpu/0.8.1/wgpu/struct.RenderPassDepthStencilAttachment.html
3 years ago
Aevyrie e16efae327
Remove clamp_depth from DepthStencilState
clamp_depth no longer exists on DepthStencilState, and is instead only on PrimitiveState.
3 years ago
sotrh 0585ca5ca5
Merge pull request #188 from aevyrie/patch-2
wgpu 0.8 corrections
3 years ago
Aevyrie 5cd42e231c
Missing qualifier 3 years ago
Aevyrie adc729747b
Fix grammatical error 3 years ago
Aevyrie c9003caa9f
ImageDataLayout change 3 years ago
Aevyrie b8853689fe
wgpu 0.8 BlendState change 3 years ago
Aevyrie 382f12383e
Update README.md
Small typo.
3 years ago
sotrh dd7d48929f
Merge pull request #181 from al-tameemi/e6029cb
Updated the use of RenderPassColorAttachmentDescriptor to RenderPassColorAttachment
3 years ago
Hugo Woodiwiss 67c9246b2f
Updated tutorial to work with tobj 3.0.x 3 years ago
Mohammed Al-Tameemi 17ca6e5a3e Updated to the new color attachment method 3 years ago
nyx 7755e16a4b Changed wgpu version in example
Removed shaderc from example
3 years ago
Ben Hansen 2dd8d7bf82 fixes #176 3 years ago
Ben Hansen de57cdf4ea fixes #173 3 years ago
Ben Hansen b160f28d48 tutorials 6-9 migrated 3 years ago
Ben Hansen f1c7536668 migrated tutorial 4 and 5 3 years ago
Ben Hansen 68b563b8e6 updated tutorial3-pipeline docs 3 years ago
Ben Hansen 8e6e6e7092 fixed #174 3 years ago
Ben Hansen f3ebc0e666 fixed panic in tutorials 3 and 4 3 years ago
Ben Hansen 46eb5eb139 code now builds on 0.8 3 years ago
sotrh d8a861b515
Merge branch 'master' into cgmath-0.18 3 years ago
sotrh c5c3e907c7
Merge pull request #163 from segalll/master
Fix typos in beginner window tutorial
3 years ago
Hiroaki Yutani 24f565ee58 Update winit to 0.24 4 years ago
Henry Segal 18dff8f171
Fix typos 4 years ago
Hiroaki Yutani 1bb374c89e docs 4 years ago
Hiroaki Yutani 7293547212 Bump cgmath version 4 years ago
Sergii Penner 597c37b8b1
Fix typo
Fixed typo 'upc close' -> 'up close'.
4 years ago
sotrh 674312d3b2
Merge pull request #147 from yutannihilation/tutorial1-use
use winit:🪟:Window
4 years ago
sotrh d5ab40ade1
Merge pull request #151 from vigdail/patch-1
Tutorial 9. Texture::load() return type fix
4 years ago
sotrh 220366adcc
Merge pull request #152 from pop/edits/misc-typos
Misc typo and code fixes.
4 years ago
Chris 0926c253e5
Rename OUTPUT_ATTACHMENT to RENDER_ATTACHMENT 4 years ago
Elijah C. Voigt bcc79b5e41 Misc typo and code fixes.
009: impl Vertex for ModelVertex was using the vertex_attr_array! macro.
009: RenderPipelineDescriptor has a `vertex` member not  `vertex_state`.
009: to_rgba() should be to_rgba8(), to_rgba is set to be deprecated.

010: BindGroupDescriptor has a `entries` member not `bindings`.
010: Remove re-declaration of mat4 model_matrix;
010: Prefer hard-coded [#.#; #] instead of `Foo::fn().into()`.
010: Clarify which shader frag/vert file changes are in.

011: Change Model::load return type to Result<Self>.
011: TextureDescriptor does not have a array_layer_count member.

012: Add .into() to calls in Uniforms::update_view_proj().
012: Dereference delta variable in State::input().

013: Add more changed lines to Model::load to avoid compiler yelling.
4 years ago
vigdail 9f254cc794
Tutorial 9. Texture::load() return type fix 4 years ago
Hiroaki Yutani f0f1ec0e12 Fix module path 4 years ago
Hiroaki Yutani e5bea6e29f Move comment 4 years ago
sotrh 195945083b
Merge pull request #149 from yutannihilation/patch-7
Minor fixes on tutorial 6
4 years ago
Hiroaki Yutani b09302f23e Remove & from set_vertex_buffer() 4 years ago
Hiroaki Yutani 0da538190a
Minor fixes on tutorial 6 4 years ago
Hiroaki Yutani a13c43f6b2 use winit::Window; 4 years ago
Raphael Van Hoffelen 1699be127d
Fixed spelling mistake 4 years ago
Linden Krouse f6f6fa29c4
Fixed some spelling and grammar errors 4 years ago
sotrh a86a0cc7dc
Merge pull request #138 from dakizu/patch-1
Fix a broken link
4 years ago
[redacted] 3bd1534016
Fix a broken link
Existing link wasn't pointing to normals page.
4 years ago
Ben Hansen e3592e2809 migrated docs for tutorials 4-9 4 years ago
Ben Hansen e7318530d4 migrated docs for tutorials 1-3 and cargo fmt 4 years ago
Ben Hansen b4dd4654e4 intermediate tutorial code migrated 4 years ago
Ben Hansen 3901419a58 beginner tutorial code done 4 years ago
Ben Hansen 91879d405b code up to 7 migrated 4 years ago
Ben Hansen 47fd27669e migrated tutorials 1 and 2 4 years ago
Aleksey Halahan ad0515bdfb
Fix a type in the code example
Was missing the `slice` method
4 years ago
Ben Hansen 19c99e28d0 Merge branch 'master' of https://github.com/sotrh/learn-wgpu 4 years ago
Ben Hansen 1f9024691c shaderc 1.6 -> 0.7 4 years ago
Fisher Darling 5547528cf0
Fixed small typo in beginner/tutorial8-depth 4 years ago
Renato Caldas d44f216b14 Fix inconsistent position of the 'size' field in the beginner tutorials 4 years ago
Renato Caldas e61b939889 Remove stray field 'colour' from State 4 years ago
Renato Caldas 67635a5fad Fix typos in beginner tutorial 4 4 years ago
paq 6302a2372c
Fix syntax error in tutorial 6 4 years ago
DevJac 468807e8a3 Link to Cargo Book for more info about build scripts 4 years ago
Ben Hansen 733683cf6f removed camera research 4 years ago
Ben Hansen 99fd6523d7 travis build failing 4 years ago
sotrh 7b1a81ccfe
Merge pull request #123 from kanerogers/patch-4
Clarify changes to State struct
4 years ago
sotrh 68e06ea4a4
Merge pull request #125 from dannyfritz/patch-1
Texture: BufferInitDescriptor fields.
4 years ago
sotrh 039d840698
Merge pull request #124 from kanerogers/patch-6
Cleanup Textures tutorial
4 years ago
Danny Fritz 4cd5491921
Texture: BufferInitDescriptor fields. 4 years ago
Kane Rogers 21e455c668
Update to reflect sorth's suggestions
- Add `diffuse_texture` to `texture::Texture` in `State` at the end of the tutorial.
4 years ago
Kane Rogers 6b2a8c8dcc
Additional changes to Texture
1. The fields ` diffuse_texture`, `diffuse_texture_view` and `diffuse_sampler` are not used on `State` in this tutorial and should therefore not be added, so as not to unnecessarily confuse the reader.
2. The `anyhow` crate must be added to `Cargo.toml` in order for `texture.rs` to work.
4 years ago
Kane Rogers fbe39fc0e4
Cleanup Textures tutorial
I have broadly made two sets of changes:

1. General prose cleanup (eg. correcting minor syntax errors, rewriting some sentences to make them more clear)
2. Code consistency (eg. not making use of the `texture` wrapper until it is defined at the end of the page.
4 years ago
Ben Hansen e462670b72 migrated docs for tutorial7 4 years ago
Ben Hansen c770e1860f fixed code for #116 4 years ago
Kane Rogers b93a57d9b3
Clarify changes to State struct
Not a big one, just being explicit where the fields need to be updated on the struct.
4 years ago
Ben Hansen aa8f9f269d fixed #119 4 years ago
Ben Hansen 0620f0b05d migrated ModelVertex to use bytemuck derive 4 years ago
Ben Hansen 0ccb80e7e3 updated Uniforms struct to use bytemuck derive 4 years ago
Ben Hansen 5abaa16ac1 updated bytemuck to use derive as per #109 4 years ago
Ben Hansen 8ad575f750 finished #121 4 years ago
Samuel Hurel 936082fafc Minor changes 4 years ago
sotrh 8f5215963a
Merge pull request #113 from pudnax/link_typo
Fixed the link to zip file
4 years ago
Alex Komissarov c42e07bb7d
Clean probably missed stuff from '0.5 -> 0.6' 4 years ago
Alex Komissarov e5a5d6d66c
Fixed the link to zip file 4 years ago
Ben Hansen fb5c9fc8fe fixes #111 4 years ago
Ben Hansen 6f29ba738b fixes #108 4 years ago
sotrh 8e9ff17565
Merge pull request #103 from wozniak/patch-1
set_vertex_buffer doesn't expect a reference
4 years ago
sotrh 6fab63e809
Merge pull request #104 from kejor/tutorial5docs-missing-parameter-snippet
Add missing parameter on tutorial5 snippet
4 years ago
Kalle Huttunen 3396259576
Add note about the GLSL used 4 years ago
kejor 5572e36e0c
Adding missing parameter on tutorial5 snippet
Added parameter `&queue` to `texture::Texture::from_bytes` call.
4 years ago
matthew 64fa3c9017
more 4 years ago
matthew 6cb43e8e61
set_vertex_buffer doesn't expect a reference 4 years ago
Alan Kemp 909c2debfc DeviceExt is now in a util namespace 4 years ago
Rubick 5a45a9c5ce
Merge branch 'master' into master 4 years ago
sotrh 4377ca102f
Merge pull request #98 from kanerogers/patch-1
Add `use` statement for DeviceExt
4 years ago
sotrh c0e8174dbf
Merge pull request #99 from fraserli/master
Fix typos
4 years ago
sotrh cb06098bec
Merge pull request #100 from kunalarya/patch-1
Minor copy editing of instancing docs.
4 years ago
Alec Goncharow 836b38d827
Update README.md
minor typo fix, streen -> screen
4 years ago
Alec Goncharow 944a568eb9
Update README.md
655828f88f changed the name of the `vulkan` feature to `vulkan-portability`
4 years ago
kunalarya a7083eecee
Minor copy editing of instancing docs.
Thanks for writing this tutorial! It's been a very helpful resource! I made some very minor edits -- feel free to reject any of them :)
4 years ago
Fraser Li 071f4b3f4f
Fix typos 4 years ago
Kane Rogers 5f89b92651
Add `use` statement for DeviceExt
I tripped over this one while following along with the tutorial. I added a little link to extension traits as I'm aware the audience of this tutorial may not be familiar with them.

Please feel free to rewrite/throw out any of my copy as you see fit.  😄 

Thanks again for this phenomenal tutorial!
4 years ago