encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_RenderGeometry / software: TRIANGLE_GET_TEXTCOORD interpolates up to the max values included, so reduce by 1

This commit is contained in:
Sylvain 2022-01-02 22:34:56 +01:00
parent 4b112620a3
commit 8622eda9e9
No known key found for this signature in database
GPG Key ID: 5F87E02E5BC0939E
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/render/software/SDL_triangle.c
View File

@ -119,8 +119,8 @@ void trianglepoint_2_fixedpoint(SDL_Point *a) {
a->y <<= FP_BITS; a->y <<= FP_BITS;
} }
/* bounding rect of three points */ /* bounding rect of three points (in fixed point) */
static void bounding_rect(const SDL_Point *a, const SDL_Point *b, const SDL_Point *c, SDL_Rect *r) static void bounding_rect_fixedpoint(const SDL_Point *a, const SDL_Point *b, const SDL_Point *c, SDL_Rect *r)
{ {
int min_x = SDL_min(a->x, SDL_min(b->x, c->x)); int min_x = SDL_min(a->x, SDL_min(b->x, c->x));
int max_x = SDL_max(a->x, SDL_max(b->x, c->x)); int max_x = SDL_max(a->x, SDL_max(b->x, c->x));
@ -133,6 +133,20 @@ static void bounding_rect(const SDL_Point *a, const SDL_Point *b, const SDL_Poin
r->h = (max_y - min_y) >> FP_BITS; r->h = (max_y - min_y) >> FP_BITS;
} }
/* bounding rect of three points */
static void bounding_rect(const SDL_Point *a, const SDL_Point *b, const SDL_Point *c, SDL_Rect *r)
{
int min_x = SDL_min(a->x, SDL_min(b->x, c->x));
int max_x = SDL_max(a->x, SDL_max(b->x, c->x));
int min_y = SDL_min(a->y, SDL_min(b->y, c->y));
int max_y = SDL_max(a->y, SDL_max(b->y, c->y));
r->x = min_x;
r->y = min_y;
r->w = (max_x - min_x);
r->h = (max_y - min_y);
}
/* Triangle rendering, using Barycentric coordinates (w0, w1, w2) /* Triangle rendering, using Barycentric coordinates (w0, w1, w2)
* *
* The cross product isn't computed from scratch at each iteration, * The cross product isn't computed from scratch at each iteration,
@ -232,7 +246,7 @@ int SDL_SW_FillTriangle(SDL_Surface *dst, SDL_Point *d0, SDL_Point *d1, SDL_Poin
} }
} }
bounding_rect(d0, d1, d2, &dstrect); bounding_rect_fixedpoint(d0, d1, d2, &dstrect);
{ {
/* Clip triangle rect with surface rect */ /* Clip triangle rect with surface rect */
@ -438,7 +452,6 @@ int SDL_SW_BlitTriangle(
SDL_BlendMode blend; SDL_BlendMode blend;
SDL_Rect srcrect;
SDL_Rect dstrect; SDL_Rect dstrect;
SDL_Point s2_x_area; SDL_Point s2_x_area;
@ -495,11 +508,29 @@ int SDL_SW_BlitTriangle(
is_uniform = COLOR_EQ(c0, c1) && COLOR_EQ(c1, c2); is_uniform = COLOR_EQ(c0, c1) && COLOR_EQ(c1, c2);
bounding_rect(s0, s1, s2, &srcrect); bounding_rect_fixedpoint(d0, d1, d2, &dstrect);
bounding_rect(d0, d1, d2, &dstrect);
SDL_GetSurfaceBlendMode(src, &blend); SDL_GetSurfaceBlendMode(src, &blend);
/* TRIANGLE_GET_TEXTCOORD interpolates up to the max values included, so reduce by 1 */
{
SDL_Rect srcrect;
int maxx, maxy;
bounding_rect(s0, s1, s2, &srcrect);
maxx = srcrect.x + srcrect.w;
maxy = srcrect.y + srcrect.h;
if (srcrect.w > 0) {
if (s0->x == maxx) s0->x--;
if (s1->x == maxx) s1->x--;
if (s2->x == maxx) s2->x--;
}
if (srcrect.h > 0) {
if (s0->y == maxy) s0->y--;
if (s1->y == maxy) s1->y--;
if (s2->y == maxy) s2->y--;
}
}
if (is_uniform) { if (is_uniform) {
// SDL_GetSurfaceColorMod(src, &r, &g, &b); // SDL_GetSurfaceColorMod(src, &r, &g, &b);
has_modulation = c0.r != 255 || c0.g != 255 || c0.b != 255 || c0.a != 255;; has_modulation = c0.r != 255 || c0.g != 255 || c0.b != 255 || c0.a != 255;;