Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
flow3r firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
flow3r
flow3r firmware
Commits
13e0510e
Commit
13e0510e
authored
Oct 24, 2023
by
pippin
Browse files
Options
Downloads
Patches
Plain Diff
ctx: sync with upstream
parent
994c78fa
No related branches found
No related tags found
1 merge request
!580
ctx: sync with upstream
Pipeline
#9271
passed
Oct 24, 2023
Stage: check
Stage: build
Stage: deploy
Changes
1
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
components/ctx/ctx.h
+12
-11
12 additions, 11 deletions
components/ctx/ctx.h
with
12 additions
and
11 deletions
components/ctx/ctx.h
+
12
−
11
View file @
13e0510e
...
@@ -5213,12 +5213,10 @@ static inline CtxList *ctx_list_find_custom (CtxList *list,
...
@@ -5213,12 +5213,10 @@ static inline CtxList *ctx_list_find_custom (CtxList *list,
#define CTX_ENABLE_CMYK 1
#define CTX_ENABLE_CMYK 1
#endif
#endif
/* enable color management, slightly increases CtxColor struct size,
can
/* enable color management, slightly increases CtxColor struct size,
should
* be disabled for microcontrollers.
* be disabled for microcontrollers.
*/
*/
#ifndef CTX_ENABLE_CM
#define CTX_ENABLE_CM 1
#endif
#ifndef CTX_EVENTS
#ifndef CTX_EVENTS
#define CTX_EVENTS 1
#define CTX_EVENTS 1
...
@@ -5750,6 +5748,14 @@ static inline CtxList *ctx_list_find_custom (CtxList *list,
...
@@ -5750,6 +5748,14 @@ static inline CtxList *ctx_list_find_custom (CtxList *list,
#define CTX_BAREMETAL 0
#define CTX_BAREMETAL 0
#endif
#endif
#ifndef CTX_ENABLE_CM
#if CTX_BAREMETAL
#define CTX_ENABLE_CM 0
#else
#define CTX_ENABLE_CM 1
#endif
#endif
#if CTX_IMPLEMENTATION
#if CTX_IMPLEMENTATION
#ifndef SQUOZE_IMPLEMENTATION
#ifndef SQUOZE_IMPLEMENTATION
#define SQUOZE_IMPLEMENTATION 1
#define SQUOZE_IMPLEMENTATION 1
...
@@ -20839,13 +20845,10 @@ static inline int ctx_rasterizer_add_point (CtxRasterizer *rasterizer, int x1, i
...
@@ -20839,13 +20845,10 @@ static inline int ctx_rasterizer_add_point (CtxRasterizer *rasterizer, int x1, i
return ctx_edgelist_add_single (&rasterizer->edge_list, (CtxEntry*)&entry);
return ctx_edgelist_add_single (&rasterizer->edge_list, (CtxEntry*)&entry);
}
}
static
uint32_t
ctx_rasterizer_poly_to_edges (CtxRasterizer *rasterizer)
static
void
ctx_rasterizer_poly_to_edges (CtxRasterizer *rasterizer)
{
{
unsigned int count = rasterizer->edge_list.count;
unsigned int count = rasterizer->edge_list.count;
if (CTX_UNLIKELY (count == 0))
return 0;
CtxSegment *entry = (CtxSegment*)&rasterizer->edge_list.entries[0];
CtxSegment *entry = (CtxSegment*)&rasterizer->edge_list.entries[0];
//CtxSegment *entry = &(((CtxSegment*)(rasterizer->edge_list.entries)))[0];
for (unsigned int i = 0; i < count; i++)
for (unsigned int i = 0; i < count; i++)
{
{
if (entry->data.s16[3] < entry->data.s16[1])
if (entry->data.s16[3] < entry->data.s16[1])
...
@@ -20856,7 +20859,6 @@ static uint32_t ctx_rasterizer_poly_to_edges (CtxRasterizer *rasterizer)
...
@@ -20856,7 +20859,6 @@ static uint32_t ctx_rasterizer_poly_to_edges (CtxRasterizer *rasterizer)
}
}
entry++;
entry++;
}
}
return 0;
}
}
static inline void ctx_rasterizer_finish_shape (CtxRasterizer *rasterizer)
static inline void ctx_rasterizer_finish_shape (CtxRasterizer *rasterizer)
...
@@ -21311,8 +21313,7 @@ ctx_rasterizer_fill (CtxRasterizer *rasterizer)
...
@@ -21311,8 +21313,7 @@ ctx_rasterizer_fill (CtxRasterizer *rasterizer)
ctx_rasterizer_finish_shape (rasterizer);
ctx_rasterizer_finish_shape (rasterizer);
uint32_t hash = ctx_rasterizer_poly_to_edges (rasterizer);
ctx_rasterizer_poly_to_edges (rasterizer);
if (hash){};
{
{
ctx_rasterizer_rasterize_edges (rasterizer, rasterizer->state->gstate.fill_rule);
ctx_rasterizer_rasterize_edges (rasterizer, rasterizer->state->gstate.fill_rule);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment