blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Refactor: GLSL: Cleanup Clip Space vs. NDC Space naming #105423

Closed
Prakhar-Singh-Chouhan wants to merge 15 commits from (deleted):fix#105070 into main
pull from: (deleted):fix#105070
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 5 Commits 15 Files Changed 75 +1 -2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10f9e50b27 - Show all commits

3
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert.glsl
View File

@ -29,9 +29,8 @@ void main()
GPU_INTEL_VERTEX_SHADER_WORKAROUND
vec3 world_pos = point_object_to_world(pos);
gl_Position = point_world_to_homogenous(world_pos);
vec3 view_pos = point_world_to_view(world_pos);
fclem marked this conversation as resolved
Clément Foucault commented 2023-03-04 21:03:28 +01:00
Review
Copy Link

Here.

Here.
gl_Position = point_view_to_ndc(view_pos);
gl_Position = point_world_to_homogenous(world_pos);
fclem marked this conversation as resolved
Clément Foucault commented 2023-03-06 18:33:56 +01:00
Review
Copy Link

You still need to fix the merge errors. This will not compile as point_view_to_ndc does not exist anymore.
You only removed the merge tags, but you need to remove what was below the <<<<<<< HEAD and do the renaming of what was above >>>>>>> main.

You still need to fix the merge errors. This will not compile as `point_view_to_ndc` does not exist anymore. You only removed the merge tags, but you need to remove what was below the `<<<<<<< HEAD` and do the renaming of what was above `>>>>>>> main`.
/* Offset Z position for retopology overlay. */
gl_Position.z += get_homogenous_z_offset(view_pos.z, gl_Position.w, retopologyOffset);