Skip to content

Commit

Permalink
v167 - clang 17.0.1 tested
Browse files Browse the repository at this point in the history
  • Loading branch information
inanevin committed Oct 3, 2023
1 parent 5f0c46f commit 2e43dc1
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 69 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ add_library(Lina::VG ALIAS ${PROJECT_NAME})
target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include)
target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MAJOR=1)
target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MINOR=6)
target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=6)
target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=7)

#--------------------------------------------------------------------
# Subdirectories & linking
Expand Down
7 changes: 3 additions & 4 deletions include/LinaVG/Core/Common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ namespace LinaVG
{
TextureDrawBuffer(){};
TextureDrawBuffer(BackendHandle h, const Vec2& tiling, const Vec2& offset, const Vec4& tint, int drawOrder, DrawBufferShapeType shapeType, BackendHandle clipPosX, BackendHandle clipPosY, BackendHandle clipSizeX, BackendHandle clipSizeY)
: DrawBuffer(drawOrder, DrawBufferType::Textured, shapeType, clipPosX, clipPosY, clipSizeX, clipSizeY), m_isAABuffer(shapeType == DrawBufferShapeType::AA), m_tint(tint), m_textureHandle(h), m_textureUVTiling(tiling), m_textureUVOffset(offset){};
: DrawBuffer(drawOrder, DrawBufferType::Textured, shapeType, clipPosX, clipPosY, clipSizeX, clipSizeY), m_isAABuffer(shapeType == DrawBufferShapeType::AA), m_textureHandle(h), m_textureUVTiling(tiling), m_textureUVOffset(offset), m_tint(tint){};

bool m_isAABuffer = false;
BackendHandle m_textureHandle = 0;
Expand All @@ -912,9 +912,8 @@ namespace LinaVG
{
SDFTextDrawBuffer(){};
SDFTextDrawBuffer(BackendHandle glyphHandle, int drawOrder, const SDFTextOptions& opts, bool isDropShadow, BackendHandle clipPosX, BackendHandle clipPosY, BackendHandle clipSizeX, BackendHandle clipSizeY)
: DrawBuffer(drawOrder, DrawBufferType::SDFText, isDropShadow ? DrawBufferShapeType::DropShadow : DrawBufferShapeType::Shape, clipPosX, clipPosY, clipSizeX, clipSizeY), m_textureHandle(glyphHandle), m_thickness(opts.sdfThickness),
m_softness(opts.sdfSoftness), m_outlineThickness(opts.sdfOutlineThickness),
m_outlineColor(opts.sdfOutlineColor), m_flipAlpha(opts.flipAlpha), m_isDropShadow(isDropShadow){};
: DrawBuffer(drawOrder, DrawBufferType::SDFText, isDropShadow ? DrawBufferShapeType::DropShadow : DrawBufferShapeType::Shape, clipPosX, clipPosY, clipSizeX, clipSizeY),
m_isDropShadow(isDropShadow), m_flipAlpha(opts.flipAlpha), m_thickness(opts.sdfThickness), m_softness(opts.sdfSoftness), m_outlineThickness(opts.sdfOutlineThickness), m_outlineColor(opts.sdfOutlineColor), m_textureHandle(glyphHandle){};

bool m_isDropShadow = false;
bool m_flipAlpha = false;
Expand Down

0 comments on commit 2e43dc1

Please sign in to comment.