Mirrors/rive-cpp
0
0
Fork 0
mirror of https://github.com/rive-app/rive-cpp.git synced 2026-01-18 21:21:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Rename draw_clockwise_* shaders to draw_clockwise_atomic_* (#10689) 7e676124de

Browse Source 
The interlock mode these shaders implement is clockwiseAtomic. Let's be
more specific with the naming so we can support other clockwise modes.

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
This commit is contained in:
csmartdalton
2025-10-01 21:15:37 +00:00
parent 89fcbd1e25
commit d03c6773b1
15 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.rive_head
View File

@@ -1 +1 @@
12764e9a3bb3db1a8a9258478fa0c078e4c0ce11
7e676124de940ed882b8d2a733217a50e434320f

16
renderer/shader_hotload/shader_hotload.cpp
View File

@@ -100,14 +100,14 @@ rive::Span<const uint32_t> loadNewShaderFileData()
riveSpirvPath / "atomic_resolve_coalesced.vert.spirv",
riveSpirvPath / "atomic_resolve_coalesced.frag.spirv",
riveSpirvPath / "draw_clockwise_path.vert.spirv",
riveSpirvPath / "draw_clockwise_path.frag.spirv",
riveSpirvPath / "draw_clockwise_interior_triangles.vert.spirv",
riveSpirvPath / "draw_clockwise_interior_triangles.frag.spirv",
riveSpirvPath / "draw_clockwise_atlas_blit.vert.spirv",
riveSpirvPath / "draw_clockwise_atlas_blit.frag.spirv",
riveSpirvPath / "draw_clockwise_image_mesh.vert.spirv",
riveSpirvPath / "draw_clockwise_image_mesh.frag.spirv",
riveSpirvPath / "draw_clockwise_atomic_path.vert.spirv",
riveSpirvPath / "draw_clockwise_atomic_path.frag.spirv",
riveSpirvPath / "draw_clockwise_atomic_interior_triangles.vert.spirv",
riveSpirvPath / "draw_clockwise_atomic_interior_triangles.frag.spirv",
riveSpirvPath / "draw_clockwise_atomic_atlas_blit.vert.spirv",
riveSpirvPath / "draw_clockwise_atomic_atlas_blit.frag.spirv",
riveSpirvPath / "draw_clockwise_atomic_image_mesh.vert.spirv",
riveSpirvPath / "draw_clockwise_atomic_image_mesh.frag.spirv",
riveSpirvPath / "draw_msaa_path.vert.spirv",
riveSpirvPath / "draw_msaa_path.noclipdistance_vert.spirv",

0
renderer/src/shaders/draw_clockwise_image_mesh.glsl → renderer/src/shaders/draw_clockwise_atomic_image_mesh.glsl
View File

0
renderer/src/shaders/draw_clockwise_path.glsl → renderer/src/shaders/draw_clockwise_atomic_path.glsl
View File

2
renderer/src/shaders/spirv/draw_clockwise_atlas_blit.main → renderer/src/shaders/spirv/draw_clockwise_atomic_atlas_blit.main
View File

@@ -10,4 +10,4 @@
#include "common.minified.glsl"
#include "draw_path_common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_path.minified.glsl"
#include "draw_clockwise_atomic_path.minified.glsl"

2
renderer/src/shaders/spirv/draw_clockwise_image_mesh.main → renderer/src/shaders/spirv/draw_clockwise_atomic_image_mesh.main
View File

@@ -9,4 +9,4 @@
#include "specialization.minified.glsl"
#include "common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_image_mesh.minified.glsl"
#include "draw_clockwise_atomic_image_mesh.minified.glsl"

2
renderer/src/shaders/spirv/draw_clockwise_interior_triangles.main → renderer/src/shaders/spirv/draw_clockwise_atomic_interior_triangles.main
View File

@@ -9,4 +9,4 @@
#include "common.minified.glsl"
#include "draw_path_common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_path.minified.glsl"
#include "draw_clockwise_atomic_path.minified.glsl"

2
renderer/src/shaders/spirv/draw_clockwise_path.main → renderer/src/shaders/spirv/draw_clockwise_atomic_path.main
View File

@@ -10,4 +10,4 @@
#include "common.minified.glsl"
#include "draw_path_common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_path.minified.glsl"
#include "draw_clockwise_atomic_path.minified.glsl"

2
renderer/src/shaders/unreal/draw_clockwise_atlas_blit.usf
View File

@@ -14,4 +14,4 @@
#include "common.minified.glsl"
#include "draw_path_common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_path.minified.glsl"
#include "draw_clockwise_atomic_path.minified.glsl"

2
renderer/src/shaders/unreal/draw_clockwise_image_mesh.usf
View File

@@ -13,4 +13,4 @@
#include "specialization.minified.glsl"
#include "common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_image_mesh.minified.glsl"
#include "draw_clockwise_atomic_image_mesh.minified.glsl"

2
renderer/src/shaders/unreal/draw_clockwise_interior_triangles.usf
View File

@@ -13,4 +13,4 @@
#include "common.minified.glsl"
#include "draw_path_common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_path.minified.glsl"
#include "draw_clockwise_atomic_path.minified.glsl"

2
renderer/src/shaders/unreal/draw_clockwise_path.usf
View File

@@ -14,4 +14,4 @@
#include "common.minified.glsl"
#include "draw_path_common.minified.glsl"
#include "advanced_blend.minified.glsl"
#include "draw_clockwise_path.minified.glsl"
#include "draw_clockwise_atomic_path.minified.glsl"

18
renderer/src/vulkan/draw_shader_vulkan.cpp
View File

@@ -152,23 +152,25 @@ DrawShaderVulkan::DrawShaderVulkan(Type type,
case DrawType::midpointFanPatches:
case DrawType::midpointFanCenterAAPatches:
case DrawType::outerCurvePatches:
vertCode = spirv::draw_clockwise_path_vert;
fragCode = spirv::draw_clockwise_path_frag;
vertCode = spirv::draw_clockwise_atomic_path_vert;
fragCode = spirv::draw_clockwise_atomic_path_frag;
break;
case DrawType::interiorTriangulation:
vertCode = spirv::draw_clockwise_interior_triangles_vert;
fragCode = spirv::draw_clockwise_interior_triangles_frag;
vertCode =
spirv::draw_clockwise_atomic_interior_triangles_vert;
fragCode =
spirv::draw_clockwise_atomic_interior_triangles_frag;
break;
case DrawType::atlasBlit:
vertCode = spirv::draw_clockwise_atlas_blit_vert;
fragCode = spirv::draw_clockwise_atlas_blit_frag;
vertCode = spirv::draw_clockwise_atomic_atlas_blit_vert;
fragCode = spirv::draw_clockwise_atomic_atlas_blit_frag;
break;
case DrawType::imageMesh:
vertCode = spirv::draw_clockwise_image_mesh_vert;
fragCode = spirv::draw_clockwise_image_mesh_frag;
vertCode = spirv::draw_clockwise_atomic_image_mesh_vert;
fragCode = spirv::draw_clockwise_atomic_image_mesh_frag;
break;
case DrawType::imageRect:

66
renderer/src/vulkan/vulkan_shaders.cpp
View File

@@ -52,14 +52,14 @@ namespace embedded
#include "generated/shaders/spirv/atomic_resolve_coalesced.frag.h"
// InterlockMode::clockwiseAtomic shaders.
#include "generated/shaders/spirv/draw_clockwise_path.vert.h"
#include "generated/shaders/spirv/draw_clockwise_path.frag.h"
#include "generated/shaders/spirv/draw_clockwise_interior_triangles.vert.h"
#include "generated/shaders/spirv/draw_clockwise_interior_triangles.frag.h"
#include "generated/shaders/spirv/draw_clockwise_atlas_blit.vert.h"
#include "generated/shaders/spirv/draw_clockwise_atlas_blit.frag.h"
#include "generated/shaders/spirv/draw_clockwise_image_mesh.vert.h"
#include "generated/shaders/spirv/draw_clockwise_image_mesh.frag.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_path.vert.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_path.frag.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_interior_triangles.vert.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_interior_triangles.frag.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_atlas_blit.vert.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_atlas_blit.frag.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_image_mesh.vert.h"
#include "generated/shaders/spirv/draw_clockwise_atomic_image_mesh.frag.h"
// InterlockMode::msaa shaders.
#include "generated/shaders/spirv/draw_msaa_path.vert.h"
@@ -158,22 +158,22 @@ rive::Span<const uint32_t> atomic_resolve_coalesced_frag =
rive::make_span(embedded::atomic_resolve_coalesced_frag);
// InterlockMode::clockwiseAtomic shaders.
rive::Span<const uint32_t> draw_clockwise_path_vert =
rive::make_span(embedded::draw_clockwise_path_vert);
rive::Span<const uint32_t> draw_clockwise_path_frag =
rive::make_span(embedded::draw_clockwise_path_frag);
rive::Span<const uint32_t> draw_clockwise_interior_triangles_vert =
rive::make_span(embedded::draw_clockwise_interior_triangles_vert);
rive::Span<const uint32_t> draw_clockwise_interior_triangles_frag =
rive::make_span(embedded::draw_clockwise_interior_triangles_frag);
rive::Span<const uint32_t> draw_clockwise_atlas_blit_vert =
rive::make_span(embedded::draw_clockwise_atlas_blit_vert);
rive::Span<const uint32_t> draw_clockwise_atlas_blit_frag =
rive::make_span(embedded::draw_clockwise_atlas_blit_frag);
rive::Span<const uint32_t> draw_clockwise_image_mesh_vert =
rive::make_span(embedded::draw_clockwise_image_mesh_vert);
rive::Span<const uint32_t> draw_clockwise_image_mesh_frag =
rive::make_span(embedded::draw_clockwise_image_mesh_frag);
rive::Span<const uint32_t> draw_clockwise_atomic_path_vert =
rive::make_span(embedded::draw_clockwise_atomic_path_vert);
rive::Span<const uint32_t> draw_clockwise_atomic_path_frag =
rive::make_span(embedded::draw_clockwise_atomic_path_frag);
rive::Span<const uint32_t> draw_clockwise_atomic_interior_triangles_vert =
rive::make_span(embedded::draw_clockwise_atomic_interior_triangles_vert);
rive::Span<const uint32_t> draw_clockwise_atomic_interior_triangles_frag =
rive::make_span(embedded::draw_clockwise_atomic_interior_triangles_frag);
rive::Span<const uint32_t> draw_clockwise_atomic_atlas_blit_vert =
rive::make_span(embedded::draw_clockwise_atomic_atlas_blit_vert);
rive::Span<const uint32_t> draw_clockwise_atomic_atlas_blit_frag =
rive::make_span(embedded::draw_clockwise_atomic_atlas_blit_frag);
rive::Span<const uint32_t> draw_clockwise_atomic_image_mesh_vert =
rive::make_span(embedded::draw_clockwise_atomic_image_mesh_vert);
rive::Span<const uint32_t> draw_clockwise_atomic_image_mesh_frag =
rive::make_span(embedded::draw_clockwise_atomic_image_mesh_frag);
// InterlockMode::msaa shaders.
rive::Span<const uint32_t> draw_msaa_path_vert =
@@ -260,14 +260,16 @@ void hotload_shaders(rive::Span<const uint32_t> spirvData)
spirv::atomic_resolve_coalesced_vert = readNextBytecodeSpan();
spirv::atomic_resolve_coalesced_frag = readNextBytecodeSpan();
spirv::draw_clockwise_path_vert = readNextBytecodeSpan();
spirv::draw_clockwise_path_frag = readNextBytecodeSpan();
spirv::draw_clockwise_interior_triangles_vert = readNextBytecodeSpan();
spirv::draw_clockwise_interior_triangles_frag = readNextBytecodeSpan();
spirv::draw_clockwise_atlas_blit_vert = readNextBytecodeSpan();
spirv::draw_clockwise_atlas_blit_frag = readNextBytecodeSpan();
spirv::draw_clockwise_image_mesh_vert = readNextBytecodeSpan();
spirv::draw_clockwise_image_mesh_frag = readNextBytecodeSpan();
spirv::draw_clockwise_atomic_path_vert = readNextBytecodeSpan();
spirv::draw_clockwise_atomic_path_frag = readNextBytecodeSpan();
spirv::draw_clockwise_atomic_interior_triangles_vert =
readNextBytecodeSpan();
spirv::draw_clockwise_atomic_interior_triangles_frag =
readNextBytecodeSpan();
spirv::draw_clockwise_atomic_atlas_blit_vert = readNextBytecodeSpan();
spirv::draw_clockwise_atomic_atlas_blit_frag = readNextBytecodeSpan();
spirv::draw_clockwise_atomic_image_mesh_vert = readNextBytecodeSpan();
spirv::draw_clockwise_atomic_image_mesh_frag = readNextBytecodeSpan();
spirv::draw_msaa_path_vert = readNextBytecodeSpan();
spirv::draw_msaa_path_noclipdistance_vert = readNextBytecodeSpan();

16
renderer/src/vulkan/vulkan_shaders.hpp
View File

@@ -52,14 +52,14 @@ extern rive::Span<const uint32_t> atomic_resolve_coalesced_vert;
extern rive::Span<const uint32_t> atomic_resolve_coalesced_frag;
// InterlockMode::clockwiseAtomic shaders.
extern rive::Span<const uint32_t> draw_clockwise_path_vert;
extern rive::Span<const uint32_t> draw_clockwise_path_frag;
extern rive::Span<const uint32_t> draw_clockwise_interior_triangles_vert;
extern rive::Span<const uint32_t> draw_clockwise_interior_triangles_frag;
extern rive::Span<const uint32_t> draw_clockwise_atlas_blit_vert;
extern rive::Span<const uint32_t> draw_clockwise_atlas_blit_frag;
extern rive::Span<const uint32_t> draw_clockwise_image_mesh_vert;
extern rive::Span<const uint32_t> draw_clockwise_image_mesh_frag;
extern rive::Span<const uint32_t> draw_clockwise_atomic_path_vert;
extern rive::Span<const uint32_t> draw_clockwise_atomic_path_frag;
extern rive::Span<const uint32_t> draw_clockwise_atomic_interior_triangles_vert;
extern rive::Span<const uint32_t> draw_clockwise_atomic_interior_triangles_frag;
extern rive::Span<const uint32_t> draw_clockwise_atomic_atlas_blit_vert;
extern rive::Span<const uint32_t> draw_clockwise_atomic_atlas_blit_frag;
extern rive::Span<const uint32_t> draw_clockwise_atomic_image_mesh_vert;
extern rive::Span<const uint32_t> draw_clockwise_atomic_image_mesh_frag;
// InterlockMode::msaa shaders.
extern rive::Span<const uint32_t> draw_msaa_path_vert;