Skip to content

Shader enhancements #109

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

Merged
ManifoldFR merged 6 commits into from
Feb 26, 2026
Merged

Shader enhancements #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc1bb22
Refactor PBR shader
ManifoldFR Feb 26, 2026
f54c6e0
SSAO : move kernelSize to ssao params ubo
ManifoldFR Feb 26, 2026
447985f
posteffects : remove screen space shadows I never got to work
ManifoldFR Feb 26, 2026
6526733
Remove old GLSL shaders
ManifoldFR Feb 26, 2026
9e17621
utils/WriteTextureToImage : throw error instead of assert if texture …
ManifoldFR Feb 26, 2026
b32d96c
wb oit : fix final target alpha
ManifoldFR Feb 26, 2026
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
205 changes: 78 additions & 127 deletions shaders/compiled/PbrBasic.frag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,43 @@
"kind": "constantBuffer",
"elementType": {
"kind": "struct",
"name": "MaterialBlock",
"name": "PbrMaterial",
"fields": [
{
"name": "material",
"name": "baseColor",
"type": {
"kind": "struct",
"name": "PbrMaterial",
"fields": [
{
"name": "baseColor",
"type": {
"kind": "vector",
"elementCount": 4,
"elementType": {
"kind": "scalar",
"scalarType": "float32"
}
},
"binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4}
},
{
"name": "metalness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 16, "size": 4, "elementStride": 0}
},
{
"name": "roughness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 20, "size": 4, "elementStride": 0}
},
{
"name": "ao",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 24, "size": 4, "elementStride": 0}
}
]
"kind": "vector",
"elementCount": 4,
"elementType": {
"kind": "scalar",
"scalarType": "float32"
}
},
"binding": {"kind": "uniform", "offset": 0, "size": 32, "elementStride": 0}
"binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4}
},
{
"name": "metalness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 16, "size": 4, "elementStride": 0}
},
{
"name": "roughness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 20, "size": 4, "elementStride": 0}
},
{
"name": "ao",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 24, "size": 4, "elementStride": 0}
}
]
},
Expand All @@ -63,53 +53,43 @@
"elementVarLayout": {
"type": {
"kind": "struct",
"name": "MaterialBlock",
"name": "PbrMaterial",
"fields": [
{
"name": "material",
"name": "baseColor",
"type": {
"kind": "struct",
"name": "PbrMaterial",
"fields": [
{
"name": "baseColor",
"type": {
"kind": "vector",
"elementCount": 4,
"elementType": {
"kind": "scalar",
"scalarType": "float32"
}
},
"binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4}
},
{
"name": "metalness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 16, "size": 4, "elementStride": 0}
},
{
"name": "roughness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 20, "size": 4, "elementStride": 0}
},
{
"name": "ao",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 24, "size": 4, "elementStride": 0}
}
]
"kind": "vector",
"elementCount": 4,
"elementType": {
"kind": "scalar",
"scalarType": "float32"
}
},
"binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 4}
},
{
"name": "metalness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 0, "size": 32, "elementStride": 0}
"binding": {"kind": "uniform", "offset": 16, "size": 4, "elementStride": 0}
},
{
"name": "roughness",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 20, "size": 4, "elementStride": 0}
},
{
"name": "ao",
"type": {
"kind": "scalar",
"scalarType": "float32"
},
"binding": {"kind": "uniform", "offset": 24, "size": 4, "elementStride": 0}
}
]
},
Expand Down Expand Up @@ -180,6 +160,14 @@
"scalarType": "int32"
},
"binding": {"kind": "uniform", "offset": 192, "size": 4, "elementStride": 0}
},
{
"name": "useSsao",
"type": {
"kind": "scalar",
"scalarType": "uint32"
},
"binding": {"kind": "uniform", "offset": 196, "size": 4, "elementStride": 0}
}
]
},
Expand Down Expand Up @@ -245,57 +233,24 @@
"scalarType": "int32"
},
"binding": {"kind": "uniform", "offset": 192, "size": 4, "elementStride": 0}
}
]
},
"binding": {"kind": "uniform", "offset": 0, "size": 208, "elementStride": 0}
}
}
},
{
"name": "params",
"binding": {"kind": "descriptorTableSlot", "space": 3, "index": 2},
"type": {
"kind": "constantBuffer",
"elementType": {
"kind": "struct",
"name": "EffectParams",
"fields": [
{
"name": "useSsao",
"type": {
"kind": "scalar",
"scalarType": "uint32"
},
"binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0}
}
]
},
"containerVarLayout": {
"binding": {"kind": "descriptorTableSlot", "index": 0}
},
"elementVarLayout": {
"type": {
"kind": "struct",
"name": "EffectParams",
"fields": [
{
"name": "useSsao",
"type": {
"kind": "scalar",
"scalarType": "uint32"
},
"binding": {"kind": "uniform", "offset": 0, "size": 4, "elementStride": 0}
"binding": {"kind": "uniform", "offset": 196, "size": 4, "elementStride": 0}
}
]
},
"binding": {"kind": "uniform", "offset": 0, "size": 16, "elementStride": 0}
"binding": {"kind": "uniform", "offset": 0, "size": 208, "elementStride": 0}
}
}
},
{
"name": "shadowAtlas",
"binding": {"kind": "descriptorTableSlot", "space": 3, "index": 3},
"binding": {"kind": "descriptorTableSlot", "space": 3, "index": 2},
"type": {
"kind": "constantBuffer",
"elementType": {
Expand Down Expand Up @@ -511,13 +466,9 @@
"name": "light",
"binding": {"kind": "descriptorTableSlot", "space": 3, "index": 1, "used": 1}
},
{
"name": "params",
"binding": {"kind": "descriptorTableSlot", "space": 3, "index": 2, "used": 1}
},
{
"name": "shadowAtlas",
"binding": {"kind": "descriptorTableSlot", "space": 3, "index": 3, "used": 1}
"binding": {"kind": "descriptorTableSlot", "space": 3, "index": 2, "used": 1}
},
{
"name": "shadowMap",
Expand Down
Loading