40920b3823
OGL: Don't use texture arrays for MSAA.
...
This solves a performance regression on AMD cards.
We don't currently support stereoscopy for MSAA anyway.
2014-12-03 01:39:43 +01:00
8f08601499
FrameTools: Fix dimming of controller settings menu item
2014-12-02 19:18:15 -05:00
94d9d138d9
Common: Add a built-in profiler
2014-12-03 00:50:41 +01:00
08660c89ad
Fix register usage detection in PPCAnalyst.
...
lmw/stmw weren't properly setting input and output registers since they use multiple registers.
dcbz was just missing a flag in the instruction tables.
2014-12-02 16:12:33 -06:00
e40f129fdd
Merge pull request #1635 from FioraAeterna/fixprofiler2
...
JIT: fix profiler call
2014-12-02 14:39:25 -06:00
863fb91cad
JIT: fix profiler call
...
Sometimes this seems to require a 64-bit offset, so use CallFunction instead
2014-12-02 10:17:58 -08:00
734aac54a8
Merge pull request #1631 from lioncash/id
...
DolphinWX: Specify wxID_ANY where -1 is used in controls
2014-12-02 12:01:29 -05:00
726b50e06e
Fix HiDPI loading logic.
2014-12-02 09:45:00 -05:00
a5cfe85c8d
Support HiDPI flags & rating images.
...
There aren't any yet, it's up to up to Stevoisiak and MaJoR to create
them :)
2014-12-02 09:44:56 -05:00
320c5f2545
Cast the result of GetSize() to "unsigned long long".
...
Squelches a warning on Mac OS X.
2014-12-02 09:44:52 -05:00
43473e09d1
Implement the "Rating" column.
...
Looks like I forgot to do this...
2014-12-02 09:44:47 -05:00
1d4b3a90eb
Micro-optimize RenderWidgetHasFocus().
2014-12-02 09:44:31 -05:00
10bfbebc78
DolphinWX: Specify wxID_ANY where -1 is used in controls
2014-12-01 23:02:50 -05:00
54f1e3a3c1
Merge pull request #1630 from lioncash/unused
...
WII_IPC_HLE_Device_fs: Remove unused macro constant
2014-12-01 21:49:07 -05:00
64124a0d21
Merge pull request #1628 from lioncash/tl
...
InputConfigDiag: Clean up dialog title translation handling
2014-12-01 20:40:49 -06:00
b34c80d138
Merge pull request #1626 from kamiyo/fix-wiimote-volume-divisor
...
Fix Wiimote speaker divisor for format 0x00
2014-12-02 12:51:15 +11:00
11e6d75ea6
WII_IPC_HLE_Device_fs: Remove unused macro constant
2014-12-01 19:33:53 -05:00
af5b1063bf
Merge pull request #1619 from FioraAeterna/removepxor
...
JIT: remove unnecessary pxor in paired stores
2014-12-01 15:50:31 -05:00
27540ba3fb
InputConfigDiag: Clean up dialog title translation handling
2014-12-01 15:47:38 -05:00
05cb1ff136
Remove runtime OS X version check.
...
My recent update to that check broke compilation on 10.9:
https://code.google.com/p/dolphin-emu/issues/detail?id=7900
However, on further review, the check isn't actually necessary. If the
OS X version is older than LSMinimumSystemVersion in Info.plist, the
system will generally refuse to run the binary in the first place. You
can try to launch it via a terminal, but at that point it's the user's
problem if it crashes.
2014-12-01 14:21:24 -05:00
e8c393b00f
Fix wiimote speaker divisor.
...
Playing with the wiimote volume in the Wii menu in-game, I found that the range for m_reg_speaker.volume is 0 -127, not 0 - 64.
2014-12-01 13:06:53 -05:00
21d039059e
ControllerConfigDiag: Fix Linux builds
2014-12-01 03:53:32 -05:00
5e2888bff6
DolphinWX: Add new icon for the controller menu.
2014-12-01 03:50:44 -05:00
896304fd07
ControllerConfigDiag: Disable controller type changes if netplay or a movie is active.
2014-12-01 03:36:09 -05:00
7b54d8ad10
ControllerConfigDiag: Remove now obsolete TODOs
2014-12-01 03:36:08 -05:00
cad8ae3be1
WiimoteConfigDiag: Rename to ControllerConfigDiag.
2014-12-01 03:36:07 -05:00
e801fcead9
WiimoteConfigDiag: Unify controller menu with the GameCube controllers.
2014-12-01 03:36:04 -05:00
00dcaba37d
WiimoteConfigDiag: Size the config buttons correctly
2014-12-01 03:36:02 -05:00
22c547f6fb
WiimoteConfigDiag: Remove trailing whitespace
2014-12-01 03:36:01 -05:00
1791897815
WiimoteConfigDiag: Fix assertion problems on non-OSX OSes.
2014-12-01 03:35:59 -05:00
94d033020e
WiimoteConfigDiag: Split UI sizer creation into their own functions.
2014-12-01 03:35:58 -05:00
d17a054e75
WiimoteConfigDiag: Move GameCube controller settings over
...
Beginning of unifying the controller settings. No functionality yet.
2014-12-01 03:35:57 -05:00
6df67bf38f
Merge pull request #1597 from unknownbrackets/gcz-tweaks
...
Tweaks to gcz compression / decompression
2014-12-01 03:18:24 -05:00
f9ba7a0fb2
Merge pull request #1625 from unknownbrackets/android-minor
...
Android: Ignore some generated files
2014-12-01 02:54:31 -05:00
86ebe3916e
Android: Ignore some generated files.
...
/obj/ is used by ndk debugging (gdb) in some scenarios.
2014-11-30 22:52:22 -08:00
4946c6876d
Merge pull request #1607 from Sonicadvance1/armv7-optimizations
...
A whole bunch of ARMv7 optimizations and minor fixes.
2014-11-30 15:48:27 -06:00
414e36d8c9
Merge pull request #1258 from FioraAeterna/avoidfmulround
...
JIT: optimize single-precision ops based on knowledge of their inputs
2014-11-30 15:47:34 -06:00
db9cd8e3d7
Merge pull request #1615 from Sonicadvance1/fix_cpu_helper
...
[Android] Removes CPU architecture number from CPU helper.
2014-11-30 15:43:47 -06:00
d3c278cc33
Merge pull request #1610 from rohit-n/sign-compare
...
VideoCommon: Fix -Wsign-compare warnings.
2014-11-30 15:42:34 -06:00
7c38d04a40
Merge pull request #1614 from Sonicadvance1/fix_aarch64_bswap
...
[AArch64] Workaround builtin byteswap bug.
2014-11-30 15:41:35 -06:00
4a687f2641
Merge pull request #1616 from Sonicadvance1/asimd_is_neon
...
[Android] Fix NEON detection with AArch64
2014-11-30 15:41:28 -06:00
644a661bf1
JIT: remove unnecessary pxor in paired stores
...
I don't think this is necessary anymore?
2014-11-30 08:11:45 -08:00
a09283cf9f
ISOProperties: show all paritions on property page.
2014-11-30 16:38:15 +01:00
4bb48d09dd
DiskIO: Clean up GetTMD() API.
2014-11-30 16:38:13 +01:00
b1df4e5986
Make DVDLowOpenPartition actually change partitions.
2014-11-30 16:01:05 +01:00
50582b1d74
[Android] Fix NEON detection with AArch64
...
On AArch64 asimd is the new name for NEON.
This fixes a message on application start in Android about the device not supporting NEON.
If it's AArch64 then it supports NEON!
2014-11-30 01:33:11 -06:00
c27ee21dd9
[AArch64] Workaround builtin byteswap bug.
...
The builtin byteswap routines cause critical failure on AArch64 when built with the Android toolchain.
I didn't experience this issue when building for Linux using a local qemu chroot.
Seems to be only an issue with the Android toolchain when building AArch64.
Use our generic version instead.
2014-11-30 01:23:03 -06:00
496f9d678a
[Android] Removes CPU architecture number from CPU helper.
...
This was '7' on all ARMv7 devices but was 'AArch64' on the Nexus 9.
Trying to cast to integer was causing a crash. We don't even use this so may as well as wipe it.
Also adds Nvidia to the CPU implementers list.
2014-11-30 01:17:05 -06:00
b689954a71
Update the android cmake toolchain to latest.
...
To properly support 64bit architectures and clang we need the latest version.
2014-11-30 01:05:37 -06:00
cd13d2d66f
[ARM32] Fix a couple bugs in the paired loadstore routines.
...
This code was obviously wrong, we were sign extending 8 bit unsigned values and loading from the wrong offset as well.
This fixes a bug in Muramasa where some colours were going insane.
2014-11-30 04:10:17 +00:00
b848365f78
[ARM32] Minor optimization in paired loadstores.
...
When the offset can fit in the instruction encoding make sure to do so.
2014-11-30 04:10:16 +00:00
52c6fb180b
[ARM32] Moves loadstore extend flag to backpatch code.
2014-11-30 04:10:16 +00:00
32dc105aa3
[ARM32] Eat a register to store our memory base.
...
This saves at least two instructions per fastmem operation.
2014-11-30 04:10:16 +00:00
e2f8286415
[ARM32] Adds unsigned compares.
...
Superscedes PR #1131 .
Optimizes cmpi a bit.
2014-11-30 04:10:16 +00:00
581ab9edec
[ARM32] cntlzwx optimization if source is immediate
2014-11-30 04:10:16 +00:00
9c82adb14f
[ARM32] negx optimization if source is immediate
2014-11-30 04:10:15 +00:00
1dbb39f791
[ARM32] srawix optimization when source is an immediate.
2014-11-30 04:10:15 +00:00
fca0fd9dd5
[ARM32] rlwimix and rlwnmx optimizations.
2014-11-30 04:10:15 +00:00
239eaf122a
VideoCommon: Fix -Wsign-compare warnings.
2014-11-29 17:40:14 -06:00
c693cf46e9
JIT: remove unused flag.
2014-11-29 12:41:36 -08:00
72c96c20d3
JIT: more optimizing of float ops based on known input characteristics
...
If the inputs are both float singles, and the top half is known to be identical
to the bottom half, we can use packed arithmetic instead of scalar to skip
the movddup.
This is slower on a few rather old CPUs, plus the Atom+Silvermont, so detect
Atom and disable it in that case.
Also avoid PPC_FP on stores if we know that the output came from a float op.
2014-11-29 11:33:11 -08:00
4e0591cdf1
JIT: float instruction attribute fixes, fix binding mistakes
...
These instructions modify only the bottom halves of the output register,
so the output register needs to be treated as an input too.
2014-11-29 11:30:52 -08:00
8d039a77af
JIT: minor cleanup, avoid MOVSD where MOVAPD will do
...
Avoids false dependencies.
2014-11-29 11:30:51 -08:00
7df50b0710
JIT: skip weird fmul rounding if the input is known to be single precision
2014-11-29 11:30:51 -08:00
36b886cb80
D3D: Viewport min and max depth is now clamped to [0..1] range
2014-11-29 11:42:53 +01:00
a886d8a8ee
Renamed DEPTHPARAMS to PIXELCENTERCORRECTION
...
This shader constant was previously used for depth remapping in D3D and for pixel center correction. Now it only serves one purpose and the new name makes it clear.
2014-11-29 11:42:52 +01:00
1fe3d07cbd
D3D: Removed somewhat mysterious comment
...
It would be good to know which games exactly exhibited the issue.
2014-11-29 11:11:28 +01:00
cc2227fbc3
D3D: Replaced shader-based depth range remap with viewport
...
This fixes UI rendering in some games mentioned in https://code.google.com/p/dolphin-emu/issues/detail?id=7785
2014-11-29 11:11:28 +01:00
38dfc970df
Fixes OpenGL ES rendering.
...
sampler2DArray doesn't have a default precision, so we need to set it ourselves.
2014-11-29 01:27:47 -06:00
f588a82b9a
Merge pull request #1294 from FioraAeterna/noaccuratefcmp
...
JIT: remove "accurate fcmp" option
2014-11-28 22:48:11 -06:00
1aed2542c7
Merge pull request #1602 from FioraAeterna/fixforce25bitimprecise
...
JIT: fix Force25BitPrecision with accurate single precision mode off
2014-11-28 22:42:44 -06:00
e7daf6b3bc
Merge pull request #1606 from FioraAeterna/vertexloadercall
...
Vertex loader: use ABI_CallFunction
2014-11-28 22:40:06 -06:00
5003618587
Merge pull request #1605 from FioraAeterna/fixcrormerge
...
JIT: fix fcmp+cror merging bug
2014-11-28 22:39:13 -06:00
1a85df0459
Merge pull request #1603 from FioraAeterna/nofastinterrupts
...
JIT: remove "fast interrupts" option set and then used nowhere
2014-11-28 22:37:52 -06:00
2d2baec65d
Merge pull request #1595 from degasus/master
...
OGL: require GL version >= 3.0
2014-11-28 22:37:35 -06:00
7acd5eba17
Vertex loader: use ABI_CallFunction
...
Should result in faster/shorter code sequences on platforms where generated
code is close enough to the code segment (e.g. Windows).
2014-11-28 20:26:00 -08:00
ec3d6da7b5
[ARM32] Remove conditional execution from store instructions.
2014-11-29 02:44:17 +00:00
6c399ce9ae
[ARM32] Removes a block of conditional execution in the dispatcher.
2014-11-29 02:42:30 +00:00
e358696d46
[ARM32] Removes conditional execution from ARMv7's Jit function.
2014-11-29 02:42:22 +00:00
c2e5715034
Merge pull request #1601 from RachelBryk/wiimote-hotkey2
...
Fix wiimote connect hotkeys.
2014-11-28 19:50:13 -05:00
d42305aba0
JIT: fix fcmp+cror merging bug
...
Destination CR bit needs to be cleared if it's not one of the sources.
2014-11-28 16:11:04 -08:00
854f6b8688
HW: Poll system input from system timers
...
Rather than playing terrible hacks to determine the start of input
frames, just update system input periodically. Specifically, every
60th of a second.
2014-11-28 10:56:11 -08:00
f3b739341e
HW: Remove UpdateOutput
...
All of the rumble interfaces are now immediate mode.
2014-11-28 10:54:04 -08:00
86e4da2c07
ForceFeedback: Apply immediately as well
2014-11-28 10:54:04 -08:00
1958a10b6f
XInput: Apply immediately as well
2014-11-28 10:54:04 -08:00
1b3d0173f5
SDL: Apply updates immediately rather than going through UpdateOutput
...
We're going to remove UpdateOutput as it's redundant, and horribly
complicates the code.
2014-11-28 10:54:03 -08:00
1cee3b8cc6
WiimoteEmu: Hardcode acceleration calibration values
...
Now we don't have any runtime calibration at all.
2014-11-28 10:51:30 -08:00
5f6cfd67b7
Nunchuk: Hardcode Nunchuk accelerometre calibration values as well
2014-11-28 10:51:30 -08:00
211eafc130
Nunchuk: Hardcode Nunchuk stick calibration values
...
The game can never change these, so there's no reason to make it
dynamic. Just put the constants in the code.
While we're at it, take the time to clean up the code and also
and document several of the hacks we're doing inside to make the code
clearer to understand.
2014-11-28 10:51:30 -08:00
64014d1dcd
Nunchuk: Use the accel_cal struct directly in nu_cal
2014-11-28 10:51:30 -08:00
cd95002356
WiimoteHid: Remove unused structs
2014-11-28 10:51:30 -08:00
fca9b491cc
WiimoteEmu: Remove Spy method
...
This is the only use for a lot of unused methods and structs, and it's a
poorly written mess that doesn't even compile. Just remove it so we can
clean up the rest of a lot of code.
2014-11-28 10:51:30 -08:00
e43ad58a3a
GCPad: Clean up Motor/Rumble interfaces
...
Remove the duplication here and just have one Rumble interface that
takes a single strength parameter.
2014-11-28 10:50:45 -08:00
f2787f620e
ControllerInterface: Make UpdateInput / UpdateOutput return void
...
The return values here have never been checked, so it doesn't make sense
to return a value to begin with.
2014-11-28 10:50:45 -08:00
61fcfc4bf2
ControllerInterface: Remove unused ClearInputState
2014-11-28 10:50:45 -08:00
367a42dcfd
ControllerInterface: Implement dummy UpdateInput / UpdateOutputs
...
Make the implementation here a bit easier.
2014-11-28 10:50:45 -08:00
0c056c6411
DInput: Remove the unsupported Lights output
...
The LEDs feature doesn't actually do anything: the SetState method is
entirely commented out.
2014-11-28 10:50:45 -08:00
b5d4e8d37e
ControllerInterface: Remove unused "force" parameter
...
I'm not sure when this nonsense of forcing locking the mutex when it's
already taken should have ever taken effect, but let's be thankful it
isn't now. That was a badly worded sentence.
2014-11-28 10:50:45 -08:00
6aa1a59ee8
SI: Clean up controller-like devices with subclassing
...
This takes the giant mess of controller-like devices (dance mat and
steering wheel) down to something more manageable, similar to how
the Donkey Konga bongo controller works.
Based-on-a-patch-by: comex <comexk@gmail.com>
2014-11-28 10:50:45 -08:00
ce059769f6
Merge pull request #1439 from Armada651/ogl-stereo-3d
...
OGL: Stereoscopic 3D Support
2014-11-28 11:45:38 -06:00
41f5ef3304
JIT: remove "fast interrupts" option set and then used nowhere
2014-11-28 06:42:40 -08:00
3e893913dd
JIT: fix Force25BitPrecision with accurate single precision mode off
...
Doesn't affect anything now, but it's more correct (and should make setting
AccurateSinglePrecision to false work properly now).
2014-11-28 06:39:47 -08:00
df9ace0985
Fix wiimote connect hotkeys.
2014-11-28 08:55:19 -05:00
561e96b080
JIT: clear FIFO write addresses when block cache is cleared
...
Fixes a spurious FIFO write check which caused a flags locking assert in
Splinter Cell: Double Agent.
2014-11-27 17:15:01 -08:00
815b7bec96
DiscIO: Change a memset() to zero initialization.
2014-11-27 11:12:17 -08:00
f54bf81520
DiscIO: Avoid zeroing buffer when compressing gcz.
...
This saves 6% time.
2014-11-27 08:58:09 -08:00
2635e7d9ea
DiscIO: Decompress to file using a larger buffer.
...
This improves performance by around 20% for me, and the memory use impact
is negligible considering Dolphin is otherwise unusable.
2014-11-27 08:34:44 -08:00
f2f83a0c60
DolphinWX: Allow cancelling gcz compression.
2014-11-27 07:53:28 -08:00
6d51455195
VideoConfig: Further optimize convergence and separation values and update their descriptions.
...
Previous convergence distance was much too large.
2014-11-27 16:19:26 +01:00
b3c6602d06
OGL: Only show the options when stereoscopy was enabled in the INI file.
...
We'll enable the stereoscopy options globally when it is ready for release.
2014-11-27 16:17:37 +01:00
74291017e5
SystemInfo: various cleanup.
...
* Rename the copy slot to match naming convention elsewhere
* Remove the Mac 10.7/10.8 detection as we don't support it now
2014-11-26 15:40:38 -05:00
59c4ccfa75
GameGrid: enable uniform item sizes.
...
Looks much nicer this way.
2014-11-26 15:37:12 -05:00
c63a38088a
OGL: require GL version >= 3.0
...
This "fix" a crash because of glVertexAttribI only available on gl3+ contexts.
2014-11-26 21:33:47 +01:00
9180257c4a
"Gamelist view style" -> "List style"
...
* Cleaner & more concise.
* Also add some "Alt" shortcuts
2014-11-26 15:32:55 -05:00
ca8316ac54
Remove note about reusing the render widget.
...
This is actually not possible due to how Qt manages child widgets...
2014-11-26 15:30:35 -05:00
84b060d313
Fix building with PCH disabled.
2014-11-26 10:21:04 -06:00
25492f3d70
Merge pull request #1593 from lioncash/arm
...
Arm(64)Emitter: Make some variables static
2014-11-26 07:56:21 -05:00
e9b09a4c9f
Arm(64)Emitter: Make some variables static
2014-11-25 23:27:48 -05:00
b806680eac
Merge pull request #1522 from jcowgill/sfml-2.1
...
Update / Port to SFML 2.1
2014-11-26 12:33:03 +11:00
69bd1562e2
Merge pull request #1561 from comex/10.9
...
Update OS X Requirement to 10.9 + fixes
2014-11-26 12:31:28 +11:00
3be31ca2c8
JIT: remove "accurate fcmp" option
...
This doesn't seem to be necessary anymore now that FPRF is implemented in the
JIT. Technically, this isn't the same as before, since the JIT doesn't
implement the fcmp exception semantics, but as far as testing has shown, this
doesn't seem necessary.
This should make games that use FPRF a few percent faster (e.g. F-Zero GX)
since fcmpx no longer has to be fallbacked.
2014-11-25 09:54:40 -08:00
4afb85ef33
Merge pull request #1584 from degasus/master
...
OGL: also show driver warnings on release builds
2014-11-25 12:41:47 -05:00
aa92797f93
Merge pull request #1582 from Stevoisiak/newImprovedFormatting
...
More formatting and consistency fixes
2014-11-25 12:41:32 -05:00
dcdd4e51f6
Merge pull request #1589 from lioncash/x11
...
VideoOGL: Move X11 wxWidgets utilities to DolphinWX
2014-11-25 12:41:00 -05:00
a93f86330e
Port dolphin to SFML 2.1
2014-11-25 16:44:38 +00:00
217ca9ba2b
http -> https for Wiki Seach
2014-11-24 22:06:41 -08:00
b36b55cfcb
Upgrade AudioUnit API usage.
...
weird that such a simple change doesn't seem to have any obvious
documentation on Apple's website or elsewhere...
2014-11-25 00:42:21 -05:00
759ea3bce7
Update Main.cpp version checks.
2014-11-25 00:27:13 -05:00
e631f68c1b
Switch from deprecated Carbon idle tickling to Cocoa power assertions.
...
Also, this avoids keeping the system awake if a game is not being
played.
Frankly, I don't know what the point of precisely tracking these things
is, but that's how the API works. Feel free to add analogous
functionality on other platforms.
2014-11-25 00:27:13 -05:00
aae234c5d7
Fix name conflict between SoundTouch BOOL and ObjC BOOL.
2014-11-25 00:27:13 -05:00
245ff601b7
Merge pull request #1552 from waddlesplash/dolphin-qt
...
DolphinQt: GameList!
2014-11-25 00:24:32 -05:00
c0fd319295
VideoOGL: Move X11 wxWidgets utilities to DolphinWX
2014-11-24 21:15:52 -05:00
6da394a4d0
More formatting and consistency fixes
2014-11-24 17:16:59 -05:00
4d931c16ad
Silence a few "zero as null pointer" warnings.
2014-11-24 12:36:46 -06:00
145e0cc84c
OGL: Display the stereoscopy support warning before the stereo setting is reset.
...
Previously the message would never display, because stereoscopy would be turned off before the warning.
2014-11-24 15:11:00 +01:00
a04edbcb9a
VideoConfig: Add separation and convergence modifiers to the game ini.
2014-11-24 15:10:52 +01:00
f64aadd362
VideoConfig: Limit the StereoMonoEFBDepth option to the game ini and introduce a separate section for it.
2014-11-24 12:25:35 +01:00
0f4d59f612
VideoConfig: Rename StereoFocalLength to StereoConvergence.
2014-11-24 11:58:38 +01:00
9b2cd82da5
GeometryShaderGen: Set the properties of the VS_OUTPUT struct in the uid.
2014-11-23 14:30:12 +01:00
ed9f258b27
GeometryShader: Don't read from output variables
2014-11-23 14:30:12 +01:00
106df04e8e
GeometryShaderGen: Declare the vertex array size.
2014-11-23 14:30:12 +01:00
422125c1a9
GeometryShaderGen: Add comments.
2014-11-23 14:30:12 +01:00
a565317a6a
VideoConfigDiag: Update convergence description.
...
The switch to the Nvidia formula reversed this setting.
2014-11-23 14:30:12 +01:00
72c01e3083
VideoConfigDiag: Remove value labels.
2014-11-23 14:30:12 +01:00
24e4de3643
VideoConfig: Move stereoscopy settings to the Enhancements section.
2014-11-23 14:30:12 +01:00
6e62dd3415
Add stereoscopy hotkeys.
2014-11-23 14:30:12 +01:00
21eabc1b9d
OGL: Add warning message when stereoscopic 3D is enabled but unsupported.
2014-11-23 14:27:40 +01:00
0f63186371
TextureCache: Add "Mono EFB Depth Copy" stereoscopy option.
2014-11-23 14:27:40 +01:00
9994ccb342
PostProcessing: Invalidate shader when anaglyph stereoscopy is toggled.
2014-11-23 14:27:40 +01:00
f3ddf37d07
VideoCommon: Switch to Nvidia stereoscopy offset formula.
2014-11-23 14:27:40 +01:00
Jules Blok