Add pixel access for SDL1 & SDL2

sdl.asm

@@ -6,10 +6,19 @@ Extern SDL_OpenAudio
 Extern SDL_PauseAudio
 Extern SDL_WaitEvent
 Extern SDL_GetError
+Extern SDL_CreateRGBSurface
+Extern SDL_LockSurface
+Extern SDL_UnlockSurface
+Extern SDL_UpperBlit
+%define SDL_BlitSurface SDL_UpperBlit
 
 %ifdef SDL1
 	%define SDL_QUIT 0x0C
+	%define SDL_DOUBLEBUF 0x40000000
+	%define SDL_HWSURFACE 0x1
+	Extern SDL_GetVideoSurface
 	Extern SDL_SetVideoMode
+	Extern SDL_Flip
 %endif
 %ifdef SDL2
 	; events
@@ -20,6 +29,10 @@ Extern SDL_GetError
 	%define SDL_WINDOWPOS_UNDEFINED SDL_WINDOWPOS_UNDEFINED_MASK | 0 ; display 0
 	; function
 	Extern SDL_CreateWindow
+
+	extern SDL_GetWindowSurface
+	extern SDL_memset
+	extern SDL_UpdateWindowSurface
 %endif
 %ifdef MIX_AUDIO
 	Extern SDL_MixAudio
@@ -61,3 +74,19 @@ ENDSTRUC
 		ISTRUC SDL_AudioSpec_STRUC
 %endmacro
 
+%macro MOV_surf_w 2
+	mov %1, [%2]
+	mov %1, [%1 + 16]
+%endmacro
+%macro MOV_surf_h 2
+	mov %1, [%2]
+	mov %1, [%1 + 20]
+%endmacro
+%macro MOV_surf_pitch 2
+	mov %1, [%2]
+	mov %1, [%1 + 24]
+%endmacro
+%macro MOV_surf_pixels 2
+mov %1, [%2]
+mov %1, [%1 + 32]
+%endmacro

yaglitch.asm

@@ -108,6 +108,14 @@ section .bss
 
 	visu_data_buff: resb 0x100
 
+	%ifdef SDL2
+		visu_win: resq 1
+	%endif
+
+	visu_scr: resq 1
+
+	visu_surf: resq 1
+
 section .text
 global _start
 _start:
@@ -369,14 +377,18 @@ sdl_init:
 	mov rdi, audiospec_wanted
 	mov rsi, audiospec_recv
 	call SDL_OpenAudio
+
 	; video init 256*256 window
+	; init visu_scr : *screen
 	%ifdef SDL1
 		mov rdi, 256
 		mov rsi, 256
 		mov rdx, 32
 		;mov rcx, SDL_SWSURFACE
-		xor rcx, rcx
+		mov rcx, SDL_DOUBLEBUF
 		call SDL_SetVideoMode
+		call SDL_GetVideoSurface
+		mov [visu_scr], rax
 	%endif
 	%ifdef SDL2
 		mov rdi, window_title
@@ -386,7 +398,92 @@ sdl_init:
 		mov r8, 256
 		xor r9, r9
 		call SDL_CreateWindow
+		mov [visu_win], rax
+		mov rdi, rax
+		call SDL_GetWindowSurface
+		mov [visu_scr], rax
+	%endif
+
+	; init SDL surface according to SDL screen in visu_surf
+	xor rdi, rdi ; flasg
+	mov rsi, 256 ; width
+	mov rdx, 256 ; height
+	mov rcx, 32 ; 32 bits depth
+	mov r8, 0xff ; rmask
+	mov r9, 0xff00 ; gmask
+	mov rax, 0xff0000 ; bmask
+	push rax
+	push rax
+	shl rax, 8 ; amask
+	mov [rsp+8], rax
+	call SDL_CreateRGBSurface
+	mov [visu_surf], rax
+	test rax, rax
+	jz sdl_error
+	pop rcx
+	pop rcx
+	; RAZ surface & blit
+	push rax ; push surface addr
+	mov rdi, rax
+	call SDL_LockSurface
+
+	%ifdef SDL2
+		xor rdx, rdx
+		xor rcx, rcx
+		MOV_surf_w ecx, visu_surf
+		xor rax, rax
+		MOV_surf_pitch eax, visu_surf
+		mul ecx
+		MOV_surf_pixels rdi, visu_surf
+		xor rsi, rsi
+		;mov rsi, 0xFF ;white
+		mov rdx, rax
+		call SDL_memset ; seems to malloc the pixels
+	%endif
+
+	%ifdef SDL1
+		xor rcx, rcx
+		MOV_surf_w ecx, visu_surf
+		push rcx
+		MOV_surf_h ecx, visu_surf
+		MOV_surf_pixels rdi, visu_surf
+		;mov rax, 0xffcc22ff ; magenta
+		;mov rax, 0xffffffff ; white
+		dec rcx
+		.loop_razh:
+			push rcx
+			mov rcx, [rsp+8]
+			dec rcx
+			.loop_razw:
+				stosd
+				loop .loop_razw
+			pop rcx
+			loop .loop_razh
+		pop rcx
 	%endif
+
+	pop rdi ; surface addr
+	call SDL_UnlockSurface
+
+	mov rdi, [visu_surf]
+	xor rsi, rsi
+	mov rdx, [visu_scr]
+	xor rcx, rcx
+	call SDL_BlitSurface
+	test rax, rax
+	jnz sdl_error
+
+	%ifdef SDL2
+		mov rdi, [visu_win]
+		call SDL_UpdateWindowSurface
+	%endif
+	%ifdef SDL1
+		mov rdi, [visu_scr]
+		call SDL_Flip
+	%endif
+
+
+
 	%ifdef MIX_AUDIO
 		; init callback heap infos
 		mov rax, 0xc ; brk
@@ -441,19 +538,34 @@ sdl_error:
 	; display error & exit
 	call SDL_GetError
 	push rax
+.dbg:
+	test rax, rax
+	jz .no_err
+	mov rdi, rax
 	call strlen
+	.printerr:
 	mov rdx, rsi ; msglen
 	pop rdi ; msg
 	mov rax, 1 ; write
 	mov rdi, 2 ; stderr
 	syscall
 	mov rdi, 0xF
-	jmp exit.exit_err
+	jmp sdl_exit_err
+	.no_err:
+	mov rdi, 0x5
+	jmp sdl_exit_err
 
 exit_fatal:
 	mov rdi, 42
 	jmp exit.exit_err
 
+sdl_exit_err:
+	push rdi
+	call SDL_Quit
+	pop rdi
+	mov rax, 0x3c
+	syscall
+
 exit:
 	call SDL_Quit
 
@@ -649,9 +761,7 @@ audio_cllbck:
 	; rdi -> *userdata
 	; rsi -> *stream
 	; rdx -> stream_len
-	%ifdef SDL2
-		push rbx ; strange, but nescessary...
-	%endif
+	push rbx
 	mov rcx, rdx
 	mov rdi, rsi
 	push rsi
@@ -674,10 +784,8 @@ audio_cllbck:
 	syscall
 	cmp rax, -1
 	je exit_fatal
-	%ifdef SDL2
-		pop rbx ; if rbx change SDL2 segfault :/
-	%endif
-		ret
+	pop rbx
+	ret
 %endif
 %ifdef MIX_AUDIO
 ; another version of the audio callback using heap to store the data