Merge pull request #245 from BVE-Reborn/backport-texture-fixes

Author: cwfitzgerald

CHANGELOG.md

@@ -29,6 +29,11 @@ Per Keep a Changelog there are 6 main categories of changes:
 
 ## Unreleased
 
+### Fixed
+- rend3: Fixed bug where in gpu mode, changing textures would cause a brief flash.
+- rend3-pbr: Fixed normal mapping.
+- rend3-pbr: Fixed some UV transforms.
+
 ## v0.2.1
 
 Released 2021-10-24

rend3-pbr/shaders/spirv/depth-cutout.frag.cpu.spv

@@ -8,7 +8,7 @@
 #include "structures.glsl"
 
 layout(location = 0) in vec4 i_position;
-layout(location = 1) in vec2 i_coords;
+layout(location = 1) in vec2 i_coords0;
 layout(location = 2) in vec4 i_color;
 layout(location = 3) flat in uint i_material;
 
@@ -44,7 +44,7 @@ void main() {
 
     bool has_albedo = HAS_ALBEDO_TEXTURE;
 
-    vec2 coords = i_coords;
+    vec2 coords = vec2(material.uv_transform0 * vec3(i_coords0, 1.0));
     vec2 uvdx = dFdx(coords);
     vec2 uvdy = dFdy(coords);
 

rend3-pbr/shaders/spirv/depth-cutout.frag.gpu.spv

@@ -15,7 +15,7 @@ layout(location = 7) in uint i_object_idx;
 #endif
 
 layout(location = 0) out vec4 o_position;
-layout(location = 1) out vec2 o_coords;
+layout(location = 1) out vec2 o_coords0;
 layout(location = 2) out vec4 o_color;
 layout(location = 3) flat out uint o_material;
 
@@ -54,5 +54,5 @@ void main() {
 
     o_color = i_color;
 
-    o_coords = vec2(material.uv_transform0 * vec3(i_coords0, 1.0));
+    o_coords0 = i_coords0;
 }

rend3-pbr/shaders/spirv/depth-opaque.frag.cpu.spv

@@ -42,7 +42,7 @@ struct PixelData {
 PixelData get_per_pixel_data_sampled(MATERIAL_TYPE material, sampler s) {
     PixelData pixel;
 
-    vec2 coords = i_coords0;
+    vec2 coords = vec2(material.uv_transform0 * vec3(i_coords0, 1.0));
     vec2 uvdx = dFdx(coords);
     vec2 uvdy = dFdy(coords);
 
@@ -82,7 +82,7 @@ PixelData get_per_pixel_data_sampled(MATERIAL_TYPE material, sampler s) {
 
                 normal = vec3(bicomp, sqrt(1 - (bicomp.r * bicomp.r) - (bicomp.g * bicomp.g)));
             } else {
-                normal = normalize(texture_read.rgb);
+                normal = normalize(texture_read.rgb * 2.0 - 1.0);
             }
             vec3 in_normal = normalize(i_normal);
             vec3 in_tangent = normalize(i_tangent);

rend3-pbr/shaders/spirv/depth-opaque.frag.gpu.spv

@@ -63,11 +63,12 @@ void main() {
 
     o_color = i_color;
 
-    o_coords0 = vec2(material.uv_transform0 * vec3(i_coords0, 1.0));
-    o_coords1 = vec2(material.uv_transform1 * vec3(i_coords1, 1.0));
+    o_coords0 = i_coords0;
+    o_coords1 = i_coords1;
 
     #ifdef BAKING
-    gl_Position = vec4(o_coords1 * 2.0 - 1.0, 0.0, 1.0);
+    vec2 coord1_adj = vec2(material.uv_transform1 * vec3(i_coords1, 1.0));
+    gl_Position = vec4(coord1_adj * 2.0 - 1.0, 0.0, 1.0);
     #else
     gl_Position = data.model_view_proj * vec4(i_position, 1.0);
     #endif

rend3-pbr/shaders/spirv/depth.vert.cpu.spv

@@ -100,10 +100,14 @@ pub fn render_loop<Input, Output>(
     }
 
     // Do these in dependency order
-    // Level 2
+    // Level 3
     object_manager.ready(&mut material_manager);
 
+    // Level 2
+    let d2_texture = texture_manager_2d.ready(&renderer.device);
+
     // Level 1
+    // The material manager needs to be able to pull correct internal indices from the d2 texture manager, so it has to go first.
     material_manager.ready(
         &renderer.device,
         &renderer.queue,
@@ -112,7 +116,6 @@ pub fn render_loop<Input, Output>(
     );
 
     // Level 0
-    let d2_texture = texture_manager_2d.ready(&renderer.device);
     let d2c_texture = texture_manager_cube.ready(&renderer.device);
     let directional_light_cameras = directional_light_manager.ready(&renderer.device, &renderer.queue, &camera_manager);
     mesh_manager.ready();