Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Distinguish between owned and borrowed references to a SDL_Surface #306

Merged
merged 1 commit into from
Feb 16, 2025
Merged

Distinguish between owned and borrowed references to a SDL_Surface #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Core/Video.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#include <SDL.h>

typedef SDL_Surface SDL_Surface_borrowed;

void _uinta_free(Uint16* av, int len_from_av_len)
{
if( av != NULL)
Expand Down Expand Up @@ -56,7 +58,7 @@ See: L<http:/*www.libsdl.org/cgi/docwiki.cgi/SDL_API#head-813f033ec44914f267f321

=cut

SDL_Surface *
SDL_Surface_borrowed *
video_get_video_surface()
PREINIT:
char* CLASS = "SDL::Surface";
Expand Down Expand Up @@ -125,7 +127,7 @@ video_video_mode_ok ( width, height, bpp, flags )
RETVAL


SDL_Surface *
SDL_Surface_borrowed *
video_set_video_mode ( width, height, bpp, flags )
int width
int height
Expand Down
7 changes: 4 additions & 3 deletions src/helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@ void objDESTROY(SV *bag, void (* callback)(void *object))
Uint32 *threadid = (Uint32*)(pointers[2]);

if(PERL_GET_CONTEXT == pointers[1]
&& *threadid == SDL_ThreadID())
&& (threadid == NULL || *threadid == SDL_ThreadID()))
{
pointers[0] = NULL;
if(object)
if(object && threadid != NULL)
callback(object);
safefree(threadid);
if (threadid != NULL)
safefree(threadid);
safefree(pointers);
}
}
Expand Down
23 changes: 23 additions & 0 deletions typemap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ SDL_UserEvent * O_OBJECT
SDL_QuitEvent * O_OBJECT
SDL_keysym * O_OBJECT
SDL_Surface * O_OBJECT
SDL_Surface_borrowed * O_BORROWED
SDL_SysWMmsg * T_PTR
SDL_CD * O_OBJECT
SDL_CDtrack * O_OBJECT
Expand Down Expand Up @@ -122,6 +123,17 @@ O_OBJECT
XSRETURN_UNDEF;
}

O_BORROWED
if ($var) {
void** pointers = malloc(3 * sizeof(void*));
pointers[0] = (void*)$var;
pointers[1] = (void*)PERL_GET_CONTEXT;
pointers[2] = NULL;
sv_setref_pv( $arg, CLASS, (void*)pointers );
} else {
XSRETURN_UNDEF;
}

INPUT

O_OBJECT_NPGC
Expand All @@ -136,3 +148,14 @@ O_OBJECT
} else {
XSRETURN_UNDEF;
}

O_BORROWED
/* Same as O_OBJECT */
if( sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVMG) ) {
void** pointers = (void**)INT2PTR(void *, SvIV((SV *)SvRV( $arg )));
$var = ($type)(pointers[0]);
} else if ($arg == 0) {
XSRETURN(0);
} else {
XSRETURN_UNDEF;
}