Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/c80551b64b57b6200bd0ea012dd14118725ad64d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/c80551b64b57b6200bd0ea012dd14118725ad64d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/c80551b64b57b6200bd0ea012dd14118725ad64d
The branch, master has been updated
via c80551b64b57b6200bd0ea012dd14118725ad64d (commit)
via 5f65b1caa705f07a0efbeb9cebcfc27800525a7e (commit)
from a0d51e5f686a21de91b9ef44ed74dc8116ef3b46 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c80551b64b57b6200bd0ea012dd14118725ad64d
commit c80551b64b57b6200bd0ea012dd14118725ad64d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix OS3 build
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index daf4aa0..707d7bb 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -45,6 +45,8 @@ static struct nscallback *tioreq;
struct Device *TimerBase;
#ifdef __amigaos4__
struct TimerIFace *ITimer;
+#else
+static struct MsgPort *schedule_msgport = NULL;
#endif
static PblHeap *schedule_list;
@@ -290,6 +292,9 @@ static void ami_schedule_close_timer(void)
nserror ami_schedule_create(struct MsgPort *msgport)
{
ami_schedule_open_timer(msgport);
+#ifndef __amigaos4__
+ schedule_msgport = msgport;
+#endif
schedule_list = pblHeapNew();
if(schedule_list == PBL_ERROR_OUT_OF_MEMORY) return NSERROR_NOMEM;
@@ -328,7 +333,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void
*p)
ASOIOR_Duplicate,
tioreq,
TAG_DONE);
#else
- nscb = (struct nscallback *)CreateIORequest(msgport, sizeof(struct
nscallback));
+ nscb = (struct nscallback *)CreateIORequest(schedule_msgport,
sizeof(struct nscallback));
*nscb = *tioreq;
#endif
if(!nscb) return NSERROR_NOMEM;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5f65b1caa705f07a0efbeb9cebcfc27800525a7e
commit 5f65b1caa705f07a0efbeb9cebcfc27800525a7e
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
OS3-related comments
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index efb0b09..1917171 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -124,12 +124,18 @@ void ami_init_layers(struct gui_globals *gg, ULONG width,
ULONG height, bool for
* If we get a bit smarter about this we can lose the user
option. */
if((depth > 8) && (force32bit == false)) friend =
scrn->RastPort.BitMap;
}
+
+ /* OS3 is locked to using palette-mapped display even on RTG.
+ * To change this, comment out the below and build with the similar OS4
lines above.
+ * Various bits of RTG code are OS4-only and OS3 versions will need to
be written,
+ * however a brief test reveals a negative performance benefit, so this
lock to a
+ * palette-mapped display is most likely permanent.
+ */
#warning OS3 locked to palette-mapped modes
gg->palette_mapped = true;
if(depth > 8) depth = 8;
#endif
-
/* Probably need to fix this next line */
if(gg->palette_mapped == true) nsoption_set_bool(font_antialiasing,
false);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/plotters.c | 8 +++++++-
frontends/amiga/schedule.c | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index efb0b09..1917171 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -124,12 +124,18 @@ void ami_init_layers(struct gui_globals *gg, ULONG width,
ULONG height, bool for
* If we get a bit smarter about this we can lose the user
option. */
if((depth > 8) && (force32bit == false)) friend =
scrn->RastPort.BitMap;
}
+
+ /* OS3 is locked to using palette-mapped display even on RTG.
+ * To change this, comment out the below and build with the similar OS4
lines above.
+ * Various bits of RTG code are OS4-only and OS3 versions will need to
be written,
+ * however a brief test reveals a negative performance benefit, so this
lock to a
+ * palette-mapped display is most likely permanent.
+ */
#warning OS3 locked to palette-mapped modes
gg->palette_mapped = true;
if(depth > 8) depth = 8;
#endif
-
/* Probably need to fix this next line */
if(gg->palette_mapped == true) nsoption_set_bool(font_antialiasing,
false);
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index daf4aa0..707d7bb 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -45,6 +45,8 @@ static struct nscallback *tioreq;
struct Device *TimerBase;
#ifdef __amigaos4__
struct TimerIFace *ITimer;
+#else
+static struct MsgPort *schedule_msgport = NULL;
#endif
static PblHeap *schedule_list;
@@ -290,6 +292,9 @@ static void ami_schedule_close_timer(void)
nserror ami_schedule_create(struct MsgPort *msgport)
{
ami_schedule_open_timer(msgport);
+#ifndef __amigaos4__
+ schedule_msgport = msgport;
+#endif
schedule_list = pblHeapNew();
if(schedule_list == PBL_ERROR_OUT_OF_MEMORY) return NSERROR_NOMEM;
@@ -328,7 +333,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void
*p)
ASOIOR_Duplicate,
tioreq,
TAG_DONE);
#else
- nscb = (struct nscallback *)CreateIORequest(msgport, sizeof(struct
nscallback));
+ nscb = (struct nscallback *)CreateIORequest(schedule_msgport,
sizeof(struct nscallback));
*nscb = *tioreq;
#endif
if(!nscb) return NSERROR_NOMEM;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
