summaryrefslogtreecommitdiff
path: root/src/gx_accel.c
diff options
context:
space:
mode:
authorConnor Behan <connor.behan@gmail.com>2024-06-23 22:24:44 -0300
committerMartin-Éric RACINE <martin-eric.racine@iki.fi>2024-06-24 19:42:15 +0300
commit224f565dec708eb0f85964e2b74c31b87c3e1808 (patch)
treeada80a96d6251b6082a41cb460bfd4a6d533036b /src/gx_accel.c
parent9fbd276f1de0f695f2b884d0778db7a0e12bdc56 (diff)
Suppress majority of compiler warnings
This applies some obvious changes to stop gcc from complaining about dead code, shadow declarations, differing signedness and sections that mix declarations with code. The warning about discarding const qualifiers is more annoying because we pass string literals to some functions which accept non-const pointers. Currently, this takes the following approach. If the function *needs* to accept non-const pointers, cast the string literal as char *. Otherwise, change the function to only accept a const pointer. To anticipate future use cases though, I could also leave function definitions as they are and just always cast string literals. Alternatively, if this is more trouble that it is worth, we could just put up with the warnings. Signed-off-by: Connor Behan <connor.behan@gmail.com>
Diffstat (limited to 'src/gx_accel.c')
-rw-r--r--src/gx_accel.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gx_accel.c b/src/gx_accel.c
index 89c7486..8e68486 100644
--- a/src/gx_accel.c
+++ b/src/gx_accel.c
@@ -1482,7 +1482,7 @@ amd_gx_exa_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
char *src, int src_pitch)
{
GeodeRec *pGeode = GEODEPTR_FROM_PIXMAP(pDst);
- char *dst = pGeode->pExa->memoryBase + exaGetPixmapOffset(pDst);
+ unsigned char *dst = pGeode->pExa->memoryBase + exaGetPixmapOffset(pDst);
int dst_pitch = exaGetPixmapPitch(pDst);
int bpp = pDst->drawable.bitsPerPixel;
@@ -1498,7 +1498,7 @@ amd_gx_exa_DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
char *dst, int dst_pitch)
{
GeodeRec *pGeode = GEODEPTR_FROM_PIXMAP(pSrc);
- char *src = pGeode->pExa->memoryBase + exaGetPixmapOffset(pSrc);
+ unsigned char *src = pGeode->pExa->memoryBase + exaGetPixmapOffset(pSrc);
int src_pitch = exaGetPixmapPitch(pSrc);
int bpp = pSrc->drawable.bitsPerPixel;
@@ -1734,10 +1734,9 @@ amd_gx_exa_PrepareComposite(int op, PicturePtr pSrc, PicturePtr pMsk,
PixmapPtr pxDst)
{
int srcPitch;
- if (!pxSrc || !pSrc->pDrawable) return FALSE;
-
- GeodeRec *pGeode = GEODEPTR_FROM_PIXMAP(pxDst);
amd_gx_exa_fmt_t *sfp, *dfp;
+ GeodeRec *pGeode = GEODEPTR_FROM_PIXMAP(pxDst);
+ if (!pxSrc || !pSrc->pDrawable) return FALSE;
//ErrorF("amd_gx_exa_PrepareComposite()\n");