Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Glsl.meta.slang raytracing #3560 #10

Closed
wants to merge 40 commits into from
Closed

Glsl.meta.slang raytracing #3560 #10

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2412b0d
implementing ray tracing functions & ray_query extension tests
ArielG-NV Feb 8, 2024
77c04b2
Implement all functions & built-in variables (with tests) for the GLS…
ArielG-NV Feb 18, 2024
e061acd
Implement all functions & built-in variables (with tests) for the GLS…
ArielG-NV Feb 29, 2024
872763b
syntax adjustments
ArielG-NV Feb 29, 2024
aa994e0
add back removed tests; adjust style as per requested with assert'ing…
ArielG-NV Mar 1, 2024
c9730f1
fixing code style & changing as per suggestions (9)
ArielG-NV Mar 4, 2024
d6b8ad9
remove useless const's which just add warnings
ArielG-NV Mar 5, 2024
b0708bc
Merge remote-tracking branch 'upstream/master' into glsl.meta.slang_r…
ArielG-NV Mar 5, 2024
b8c3f4c
changes to ensure branch works with upstream
ArielG-NV Mar 5, 2024
eb0c842
fix warning->error with int cast
ArielG-NV Mar 5, 2024
410ca2b
added capabilities to raytracing
ArielG-NV Mar 6, 2024
3571474
add missing cap
ArielG-NV Mar 6, 2024
5607641
checkin after fixing all tests(?)
ArielG-NV Mar 7, 2024
c508fd1
fixed regressions by removing ext's when adding capabilities
ArielG-NV Mar 7, 2024
3be252c
remove wrong rayIntersection shader code (fails compile causing faili…
ArielG-NV Mar 7, 2024
fc1610c
push vsproj files
ArielG-NV Mar 7, 2024
34055a3
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
ArielG-NV Mar 7, 2024
507e9d5
push vsproj files
ArielG-NV Mar 7, 2024
ea7f24e
adjust vs project filters
ArielG-NV Mar 7, 2024
b88070a
realized I could just rerun the bat file...
ArielG-NV Mar 7, 2024
a603338
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
ArielG-NV Mar 8, 2024
9031f30
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
csyonghe Mar 8, 2024
bddc508
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
jkwak-work Mar 11, 2024
f9dcb96
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
ArielG-NV Mar 12, 2024
0f689bc
adjusting syntax and code to conform with slang better
ArielG-NV Mar 12, 2024
43dc4fb
Merge branch 'glsl.meta.slang_raytracing_#3560' of https://github.com…
ArielG-NV Mar 12, 2024
7802fcb
fixes to remove allowGLSL branch of code for raytracing (allows hlsl …
ArielG-NV Mar 12, 2024
a773525
add support for HLSL+GLSL raytracing (together)
ArielG-NV Mar 12, 2024
788e19a
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
ArielG-NV Mar 12, 2024
c4cfff6
change how we simplify SPIRV so it works when we have no references (…
ArielG-NV Mar 12, 2024
bd0efd9
Merge branch 'glsl.meta.slang_raytracing_#3560' of https://github.com…
ArielG-NV Mar 12, 2024
15e346b
fix warning
ArielG-NV Mar 13, 2024
e486693
remove unused loop
ArielG-NV Mar 13, 2024
bcd9e91
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
ArielG-NV Mar 13, 2024
0bc8fe9
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
ArielG-NV Mar 14, 2024
d262b88
fix failing matrix buffer pointer
ArielG-NV Mar 14, 2024
0ed454c
minimize all scope of changes such that merge into master will have l…
ArielG-NV Mar 15, 2024
7eaee63
fix forced emit'ing code hack due to finding source of problem being,…
ArielG-NV Mar 15, 2024
f25e104
directly inline hanging call for clarity & styling
ArielG-NV Mar 15, 2024
0a00950
Merge branch 'master' into glsl.meta.slang_raytracing_#3560
ArielG-NV Mar 15, 2024
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
6 changes: 3 additions & 3 deletions source/slang/core.meta.slang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2336,7 +2336,7 @@ __attributeTarget(DeclBase)
attribute_syntax [push_constant] : PushConstantAttribute;

__attributeTarget(VarDeclBase)
attribute_syntax [vk_location(locaiton : int)] : GLSLLocationAttribute;
attribute_syntax [vk_location(location : int)] : GLSLLocationAttribute;

__attributeTarget(VarDeclBase)
attribute_syntax [vk_index(index : int)] : GLSLIndexAttribute;
Expand Down Expand Up @@ -2471,7 +2471,7 @@ __attributeTarget(Decl)
attribute_syntax [allow(diagnostic: String)] : AllowAttribute;

__attributeTarget(Decl)
attribute_syntax[require(capability)] : RequireCapabilityAttribute;
attribute_syntax [require(capability)] : RequireCapabilityAttribute;

// Linking
__attributeTarget(Decl)
Expand Down Expand Up @@ -2514,7 +2514,7 @@ __attributeTarget(FuncDecl)
attribute_syntax [CUDAKernel] : CudaKernelAttribute;

__attributeTarget(FuncDecl)
attribute_syntax[AutoPyBindCUDA] : AutoPyBindCudaAttribute;
attribute_syntax [AutoPyBindCUDA] : AutoPyBindCudaAttribute;

__attributeTarget(AggTypeDecl)
attribute_syntax [PyExport(name: String)] : PyExportAttribute;
Expand Down
Loading