Skip to content

Commit

Permalink
MorphOS: update
Browse files Browse the repository at this point in the history 
2024
Add Bitmap support for TinyGL (merge with 2.82.4 release)
  • Loading branch information
@BeWorld2018
BeWorld2018 committed Jan 16, 2024
1 parent 65e4e1d commit 072f548
Show file tree
Hide file tree
Showing 17 changed files with 192 additions and 193 deletions.
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosevents.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosevents.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosframebuffer.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosframebuffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_moskeyboard.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_moskeyboard.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosmessagebox.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosmessagebox.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
44 changes: 14 additions & 30 deletions src/video/morphos/SDL_mosmodes.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down Expand Up @@ -301,43 +301,27 @@ MOS_GetScreen(SDL_VideoDevice *device, BYTE fullscreen, SDL_bool support3d)
int use_wb_screen = 0;
ULONG openError = 0;

D("[%s] Use monitor '%s' - Screen %d\n", __FUNCTION__, data->ScrMonName ? data->ScrMonName : (STRPTR)"Workbench", data->CustomScreen);

if (!fullscreen && data->ScrMonName == NULL) {
data->CustomScreen = NULL;
screen = LockPubScreen(NULL);
use_wb_screen = 1;
D("[%s] Use Ambient Screen (Workbench)\n", __FUNCTION__);

} else {
struct TagItem screentags[] =
{
{SA_Quiet, TRUE},
{SA_ShowTitle, FALSE},
{SA_AutoScroll, TRUE},
{SA_Title, (IPTR)"SDL2"},
{SA_AdaptSize, TRUE},
{SA_ErrorCode, (ULONG)&openError},
{support3d ? SA_3DSupport : TAG_IGNORE, TRUE},
{SA_GammaControl, TRUE},
{TAG_DONE}
};

D("[%s] Open screen %ldx%ldx%ld\n", __FUNCTION__, data->ScrWidth, data->ScrHeight, data->ScrDepth);

if (fullscreen && data->ScrMonName == NULL) {
screen = OpenScreenTags(NULL,
//SA_LikeWorkbench, TRUE,
SA_Width, data->ScrWidth,
SA_Height, data->ScrHeight,
SA_Depth, data->ScrDepth,
TAG_MORE, (IPTR)screentags);
} else {
screen = OpenScreenTags(NULL,

screen = OpenScreenTags(NULL,
/*support3d ? SA_3DSupport : TAG_IGNORE, TRUE,*/
SA_GammaControl, TRUE,
SA_Width, data->ScrWidth,
SA_Height, data->ScrHeight,
SA_Depth, data->ScrDepth,
SA_MonitorName, data->ScrMonName,
TAG_MORE, (IPTR)screentags);
}
data->ScrMonName ? SA_MonitorName : TAG_IGNORE , data->ScrMonName,
SA_Quiet, TRUE,
SA_ShowTitle, FALSE,
SA_Title, (IPTR)"SDL3",
SA_AdaptSize, TRUE,
SA_ErrorCode, (ULONG)&openError,
TAG_DONE);

if (screen)
data->CustomScreen = screen;
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosmodes.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosmouse.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
2 changes: 1 addition & 1 deletion src/video/morphos/SDL_mosmouse.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2023 Sam Lantinga <[email protected]>
Copyright (C) 1997-2024 Sam Lantinga <[email protected]>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
Loading

0 comments on commit 072f548

Please sign in to comment.