mirror of
https://github.com/bevyengine/bevy
synced 2024-12-23 19:43:07 +00:00
4bf20e7d27
# Objective - Materials should be a more frequent rebind then meshes (due to being able to use a single vertex buffer, such as in #10164) and therefore should be in a higher bind group. --- ## Changelog - For 2d and 3d mesh/material setups (but not UI materials, or other rendering setups such as gizmos, sprites, or text), mesh data is now in bind group 1, and material data is now in bind group 2, which is swapped from how they were before. ## Migration Guide - Custom 2d and 3d mesh/material shaders should now use bind group 2 `@group(2) @binding(x)` for their bound resources, instead of bind group 1. - Many internal pieces of rendering code have changed so that mesh data is now in bind group 1, and material data is now in bind group 2. Semi-custom rendering setups (that don't use the Material or Material2d APIs) should adapt to these changes.
18 lines
685 B
GLSL
18 lines
685 B
GLSL
#version 450
|
|
layout(location = 0) in vec2 v_Uv;
|
|
|
|
layout(location = 0) out vec4 o_Target;
|
|
|
|
layout(set = 2, binding = 0) uniform vec4 CustomMaterial_color;
|
|
|
|
layout(set = 2, binding = 1) uniform texture2D CustomMaterial_texture;
|
|
layout(set = 2, binding = 2) uniform sampler CustomMaterial_sampler;
|
|
|
|
// wgsl modules can be imported and used in glsl
|
|
// FIXME - this doesn't work any more ...
|
|
// #import bevy_pbr::pbr_functions as PbrFuncs
|
|
|
|
void main() {
|
|
// o_Target = PbrFuncs::tone_mapping(Color * texture(sampler2D(CustomMaterial_texture,CustomMaterial_sampler), v_Uv));
|
|
o_Target = CustomMaterial_color * texture(sampler2D(CustomMaterial_texture,CustomMaterial_sampler), v_Uv);
|
|
}
|