godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #102497 from BlueCube3310/mesh-uv-render-compressed-fix 

Fix rendering material when UV2 is compressed
This commit is contained in:
Rémi Verschelde 2025-02-07 01:40:02 +01:00
parent 9175514d80 8714b36171
commit 0bccb0abd1
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gles3/shaders/scene.glsl
View File

@ -713,7 +713,14 @@ void main() {
#endif #endif
#ifdef RENDER_MATERIAL #ifdef RENDER_MATERIAL
gl_Position.xy = (uv2_attrib.xy + uv_offset) * 2.0 - 1.0; vec2 uv_dest_attrib;
if (uv_scale != vec4(0.0)) {
uv_dest_attrib = (uv2_attrib.xy - 0.5) * uv_scale.zw;
} else {
uv_dest_attrib = uv2_attrib.xy;
}
gl_Position.xy = (uv_dest_attrib + uv_offset) * 2.0 - 1.0;
gl_Position.z = 0.00001; gl_Position.z = 0.00001;
gl_Position.w = 1.0; gl_Position.w = 1.0;
#endif #endif

9
servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
View File

@ -652,8 +652,15 @@ void vertex_shader(vec3 vertex_input,
#endif #endif
#ifdef MODE_RENDER_MATERIAL #ifdef MODE_RENDER_MATERIAL
if (scene_data.material_uv2_mode) { if (scene_data.material_uv2_mode) {
vec2 uv_dest_attrib;
if (uv_scale != vec4(0.0)) {
uv_dest_attrib = (uv2_attrib.xy - 0.5) * uv_scale.zw;
} else {
uv_dest_attrib = uv2_attrib.xy;
}
vec2 uv_offset = unpackHalf2x16(draw_call.uv_offset); vec2 uv_offset = unpackHalf2x16(draw_call.uv_offset);
gl_Position.xy = (uv2_attrib.xy + uv_offset) * 2.0 - 1.0; gl_Position.xy = (uv_dest_attrib + uv_offset) * 2.0 - 1.0;
gl_Position.z = 0.00001; gl_Position.z = 0.00001;
gl_Position.w = 1.0; gl_Position.w = 1.0;
} }

9
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View File

@ -557,7 +557,14 @@ void main() {
#endif // MODE_RENDER_DEPTH #endif // MODE_RENDER_DEPTH
#ifdef MODE_RENDER_MATERIAL #ifdef MODE_RENDER_MATERIAL
if (scene_data.material_uv2_mode) { if (scene_data.material_uv2_mode) {
gl_Position.xy = (uv2_attrib.xy + draw_call.uv_offset) * 2.0 - 1.0; vec2 uv_dest_attrib;
if (uv_scale != vec4(0.0)) {
uv_dest_attrib = (uv2_attrib.xy - 0.5) * uv_scale.zw;
} else {
uv_dest_attrib = uv2_attrib.xy;
}
gl_Position.xy = (uv_dest_attrib + draw_call.uv_offset) * 2.0 - 1.0;
gl_Position.z = 0.00001; gl_Position.z = 0.00001;
gl_Position.w = 1.0; gl_Position.w = 1.0;
} }