summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--amiga/bitmap.c8
-rwxr-xr-xamiga/bitmap.h5
-rwxr-xr-xamiga/plotters.c172
3 files changed, 126 insertions, 59 deletions
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 77f85d1df..271f4af1b 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -20,6 +20,7 @@
#include "image/bitmap.h"
#include "amiga/bitmap.h"
#include <proto/exec.h>
+#include <proto/picasso96api.h>
/**
* Create a bitmap.
@@ -34,7 +35,7 @@ void *bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
- bitmap = AllocVec(sizeof(struct bitmap),MEMF_PRIVATE);
+ bitmap = AllocVec(sizeof(struct bitmap),MEMF_PRIVATE | MEMF_CLEAR);
if(bitmap)
{
bitmap->pixdata = AllocVecTags(width*height*4,
@@ -101,6 +102,7 @@ void bitmap_destroy(void *bitmap)
if(bm)
{
+ if(bm->nativebm) p96FreeBitMap(bm->nativebm);
FreeVec(bm->pixdata);
bm->pixdata = NULL;
FreeVec(bm);
@@ -129,6 +131,10 @@ bool bitmap_save(void *bitmap, const char *path, unsigned flags)
* \param bitmap a bitmap, as returned by bitmap_create()
*/
void bitmap_modified(void *bitmap) {
+ struct bitmap *bm = bitmap;
+
+ p96FreeBitMap(bm->nativebm);
+ bm->nativebm = NULL;
}
diff --git a/amiga/bitmap.h b/amiga/bitmap.h
index 48cc0c125..cf49ffab9 100755
--- a/amiga/bitmap.h
+++ b/amiga/bitmap.h
@@ -19,11 +19,16 @@
#ifndef AMIGA_BITMAP_H
#define AMIGA_BITMAP_H
#include <exec/types.h>
+#include <proto/graphics.h>
+
struct bitmap {
int width;
int height;
UBYTE *pixdata;
bool opaque;
+ struct BitMap *nativebm;
+ int nativebmwidth;
+ int nativebmheight;
};
#endif
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 2fc407031..731375042 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -318,25 +318,41 @@ bool ami_bitmap(int x, int y, int width, int height,
SetRPAttrs(currp,RPTAG_BPenColor,p96EncodeColor(RGBFB_A8B8G8R8,bg),
TAG_DONE);
*/
- ri.Memory = bitmap->pixdata;
- ri.BytesPerRow = bitmap->width * 4;
- ri.RGBFormat = RGBFB_R8G8B8A8;
- tbm = p96AllocBitMap(bitmap->width,bitmap->height,32,BMF_DISPLAYABLE,currp->BitMap,RGBFB_R8G8B8A8);
- InitRastPort(&trp);
- trp.BitMap = tbm;
- p96WritePixelArray((struct RenderInfo *)&ri,0,0,&trp,0,0,bitmap->width,bitmap->height);
+ if(bitmap->nativebm)
+ {
+ if((bitmap->nativebmwidth != width) || (bitmap->nativebmheight != height))
+ {
+ p96FreeBitMap(bitmap->nativebm);
+ bitmap->nativebm = NULL;
+ }
+ else
+ {
+ tbm = bitmap->nativebm;
+ }
+ }
- if((bitmap->width != width) || (bitmap->height != height))
+ if(!bitmap->nativebm)
{
- struct BitMap *scaledbm;
- struct BitScaleArgs bsa;
+ ri.Memory = bitmap->pixdata;
+ ri.BytesPerRow = bitmap->width * 4;
+ ri.RGBFormat = RGBFB_R8G8B8A8;
- scaledbm = p96AllocBitMap(width,height,32,BMF_DISPLAYABLE,currp->BitMap,RGBFB_R8G8B8A8);
+ tbm = p96AllocBitMap(bitmap->width,bitmap->height,32,BMF_DISPLAYABLE,currp->BitMap,RGBFB_R8G8B8A8);
+ InitRastPort(&trp);
+ trp.BitMap = tbm;
+ p96WritePixelArray((struct RenderInfo *)&ri,0,0,&trp,0,0,bitmap->width,bitmap->height);
- if(GfxBase->lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
+ if((bitmap->width != width) || (bitmap->height != height))
{
- CompositeTags(COMPOSITE_Src_Over_Dest,tbm,scaledbm,
+ struct BitMap *scaledbm;
+ struct BitScaleArgs bsa;
+
+ scaledbm = p96AllocBitMap(width,height,32,BMF_DISPLAYABLE,currp->BitMap,RGBFB_R8G8B8A8);
+
+ if(GfxBase->lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
+ {
+ CompositeTags(COMPOSITE_Src_Over_Dest,tbm,scaledbm,
COMPTAG_ScaleX,COMP_FLOAT_TO_FIX(width/bitmap->width),
COMPTAG_ScaleY,COMP_FLOAT_TO_FIX(height/bitmap->height),
COMPTAG_Flags,COMPFLAG_IgnoreDestAlpha,
@@ -348,58 +364,78 @@ bool ami_bitmap(int x, int y, int width, int height,
COMPTAG_OffsetY,0,
COMPTAG_FriendBitMap,currp->BitMap,
TAG_DONE);
- }
- else /* do it the old-fashioned way. This is pretty slow, but probably
+ }
+ else /* do it the old-fashioned way. This is pretty slow, but probably
uses Composite() on OS4.1 anyway, so we're only saving a blit really. */
- {
- bsa.bsa_SrcX = 0;
- bsa.bsa_SrcY = 0;
- bsa.bsa_SrcWidth = bitmap->width;
- bsa.bsa_SrcHeight = bitmap->height;
- bsa.bsa_DestX = 0;
- bsa.bsa_DestY = 0;
- // bsa.bsa_DestWidth = width;
- // bsa.bsa_DestHeight = height;
- bsa.bsa_XSrcFactor = bitmap->width;
- bsa.bsa_XDestFactor = width;
- bsa.bsa_YSrcFactor = bitmap->height;
- bsa.bsa_YDestFactor = height;
- bsa.bsa_SrcBitMap = tbm;
- bsa.bsa_DestBitMap = scaledbm;
- bsa.bsa_Flags = 0;
-
- BitMapScale(&bsa);
- }
+ {
+ bsa.bsa_SrcX = 0;
+ bsa.bsa_SrcY = 0;
+ bsa.bsa_SrcWidth = bitmap->width;
+ bsa.bsa_SrcHeight = bitmap->height;
+ bsa.bsa_DestX = 0;
+ bsa.bsa_DestY = 0;
+ // bsa.bsa_DestWidth = width;
+ // bsa.bsa_DestHeight = height;
+ bsa.bsa_XSrcFactor = bitmap->width;
+ bsa.bsa_XDestFactor = width;
+ bsa.bsa_YSrcFactor = bitmap->height;
+ bsa.bsa_YDestFactor = height;
+ bsa.bsa_SrcBitMap = tbm;
+ bsa.bsa_DestBitMap = scaledbm;
+ bsa.bsa_Flags = 0;
+
+ BitMapScale(&bsa);
+ }
- BltBitMapTags(BLITA_Width,width,
- BLITA_Height,height,
- BLITA_Source,scaledbm,
- BLITA_Dest,currp,
- BLITA_DestX,x,
- BLITA_DestY,y,
- BLITA_SrcType,BLITT_BITMAP,
- BLITA_DestType,BLITT_RASTPORT,
- BLITA_UseSrcAlpha,!bitmap->opaque,
- TAG_DONE);
+ BltBitMapTags(BLITA_Width,width,
+ BLITA_Height,height,
+ BLITA_Source,scaledbm,
+ BLITA_Dest,currp,
+ BLITA_DestX,x,
+ BLITA_DestY,y,
+ BLITA_SrcType,BLITT_BITMAP,
+ BLITA_DestType,BLITT_RASTPORT,
+ BLITA_UseSrcAlpha,!bitmap->opaque,
+ TAG_DONE);
+
+ bitmap->nativebm = scaledbm;
+ //p96FreeBitMap(scaledbm);
- p96FreeBitMap(scaledbm);
+ }
+ else
+ {
+ BltBitMapTags(BLITA_Width,width,
+ BLITA_Height,height,
+ BLITA_Source,tbm,
+ BLITA_Dest,currp,
+ BLITA_DestX,x,
+ BLITA_DestY,y,
+ BLITA_SrcType,BLITT_BITMAP,
+ BLITA_DestType,BLITT_RASTPORT,
+ BLITA_UseSrcAlpha,!bitmap->opaque,
+ TAG_DONE);
+
+ bitmap->nativebm = tbm;
+ }
+ bitmap->nativebmwidth = width;
+ bitmap->nativebmheight = height;
}
else
{
BltBitMapTags(BLITA_Width,width,
BLITA_Height,height,
- BLITA_Source,&trp,
+ BLITA_Source,tbm,
BLITA_Dest,currp,
BLITA_DestX,x,
BLITA_DestY,y,
- BLITA_SrcType,BLITT_RASTPORT,
+ BLITA_SrcType,BLITT_BITMAP,
BLITA_DestType,BLITT_RASTPORT,
BLITA_UseSrcAlpha,!bitmap->opaque,
TAG_DONE);
}
- p96FreeBitMap(tbm);
+// p96FreeBitMap(tbm);
return true;
}
@@ -418,14 +454,34 @@ bool ami_bitmap_tile(int x, int y, int width, int height,
SetRPAttrs(currp,RPTAG_BPenColor,p96EncodeColor(RGBFB_A8B8G8R8,bg),
TAG_DONE);
*/
- ri.Memory = bitmap->pixdata;
- ri.BytesPerRow = bitmap->width * 4;
- ri.RGBFormat = RGBFB_R8G8B8A8;
- tbm = p96AllocBitMap(bitmap->width,bitmap->height,32,0,currp->BitMap,RGBFB_R8G8B8A8);
- InitRastPort(&trp);
- trp.BitMap = tbm;
- p96WritePixelArray((struct RenderInfo *)&ri,0,0,&trp,0,0,bitmap->width,bitmap->height);
+ if(bitmap->nativebm)
+ {
+ if((bitmap->nativebmwidth != bitmap->width) || (bitmap->nativebmheight != bitmap->height))
+ {
+ p96FreeBitMap(bitmap->nativebm);
+ bitmap->nativebm = NULL;
+ }
+ else
+ {
+ tbm = bitmap->nativebm;
+ }
+ }
+
+ if(!bitmap->nativebm)
+ {
+ ri.Memory = bitmap->pixdata;
+ ri.BytesPerRow = bitmap->width * 4;
+ ri.RGBFormat = RGBFB_R8G8B8A8;
+
+ tbm = p96AllocBitMap(bitmap->width,bitmap->height,32,0,currp->BitMap,RGBFB_R8G8B8A8);
+ InitRastPort(&trp);
+ trp.BitMap = tbm;
+ p96WritePixelArray((struct RenderInfo *)&ri,0,0,&trp,0,0,bitmap->width,bitmap->height);
+ bitmap->nativebm = tbm;
+ bitmap->nativebmwidth = bitmap->width;
+ bitmap->nativebmheight = bitmap->height;
+ }
max_width = (repeat_x ? scrn->Width : width);
max_height = (repeat_y ? scrn->Height : height);
@@ -457,18 +513,18 @@ bool ami_bitmap_tile(int x, int y, int width, int height,
BltBitMapTags(BLITA_Width,wf,
BLITA_Height,hf,
- BLITA_Source,&trp,
+ BLITA_Source,tbm,
BLITA_Dest,currp,
BLITA_DestX,x+xf,
BLITA_DestY,y+yf,
- BLITA_SrcType,BLITT_RASTPORT,
+ BLITA_SrcType,BLITT_BITMAP,
BLITA_DestType,BLITT_RASTPORT,
BLITA_UseSrcAlpha,!bitmap->opaque,
TAG_DONE);
}
}
- p96FreeBitMap(tbm);
+// p96FreeBitMap(tbm);
return true;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 05:04:40 +0000