Skip to content
Merged

Glow #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
770e82c
Add glow dependency
iceiix Jan 6, 2020
c11aa7a
Create the glow context
iceiix Jan 6, 2020
52157dd
Revert "Create the glow context"
iceiix Jan 6, 2020
cdeae8b
Merge branch 'master' into glow; cargo update
iceiix Jan 6, 2020
157be48
Initialize glow in src/gl/mod.rs
iceiix Jan 6, 2020
137e5db
Call gl methods on glow context
iceiix Jan 6, 2020
adc86b0
glow uses camelcase
iceiix Jan 6, 2020
14a65dd
Import glow::HasContext trait, finds draw_elements etc.
iceiix Jan 6, 2020
83ebc44
Fix mismatched types, glow uses Option and &str instead of raw pointers
iceiix Jan 6, 2020
ed17a08
Fix uniform_location, glow already returns Some(u32)
iceiix Jan 6, 2020
c6295bb
uniform_location: convert i32 to u32 for Uniform
iceiix Jan 6, 2020
f8c9cb6
Cast to i32 instead of TryInto (51 errors)
iceiix Jan 6, 2020
145d5cb
Fix attribute_location (49 errors)
iceiix Jan 6, 2020
c27cdc8
Fix shader creation Result u32 type (48)
iceiix Jan 6, 2020
bbc7db4
Fix passing GLvoid and 2d/3d, down to 40 errors
iceiix Jan 6, 2020
8f8ee71
Fix missing Options type mismatches (38)
iceiix Jan 6, 2020
9ce92a9
Offsets are i32 in glow, not GLvoid (36)
iceiix Jan 6, 2020
188993f
Fix clear_buffer using _f32_slice (35)
iceiix Jan 6, 2020
4dbe2b2
Delete methods are singular not plural (35, still type mismatched)
iceiix Jan 6, 2020
34630c0
glBufferData -> buffer_data_u8_slice
iceiix Jan 6, 2020
7c9cb3c
buffer_sub_data_u8_slice
iceiix Jan 6, 2020
0db120e
Update more glow method wrapper names found by reviewing glow native …
iceiix Jan 6, 2020
2fa7485
Found two more, tex_sub_image_2d/3d(_u8_slice) (20)
iceiix Jan 6, 2020
6d8d80e
Remove unused multi_draw_elements, can be replaced by draw_elements i…
iceiix Jan 7, 2020
547af64
glow implements glMapBufferRange
iceiix Jan 7, 2020
5d14a43
Remove unused read_buffer (17)
iceiix Jan 7, 2020
1bdd087
Comment out glRenderbufferStorageMultisample for now (16)
iceiix Jan 7, 2020
112f452
glow's deletes automatically pass 1 and take no reference (12)
iceiix Jan 7, 2020
382a6c4
shader_source() accepts &str directly; removes last of std::ptr
iceiix Jan 7, 2020
863c987
Pass uniform Option<u32> (5)
iceiix Jan 7, 2020
d85b73f
Fix bool passing normalized parameter (4)
iceiix Jan 7, 2020
2c9dea3
Fix draw_buffers parameter (3)
iceiix Jan 7, 2020
1dcd2f7
Comment out broken calls to uniform_4_f32_slice for now, to expose ot…
iceiix Jan 7, 2020
e60a5a8
Stop returning context from gl::init, unnecessary (3)
iceiix Jan 7, 2020
cd6c0ab
Getting shader info is unsafe (2)
iceiix Jan 7, 2020
2113a37
Unwrapping static mut is unsafe (1)
iceiix Jan 7, 2020
479360e
Use unsafe raw pointers for global mutable context
iceiix Jan 7, 2020
f076d93
Merge branch 'master' into glow
iceiix Jan 8, 2020
f2b8167
Fix initializing GL objects wrappers from glow wrappers
iceiix Jan 9, 2020
e31a4f0
Merge branch 'master' into glow
iceiix Jan 9, 2020
6fb133d
Merge branch 'master' into glow
iceiix Jan 11, 2020
84b877d
Unbinding framebuffers should use None, as it is an Option (although …
iceiix Jan 11, 2020
ffd7022
Log image_3d parameters: image_3d level=0, width=1024, height=1024, d…
iceiix Jan 11, 2020
6d1d8e5
Uppercase global to fix warning
iceiix Jan 11, 2020
63e80a4
Remove steven_gl
iceiix Jan 11, 2020
1c53b2f
Disable optimizations for now to help debugging
iceiix Jan 11, 2020
9d31c9c
Remove println
iceiix Jan 11, 2020
b3bc616
Experiments with calling tex_image_3d earlier
iceiix Jan 12, 2020
16a91ca
Log thread ID to test multithreading hypothesis, both are on ThreadId(1)
iceiix Jan 12, 2020
8e36428
Revert "Log thread ID to test multithreading hypothesis, both are on …
iceiix Jan 12, 2020
5dce795
Change repro function to not have any arguments so rust-lldb doesn't …
iceiix Jan 12, 2020
6cf00dc
Crashes after version read, doesn't crash beefore
iceiix Jan 12, 2020
d3b176f
Add more checks in resources, but now crashes before any of them
iceiix Jan 12, 2020
17fc7fe
Revert "Add more checks in resources, but now crashes before any of t…
iceiix Jan 12, 2020
17fb0fd
Skip setting version, crashes still in 'nabout to call 1st tex_image_3d'
iceiix Jan 12, 2020
abbdc47
Revert "Skip setting version, crashes still in 'nabout to call 1st te…
iceiix Jan 12, 2020
2d91fb1
Call in a loop, no difference
iceiix Jan 12, 2020
504a154
Try a loop in gl::init, still crashes later:
iceiix Jan 12, 2020
000b958
Try calling glow_context(), no difference
iceiix Jan 12, 2020
43ad70c
Remove loop
iceiix Jan 12, 2020
fe1fac7
Call in main, no crash
iceiix Jan 12, 2020
49d78ac
Remove call in gl::init, now crashes after resource_manager.clone()
iceiix Jan 12, 2020
25b34bb
Log drop texture
iceiix Jan 12, 2020
ac08779
Move test_image_3d out of Texture so not involved with Drop
iceiix Jan 12, 2020
a9bf1f3
Call main 3 before resource_manager.clone(), it still crashes
iceiix Jan 12, 2020
463c5ee
Loop in main, now it crashes on 2nd call
iceiix Jan 12, 2020
b3da6ab
Test creating and binding texture before glTexImage3D, crashes on 2nd…
iceiix Jan 12, 2020
e763ad3
Try storing pixels in vec in case related to memory deallocation, no …
iceiix Jan 12, 2020
d7ecb9a
Revert "Try storing pixels in vec in case related to memory deallocat…
iceiix Jan 12, 2020
baf324b
Try to delete texture, and now it crashes there
iceiix Jan 12, 2020
b0f49dc
Passing pixels as None avoids the immediate crash, must be something …
iceiix Jan 12, 2020
8d7d756
Disable all buffer-related functions
iceiix Jan 12, 2020
7c505e8
Disable tex_parameter_i32, the next crash
iceiix Jan 12, 2020
30009a3
Disable shader_source due to crash
iceiix Jan 12, 2020
2abb715
Disable shader compile status and info log due to crash
iceiix Jan 12, 2020
55bcc72
Revert "Disable all buffer-related functions"
iceiix Jan 12, 2020
09fc990
Disable broken tex_image_3d call in test_image_3d
iceiix Jan 12, 2020
d48bdcc
Disable every glow context function to track down a crash
iceiix Jan 12, 2020
6c8e2d7
Re-enable glow shader functions, crashes illegal hardware instruction
iceiix Jan 12, 2020
4a3258f
Revert "Re-enable glow shader functions, crashes illegal hardware ins…
iceiix Jan 12, 2020
1fd8ae1
Shaders return Some instead of None, comment out test_image_3d
iceiix Jan 12, 2020
b0c489e
Re-enable part of test_image_3d, reproduces GenTextures crash
iceiix Jan 12, 2020
18956ad
Log from_loader_function callback calls
iceiix Jan 13, 2020
996b598
Move test image to main(), it does NOT crash here
iceiix Jan 13, 2020
39e94f8
Add tex_image_3d in main, does NOT crash here either
iceiix Jan 13, 2020
687e8e2
Move to gl_init in main and static mut unsafe, still no crash
iceiix Jan 13, 2020
86a491c
Revert test in main(), back to crashing
iceiix Jan 13, 2020
4a62b9c
Return early, no crash
iceiix Jan 13, 2020
0238293
Revert "Return early, no crash"
iceiix Jan 13, 2020
aece114
Remove loop from main, crashes in main 4 creating texture
iceiix Jan 13, 2020
19f6034
Pull render gl calls into main, no crash
iceiix Jan 13, 2020
eae25dd
Create shaders in main, no crash
iceiix Jan 13, 2020
e6f9df6
Clone resource manager and get version, still no crash
iceiix Jan 13, 2020
95b6847
Revert to non-main crashing, glGenSamplers bus error 0x0000000101b85000
iceiix Jan 13, 2020
ce9e1e3
Remove unnecessary test_image_3d call, GenTextures FnPtr is now overw…
iceiix Jan 13, 2020
f9e5771
Remove 2nd tex_image_3d call, now GenTextures is 0x3e0
iceiix Jan 13, 2020
df71b6d
Use gl/mod.rs wrappers, glGenTextures crash still 0x3e0
iceiix Jan 13, 2020
3b94259
Remove unnecessary bind call, crash GenTextures 0x101d33840
iceiix Jan 13, 2020
0001302
Remove test_image_3d, to main, crash glGenTextures 0x101e3c4e0
iceiix Jan 13, 2020
a134051
Remove setting parameters, same GenSamplers address=0x1030472e0 crash
iceiix Jan 13, 2020
3d7486a
Remove gl enable face calls, glGenSamplers crash address=0x3e0
iceiix Jan 13, 2020
9c17e06
Move creating texture into Renderer new, glGenSampler 0x3e0:
iceiix Jan 13, 2020
af9bbcf
Exit after creating texture before returning renderer construction, n…
iceiix Jan 13, 2020
e4969ba
Exit in main, glGenTextures EXC_BAD_ACCESS (code=1, address=0xf8)
iceiix Jan 13, 2020
f5f4cf4
Remove reading version, GenTextures address=0x10
iceiix Jan 13, 2020
59c50ce
Remove blend depth func, glGenTextures crash 0x10
iceiix Jan 13, 2020
a62c52d
Exit process immediately after 2nd create texture -- no crash
iceiix Jan 19, 2020
1b6fdd0
Try reading a line from stdin after 2nd texture creation instead of e…
iceiix Jan 19, 2020
ece0ca6
Try sleeping the thread before exiting; no crash
iceiix Jan 19, 2020
6f33aa1
Log when in process_skins thread
iceiix Jan 19, 2020
0672d3d
Return early from process_skins, same 0x10 crash
iceiix Jan 19, 2020
07144f4
Disable the skin thread, now crashes from szone_malloc_should_clear
iceiix Jan 19, 2020
ec821da
Merge branch 'master' into glow
iceiix Feb 2, 2020
84b76e6
cargo fmt
iceiix Jun 21, 2020
ee81a53
Merge branch 'master' into glow
iceiix Jun 21, 2020
ed1b410
Revert to master
iceiix Jun 21, 2020
5097ebf
Merge master after cargo fmt
iceiix Jun 21, 2020
042fad7
Merge branch 'master' into glow
iceiix Jul 7, 2020
3695c16
Revert Cargo.lock changes
iceiix Dec 20, 2020
323c516
Merge branch 'master' into glow
iceiix Dec 20, 2020
83d9678
Merge branch 'master' into glow
iceiix Dec 21, 2020
641d665
Update to glow 0.6.1
iceiix Dec 21, 2020
8b9fbf0
Unbox the context to a raw pointer; fixes glow_context() segafault
iceiix Dec 21, 2020
be63bbc
Revert unnecessary changes to src/render/mod.rs
iceiix Dec 22, 2020
84ec3e9
gl: comment out all glow_context() usages
iceiix Dec 22, 2020
f0acbe9
Revert "gl: comment out all glow_context() usages"
iceiix Dec 22, 2020
c8dd631
Disable add_screen() for now to avoid stack overflow crash
iceiix Dec 22, 2020
0311911
Add debugging to help find the __rust_probestack crash in reload_serv…
iceiix Dec 22, 2020
2d72135
Log backtraces from glow_context()
iceiix Dec 24, 2020
7ed7853
Enable most glow methods
iceiix Dec 24, 2020
3e04828
Implement uniform_location, fixing unwrap None failed
iceiix Dec 24, 2020
bb560de
Use tex_image_2d_multisample added in glow fork https://github.com/ic…
iceiix Dec 25, 2020
8417df5
Enable more tex_image calls
iceiix Dec 25, 2020
68c74a5
Add tex_sub_image_3d, using PixelUnpackData::Slice
iceiix Dec 25, 2020
6706762
set_matrix4: transmute the Matrix4 since it is repr(C)
iceiix Dec 25, 2020
b15c926
get_pixels -> get_tex_image -> glGetTexImage, with PixelPackData::Slice
iceiix Dec 25, 2020
c58a4bc
Wrap sub_image_2d (glTexSubImage2D) and fix warnings
iceiix Dec 25, 2020
cd256a5
cargo fmt
iceiix Dec 25, 2020
cf80d92
Fix clippy::transmute-ptr-to-ptr
iceiix Dec 25, 2020
f1b1e53
Reenable optimizations, fixes/worksaround #443 rust_probestack crash
iceiix Dec 25, 2020
a0f34a0
Cleanup debugging
iceiix Dec 25, 2020
6271464
Pin glow to specific commit of https://github.com/iceiix/glow/pull/1
iceiix Dec 25, 2020
c90814b
Revert unnecessary change to main.rs
iceiix Dec 25, 2020
45ed639
Remove gl module
iceiix Dec 25, 2020
efd0372
cargo fmt
iceiix Dec 25, 2020
471f20f
Implement set_float_multi_raw and set_matrix4_multi, using from_raw_p…
iceiix Dec 25, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ opt-level = 1
cfg-if = "1.0.0"
wasm-bindgen = "0.2.69"
glutin = "0.26.0"
glow = { git = "https://github.com/iceiix/glow", rev = "45c808678735e03737d5e1b9d6ed0e21070edcd9" }
byteorder = "1.3.4"
serde = "1.0.118"
serde_json = "1.0.60"
Expand All @@ -46,10 +47,6 @@ reqwest = { version = "0.10.10", features = [ "blocking" ]}
stdweb = "0.4.20"
winit = { version = "0.24.0", features = [ "stdweb" ]}

[dependencies.steven_gl]
path = "./gl"
version = "0"

[dependencies.steven_resources]
path = "./resources"
version = "0"
Expand Down
56 changes: 0 additions & 56 deletions gl/Cargo.lock

This file was deleted.

13 changes: 0 additions & 13 deletions gl/Cargo.toml

This file was deleted.

15 changes: 0 additions & 15 deletions gl/build.rs

This file was deleted.

4 changes: 0 additions & 4 deletions gl/src/lib.rs

This file was deleted.

Loading