[Bf-blender-cvs] [248299fc95a] temp-vulkan-shader: Nicer comments describing the issue.

Jeroen Bakker noreply at git.blender.org
Tue Dec 6 10:09:35 CET 2022


Commit: 248299fc95a6d774c98b523ae9ba2863638660b8
Author: Jeroen Bakker
Date:   Tue Dec 6 10:08:59 2022 +0100
Branches: temp-vulkan-shader
https://developer.blender.org/rB248299fc95a6d774c98b523ae9ba2863638660b8

Nicer comments describing the issue.

===================================================================

M	source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_guide_vert.glsl
M	source/blender/draw/intern/shaders/common_gpencil_lib.glsl

===================================================================

diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_guide_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_guide_vert.glsl
index a7dbc3c9f7c..263a60e3968 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_guide_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_guide_vert.glsl
@@ -6,7 +6,7 @@ void main()
 {
   GPU_INTEL_VERTEX_SHADER_WORKAROUND
 
-  /* Spir-V GLSL pre-processors chokes when passed directly. */
+  /* Use local variable to workaround macro unrolling issue in shaderc. */
   vec3 pos = pPosition;
   gl_Position = point_world_to_ndc(pos);
   finalColor = pColor;
diff --git a/source/blender/draw/intern/shaders/common_gpencil_lib.glsl b/source/blender/draw/intern/shaders/common_gpencil_lib.glsl
index 25d8394ad9f..06b57f34190 100644
--- a/source/blender/draw/intern/shaders/common_gpencil_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_gpencil_lib.glsl
@@ -253,7 +253,8 @@ vec4 gpencil_vertex(vec4 viewport_size,
         x_axis = vec2(1.0, 0.0);
       }
       else { /* GP_STROKE_ALIGNMENT_OBJECT */
-        /* Spir-V GLSL pre-processors chokes when passed directly. */
+
+        /* Use local variable to workaround macro unrolling issue in shaderc. */
         vec3 wpos = wpos1 + ModelMatrix[0].xyz;
         vec4 ndc_x = point_world_to_ndc(wpos);
         vec2 ss_x = gpencil_project_to_screenspace(ndc_x, viewport_size);



More information about the Bf-blender-cvs mailing list