Skip to content

Feature/wgpu native#231

Draft
toloudis wants to merge 177 commits into
mainfrom
feature/wgpu-native
Draft

Feature/wgpu native#231
toloudis wants to merge 177 commits into
mainfrom
feature/wgpu-native

Conversation

@toloudis
Copy link
Copy Markdown
Contributor

@toloudis toloudis commented Nov 26, 2024

Pull request recommendations:

  • Name your pull request your-development-type/short-description. Ex: feature/read-tiff-files
  • Link to any relevant issue in the PR description. Ex: Resolves [gh-##], adds tiff file format support
  • Provide description and context of changes.
  • Provide relevant tests for your feature or bug fix.
  • Provide or update documentation for any feature added by your pull request.

Thanks for contributing!

toloudis and others added 30 commits October 25, 2022 09:36
@toloudis
start trying to add and build wgpu-native
d4c0187
@toloudis
fix build for wgpu_native
094e28c
@toloudis
build both dbg and release
5986365
@toloudis
try fix lib name
e70ddf9
@toloudis
fussing with spacing and then try to get an include dir for wgpu header
12d8046
@toloudis
make new renderlib_wgpu
d92bc9c
@toloudis
try to fix build
a69c9b6
@toloudis
add some vulkan deps for linux/wgpu-native
70bfaf4
@toloudis
add renderlib_wgpu as link dependency
268281c
@toloudis
logging for build debugging
030767c
@toloudis
remove find_library as it is not compatible with externalproject
86ca031
@toloudis
broken wip, won't build yet
793b1f4
@toloudis
now compiles on windows but does not yet link
ad658d4
@toloudis
builds and links on windows
4742343
@toloudis
linux compile fix
b05f41a
@toloudis
fix scope issues
3460c88
@toloudis
add lib prefix
9e31061
@toloudis
precision-losing cast from 64bit ptr to uint32_t
43417e5
@toloudis
add x11
7284086
@toloudis
add linkage to metal
9be01f1
@toloudis
fix lib specification
ab71e05
@toloudis
add extern c to objective-c++ func
d350efc
@toloudis
fix dumb mistake
315158d
@toloudis
wip toward a qt wgpu window
2531820
@toloudis
successfully use wgpu to clear the window to a color
6b350f4
@toloudis
c++ 20!!!
5acda86
@toloudis
something about these temporaries was crashing on windows build
03337c1
@toloudis
don't build the render pipeline until we have actual shaders ready
293a947
@toloudis
fix null pointer error and start debugging on windows
f2e1581
@toloudis
remove label field
dc98e81
toloudis and others added 30 commits September 3, 2024 17:52
@toloudis
Merge branch 'main' into feature/wgpu-native
ab92190
@toloudis
assign wgpu renderers
3a45e3d
@toloudis
some init for wgpu renderer
8e2747d
@toloudis
Merge branch 'main' into feature/wgpu-native
179c51c
@toloudis
update wgpu version
c3a9d73
@toloudis
Merge commit '8cf2d039a40e4bc7e7e5e51c053393627a33f88a' into feature/…
5c327ef 
…wgpu-native
@toloudis
Merge branch 'main' into feature/wgpu-native
2e1c603 
# Conflicts:
#	renderlib/Logging.cpp
@toloudis
merge fixup
15ba8cb
@toloudis
sync wgpuview
3f78e0b
@toloudis
fix tensorstore array
89bf06a
@toloudis
start to refactor shaders into shader array
120f01f
@toloudis
use better name
3f1bb76
@toloudis
wip
2b43edd
@toloudis
wip
105aa70
@toloudis
reworking the shader generation
4681df4
@toloudis
fix var names
a63fb06
@toloudis
first attempts to actually run with the new shaders
eb35852
@toloudis
try gl context sharing
e27f5d6
@toloudis
refactor all shaders
0e2164b
@toloudis
do better lazy init on shaders for active contexts
20904cd
@toloudis
setup default opengl surface format before creating app
1e770cf
@toloudis
Merge branch 'feature/build-shaders' into feature/wgpu-native
7bf0a08 
# Conflicts:
#	renderlib/CMakeLists.txt
#	renderlib/graphics/glsl/GLPTVolumeShader.cpp
#	renderlib/graphics/glsl/GLPTVolumeShader.h
#	renderlib/graphics/glsl/shaders/copy.vert
#	renderlib/graphics/glsl/shaders/flat.vert
#	renderlib/graphics/glsl/shaders/gui.frag
#	renderlib/graphics/glsl/shaders/gui.vert
#	renderlib/graphics/glsl/shaders/toneMap.vert
#	renderlib/io/CMakeLists.txt
@toloudis
comment/todo
858c97c
@toloudis
enumerate adapters and print out
180d31f
@toloudis
shader version 460
6f278ff
@toloudis
Merge branch 'main' into feature/wgpu-native
6512d02 
# Conflicts:
#	README.md
#	agave_app/AppearanceSettingsWidget.cpp
#	renderlib/Colormap.cpp
#	renderlib/Colormap.h
#	renderlib/graphics/ImageXyzcGpu.cpp
#	renderlib/graphics/glsl/CMakeLists.txt
#	renderlib/graphics/glsl/GLBasicVolumeShader.cpp
#	renderlib/graphics/glsl/GLCopyShader.cpp
#	renderlib/graphics/glsl/GLFlatShader2D.cpp
#	renderlib/graphics/glsl/GLGuiShader.cpp
#	renderlib/graphics/glsl/GLImageShader2DnoLut.cpp
#	renderlib/graphics/glsl/GLPTAccumShader.cpp
#	renderlib/graphics/glsl/GLPTVolumeShader.cpp
#	renderlib/graphics/glsl/GLThickLines.cpp
#	renderlib/graphics/glsl/GLToneMapShader.cpp
#	renderlib/graphics/glsl/shaders.cpp
#	renderlib/graphics/glsl/shaders.h
#	renderlib/io/FileReaderZarr.cpp
#	test/CMakeLists.txt
@toloudis
post-merge fixups part 1
360ff88
@toloudis
post merge fixup 2
6e71c2d
@toloudis
Merge branch 'main' into feature/wgpu-native
3448d44
@toloudis
Merge branch 'main' into feature/wgpu-native
a6dd9b2 
# Conflicts:
#	README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@toloudis