MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into rlsw

Browse Source
This commit is contained in:
Ray 2025-10-23 17:31:14 +02:00 committed by GitHub
commit 70a7dbf5cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 79 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/external/rlsw.h vendored
View File

@ -156,6 +156,12 @@
#define SW_CLIP_EPSILON 1e-4f
#endif
#ifdef __cplusplus
#define CURLY_INIT(name) name
#else
#define CURLY_INIT(name) (name)
#endif
//----------------------------------------------------------------------------------
// OpenGL Compatibility Types
//----------------------------------------------------------------------------------
@ -1573,7 +1579,7 @@ static inline void sw_framebuffer_blit_to_##name(
int xSrc, int ySrc, int wSrc, int hSrc, \
DST_PTR_T *dst) \
{ \
const uint8_t *srcBase = RLSW.framebuffer.color; \
const uint8_t *srcBase = (uint8_t*)RLSW.framebuffer.color; \
int fbWidth = RLSW.framebuffer.width; \
\
uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \
@ -1596,7 +1602,7 @@ static inline void sw_framebuffer_blit_to_##name(
int xSrc, int ySrc, int wSrc, int hSrc, \
DST_PTR_T *dst) \
{ \
const uint8_t *srcBase = RLSW.framebuffer.color; \
const uint8_t *srcBase = (uint8_t *)RLSW.framebuffer.color; \
int fbWidth = RLSW.framebuffer.width; \
\
uint32_t xScale = ((uint32_t)wSrc << 16)/(uint32_t)wDst; \
@ -2457,6 +2463,15 @@ static inline void FUNC_NAME(const sw_texture_t *tex, const sw_vertex_t *start,
/* Scanline rasterization */ \
for (int x = xStart; x < xEnd; x++) \
{ \
/* Pixel color computation */ \
float wRcp = 1.0f/w; \
float srcColor[4] = { \
color[0]*wRcp, \
color[1]*wRcp, \
color[2]*wRcp, \
color[3]*wRcp \
}; \
\
/* Test and write depth */ \
if (ENABLE_DEPTH_TEST) \
{ \
@ -2467,15 +2482,6 @@ static inline void FUNC_NAME(const sw_texture_t *tex, const sw_vertex_t *start,
\
sw_framebuffer_write_depth(dptr, z); \
\
/* Pixel color computation */ \
float wRcp = 1.0f/w; \
float srcColor[4] = { \
color[0]*wRcp, \
color[1]*wRcp, \
color[2]*wRcp, \
color[3]*wRcp \
}; \
\
if (ENABLE_TEXTURE) \
{ \
float texColor[4]; \
@ -2937,6 +2943,14 @@ static inline void FUNC_NAME(void)
/* Scanline rasterization */ \
for (int x = xMin; x < xMax; x++) \
{ \
/* Pixel color computation */ \
float srcColor[4] = { \
color[0], \
color[1], \
color[2], \
color[3] \
}; \
\
/* Test and write depth */ \
if (ENABLE_DEPTH_TEST) \
{ \
@ -2947,14 +2961,6 @@ static inline void FUNC_NAME(void)
\
sw_framebuffer_write_depth(dptr, z); \
\
/* Pixel color computation */ \
float srcColor[4] = { \
color[0], \
color[1], \
color[2], \
color[3] \
}; \
\
if (ENABLE_TEXTURE) \
{ \
float texColor[4]; \
@ -3235,6 +3241,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
{ \
int offset = (y1 + i)*fbWidth + (x1 + (j >> 16)); \
void *dptr = GET_DEPTH_PTR(dBuffer, offset); \
void *cptr = NULL; \
\
if (ENABLE_DEPTH_TEST) \
{ \
@ -3244,7 +3251,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
\
sw_framebuffer_write_depth(dptr, z); \
\
void *cptr = GET_COLOR_PTR(cBuffer, offset); \
cptr = GET_COLOR_PTR(cBuffer, offset); \
\
if (ENABLE_COLOR_BLEND) \
{ \
@ -3271,6 +3278,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
{ \
int offset = (y1 + (j >> 16))*fbWidth + (x1 + i); \
void *dptr = GET_DEPTH_PTR(dBuffer, offset); \
void *cptr = NULL; \
\
if (ENABLE_DEPTH_TEST) \
{ \
@ -3280,7 +3288,7 @@ static inline void FUNC_NAME(const sw_vertex_t *v0, const sw_vertex_t *v1) \
\
sw_framebuffer_write_depth(dptr, z); \
\
void *cptr = GET_COLOR_PTR(cBuffer, offset); \
cptr = GET_COLOR_PTR(cBuffer, offset); \
\
if (ENABLE_COLOR_BLEND) \
{ \
@ -3561,9 +3569,14 @@ static inline void sw_poly_line_render(void)
const sw_vertex_t *vertices = RLSW.vertexBuffer;
int cm1 = RLSW.vertexCounter - 1;
for (int i = 0; i < cm1; i++) sw_line_render((sw_vertex_t[2]){ vertices[i], vertices[i + 1] });
for (int i = 0; i < cm1; i++)
{
sw_vertex_t verts[2] = { vertices[i], vertices[i + 1] };
sw_line_render(verts);
}
sw_line_render((sw_vertex_t[2]){ vertices[cm1], vertices[0] });
sw_vertex_t verts[2] = { vertices[cm1], vertices[0] };
sw_line_render(verts);
}
static inline void sw_poly_fill_render(void)
@ -3691,10 +3704,10 @@ bool swInit(int w, int h)
swViewport(0, 0, w, h);
swScissor(0, 0, w, h);
RLSW.loadedTextures = SW_MALLOC(SW_MAX_TEXTURES*sizeof(sw_texture_t));
RLSW.loadedTextures = (sw_texture_t *)SW_MALLOC(SW_MAX_TEXTURES*sizeof(sw_texture_t));
if (RLSW.loadedTextures == NULL) { swClose(); return false; }
RLSW.freeTextureIds = SW_MALLOC(SW_MAX_TEXTURES*sizeof(uint32_t));
RLSW.freeTextureIds = (uint32_t *)SW_MALLOC(SW_MAX_TEXTURES*sizeof(uint32_t));
if (RLSW.loadedTextures == NULL) { swClose(); return false; }
RLSW.clearColor[0] = 0.0f;
@ -3772,7 +3785,7 @@ void swClose(void)
SW_FREE(RLSW.loadedTextures);
SW_FREE(RLSW.freeTextureIds);
RLSW = (sw_context_t) { 0 };
RLSW = CURLY_INIT(sw_context_t) { 0 };
}
bool swResizeFramebuffer(int w, int h)
@ -3782,7 +3795,7 @@ bool swResizeFramebuffer(int w, int h)
void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type, void *pixels)
{
sw_pixelformat_t pFormat = sw_get_pixel_format(format, type);
sw_pixelformat_t pFormat = (sw_pixelformat_t)sw_get_pixel_format(format, type);
if (w <= 0)
{
@ -3804,26 +3817,26 @@ void swCopyFramebuffer(int x, int y, int w, int h, SWformat format, SWtype type,
switch (pFormat)
{
case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_copy_to_R5G6B5(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_copy_to_R8G8B8(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_copy_to_R5G5B5A1(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_copy_to_R4G4B4A4(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_copy_to_R8G8B8A8(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_copy_to_R32(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_copy_to_R32G32B32(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_copy_to_R32G32B32A32(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_copy_to_R16(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_copy_to_R16G16B16(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_copy_to_R16G16B16A16(x, y, w, h, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_copy_to_GRAYALPHA(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_copy_to_R5G6B5(x, y, w, h, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_copy_to_R8G8B8(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_copy_to_R5G5B5A1(x, y, w, h, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_copy_to_R4G4B4A4(x, y, w, h, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_copy_to_R8G8B8A8(x, y, w, h, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_copy_to_R32(x, y, w, h, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_copy_to_R32G32B32(x, y, w, h, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_copy_to_R32G32B32A32(x, y, w, h, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_copy_to_R16(x, y, w, h, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_copy_to_R16G16B16(x, y, w, h, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_copy_to_R16G16B16A16(x, y, w, h, (sw_half_t *)pixels); break;
default: RLSW.errCode = SW_INVALID_ENUM; break;
}
}
void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySrc, int wSrc, int hSrc, SWformat format, SWtype type, void *pixels)
{
sw_pixelformat_t pFormat = sw_get_pixel_format(format, type);
sw_pixelformat_t pFormat = (sw_pixelformat_t)sw_get_pixel_format(format, type);
if (wSrc <= 0)
{
@ -3845,19 +3858,19 @@ void swBlitFramebuffer(int xDst, int yDst, int wDst, int hDst, int xSrc, int ySr
switch (pFormat)
{
case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_blit_to_R5G6B5(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_blit_to_R8G8B8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_blit_to_R5G5B5A1(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_blit_to_R4G4B4A4(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_blit_to_R8G8B8A8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_blit_to_R32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_blit_to_R32G32B32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_blit_to_R32G32B32A32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_blit_to_R16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_blit_to_R16G16B16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_blit_to_R16G16B16A16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: sw_framebuffer_blit_to_GRAYALPHA(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G6B5: sw_framebuffer_blit_to_R5G6B5(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8: sw_framebuffer_blit_to_R8G8B8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: sw_framebuffer_blit_to_R5G5B5A1(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: sw_framebuffer_blit_to_R4G4B4A4(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint16_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: sw_framebuffer_blit_to_R8G8B8A8(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32: sw_framebuffer_blit_to_R32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (uint8_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32: sw_framebuffer_blit_to_R32G32B32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (float *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: sw_framebuffer_blit_to_R32G32B32A32(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (float*)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16: sw_framebuffer_blit_to_R16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16: sw_framebuffer_blit_to_R16G16B16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (sw_half_t *)pixels); break;
case SW_PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: sw_framebuffer_blit_to_R16G16B16A16(xDst, yDst, wDst, hDst, xSrc, ySrc, wSrc, hSrc, (sw_half_t *)pixels); break;
default: RLSW.errCode = SW_INVALID_ENUM; break;
}
}
@ -4427,7 +4440,7 @@ void swBegin(SWdraw mode)
void swEnd(void)
{
RLSW.drawMode = 0;
RLSW.drawMode = (SWdraw)0;
}
void swVertex2i(int x, int y)
@ -4612,9 +4625,9 @@ void swBindArray(SWarray type, void *buffer)
{
switch (type)
{
case SW_VERTEX_ARRAY: RLSW.array.positions = buffer; break;
case SW_TEXTURE_COORD_ARRAY: RLSW.array.texcoords = buffer; break;
case SW_COLOR_ARRAY: RLSW.array.colors = buffer; break;
case SW_VERTEX_ARRAY: RLSW.array.positions = (float *)buffer; break;
case SW_TEXTURE_COORD_ARRAY: RLSW.array.texcoords = (float *)buffer; break;
case SW_COLOR_ARRAY: RLSW.array.colors = (uint8_t *)buffer; break;
default: break;
}
}
@ -4707,7 +4720,7 @@ void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy
if (copy)
{
int bytes = sw_get_pixel_bytes(pixelFormat);
int bytes = sw_get_pixel_bytes((sw_pixelformat_t)pixelFormat);
int size = bytes*width*height;
texture->pixels.ptr = SW_MALLOC(size);
@ -4728,7 +4741,7 @@ void swTexImage2D(int width, int height, SWformat format, SWtype type, bool copy
texture->height = height;
texture->wMinus1 = width - 1;
texture->hMinus1 = height - 1;
texture->format = pixelFormat;
texture->format = (sw_pixelformat_t)pixelFormat;
texture->tx = 1.0f/width;
texture->ty = 1.0f/height;
texture->copy = copy;
@ -4756,7 +4769,7 @@ void swTexParameteri(int param, int value)
return;
}
texture->minFilter = value;
texture->minFilter = (SWfilter)value;
} break;
case SW_TEXTURE_MAG_FILTER:
{
@ -4766,7 +4779,7 @@ void swTexParameteri(int param, int value)
return;
}
texture->magFilter = value;
texture->magFilter = (SWfilter)value;
} break;
case SW_TEXTURE_WRAP_S:
{
@ -4776,7 +4789,7 @@ void swTexParameteri(int param, int value)
return;
}
texture->sWrap = value;
texture->sWrap = (SWwrap)value;
} break;
case SW_TEXTURE_WRAP_T:
{
@ -4786,7 +4799,7 @@ void swTexParameteri(int param, int value)
return;
}
texture->tWrap = value;
texture->tWrap = (SWwrap)value;
} break;
default: RLSW.errCode = SW_INVALID_ENUM; break;
}