asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #70122 from clayjohn/VRS-r8uint

Browse source 
Don't attempt to create or use an R8_UINT texture as storage if VRS is not supported
This commit is contained in:
Rémi Verschelde 2022-12-17 12:22:03 +01:00
commit 2b2c372dbc
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/rendering/renderer_rd/environment/gi.cpp
View file

@ -3496,6 +3496,10 @@ void GI::init(SkyRD *p_sky) {
{ {
//calculate tables //calculate tables
String defines = "\n#define SDFGI_OCT_SIZE " + itos(SDFGI::LIGHTPROBE_OCT_SIZE) + "\n"; String defines = "\n#define SDFGI_OCT_SIZE " + itos(SDFGI::LIGHTPROBE_OCT_SIZE) + "\n";
if (RendererSceneRenderRD::get_singleton()->is_vrs_supported()) {
defines += "\n#define USE_VRS\n";
}
Vector<String> gi_modes; Vector<String> gi_modes;
gi_modes.push_back("\n#define USE_VOXEL_GI_INSTANCES\n"); // MODE_VOXEL_GI gi_modes.push_back("\n#define USE_VOXEL_GI_INSTANCES\n"); // MODE_VOXEL_GI
@ -4011,7 +4015,7 @@ void GI::process_gi(Ref<RenderSceneBuffersRD> p_render_buffers, const RID *p_nor
u.append_id(rbgi->scene_data_ubo); u.append_id(rbgi->scene_data_ubo);
uniforms.push_back(u); uniforms.push_back(u);
} }
{ if (RendererSceneRenderRD::get_singleton()->is_vrs_supported()) {
RD::Uniform u; RD::Uniform u;
u.uniform_type = RD::UNIFORM_TYPE_IMAGE; u.uniform_type = RD::UNIFORM_TYPE_IMAGE;
u.binding = 19; u.binding = 19;

6
servers/rendering/renderer_rd/shaders/environment/gi.glsl
View file

@ -108,7 +108,9 @@ layout(set = 0, binding = 18, std140) uniform SceneData {
} }
scene_data; scene_data;
#ifdef USE_VRS
layout(r8ui, set = 0, binding = 19) uniform restrict readonly uimage2D vrs_buffer; layout(r8ui, set = 0, binding = 19) uniform restrict readonly uimage2D vrs_buffer;
#endif
layout(push_constant, std430) uniform Params { layout(push_constant, std430) uniform Params {
uint max_voxel_gi_instances; uint max_voxel_gi_instances;
@ -661,6 +663,7 @@ void main() {
ivec2 pos = ivec2(gl_GlobalInvocationID.xy); ivec2 pos = ivec2(gl_GlobalInvocationID.xy);
uint vrs_x, vrs_y; uint vrs_x, vrs_y;
#ifdef USE_VRS
if (sc_use_vrs) { if (sc_use_vrs) {
ivec2 vrs_pos; ivec2 vrs_pos;
@ -684,6 +687,7 @@ void main() {
return; return;
} }
} }
#endif
if (sc_half_res) { if (sc_half_res) {
pos <<= 1; pos <<= 1;
@ -708,6 +712,7 @@ void main() {
imageStore(ambient_buffer, pos, ambient_light); imageStore(ambient_buffer, pos, ambient_light);
imageStore(reflection_buffer, pos, reflection_light); imageStore(reflection_buffer, pos, reflection_light);
#ifdef USE_VRS
if (sc_use_vrs) { if (sc_use_vrs) {
if (vrs_x > 1) { if (vrs_x > 1) {
imageStore(ambient_buffer, pos + ivec2(1, 0), ambient_light); imageStore(ambient_buffer, pos + ivec2(1, 0), ambient_light);
@ -766,4 +771,5 @@ void main() {
imageStore(reflection_buffer, pos + ivec2(3, 3), reflection_light); imageStore(reflection_buffer, pos + ivec2(3, 3), reflection_light);
} }
} }
#endif
} }

9
servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
View file

@ -419,11 +419,12 @@ TextureStorage::TextureStorage() {
tformat.format = RD::DATA_FORMAT_R8_UINT; tformat.format = RD::DATA_FORMAT_R8_UINT;
tformat.width = 4; tformat.width = 4;
tformat.height = 4; tformat.height = 4;
tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT; tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT | RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT;
if (RD::get_singleton()->has_feature(RD::SUPPORTS_ATTACHMENT_VRS)) {
tformat.usage_bits |= RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT;
}
tformat.texture_type = RD::TEXTURE_TYPE_2D; tformat.texture_type = RD::TEXTURE_TYPE_2D;
if (!RD::get_singleton()->has_feature(RD::SUPPORTS_ATTACHMENT_VRS)) {
tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
tformat.format = RD::DATA_FORMAT_R8_UNORM;
}
Vector<uint8_t> pv; Vector<uint8_t> pv;
pv.resize(4 * 4); pv.resize(4 * 4);