Commit Graph

165 Commits

Author SHA1 Message Date
olebeck
3c548d987c Merge remote-tracking branch 'upstream/master' 2025-06-30 21:10:28 +02:00
David Gow
e87184b502
Fix the OpenGL backends on non-glx Linux platforms (and remove GLEW dependency) (#446)
* Work around issues with depth-buffer size on EGL-based platforms

The OpenGL 1.1 and OpenGL ES 2.0 backends can break on EGL-based platforms,
such as Wayland, or X11 with SDL_VIDEO_FORCE_EGL=1. One of the reasons for
this (the other being glew on the GL1.1 backend) is that SDL/egl get very
confused by the way we set OpenGL attributes, particularly SDL_GL_DEPTH_SIZE,
resulting in SDL_GL_CreateContext() failing with EGL_BAD_MATCH.

The exact cause of this is unknown, but it seems to be a combination of:
- SDL_GL_SetAttribute() is supposed to be called _before_ the window is
  created, and we're calling it afterward.
- Creating several test windows during the enumeration process, mixing
  and matching between OpenGL and OpenGL ES profiles.

The "most correct" solution is probably to delay creating the game window
until the backend creation process, rather than before the enumeration
occurs. But that's a real refactor, which could cause other issues.

Instead, set the 24-bit bit depth (which we've hardcoded anyway) before
creating the window, and use SDL_GL_ResetAttributes() when creating backends.

This seems to work here in all of the cases I was able to try (modulo the GLEW
dependency, which is removed in the next patch).

* miniwin: Remove GLEW dependency for OpenGL 1.1

GLEW normally backs directly onto glXGetProcAddress on Linux, which is broken
on non-GLX setups, such as Wayland (but also X11 with EGL, and presumably KMSDRM).

Replace it with manual calls to SDL_GL_GetProcAddress() for the VBO path.

Note, however, that SDL_opengl.h includes "windows.h", so conflicts with the
miniwin implementation, which breaks builds on windows.

In order to work around this, we do what the Direct3D9 implementation does and
push all of the OpenGL calls to a separate file, actual.cpp.

Going forward, it may make sense to load _all_ OpenGL entry points via SDL,
which would allow us to avoid linking directly with libGL/libOpenGL, and
therefore eliminate the separate build dependency altogether, as well as
allowing more runtime configurability as to the OpenGL library to load.

(But that's definitely a bit uglier, and also useful very rarely.)
2025-06-29 17:47:09 +02:00
Christian Semmler
020969c483
Add transition type to ini (#441) 2025-06-29 02:49:46 +02:00
olebeck
2aeeff7d07 remove some unneeded changes 2025-06-28 03:30:03 +02:00
olebeck
a6b90abcca Merge remote-tracking branch 'upstream/master' 2025-06-28 02:47:07 +02:00
Christian Semmler
a987595e1e
1.0 compatibility (#434)
* Make Infocenter compatible with 1.0 versions

* Fix

* Emscripten patch

* Fix

* Fix Emscripten patch

* Window title

* Naming

* Don't exit car build automatically in 1.0

* Disable character selection by clicking icon in 1.0

* Remove obsolete includes
2025-06-27 02:30:24 +02:00
Carson
7797729a3f
Add option to remove startup delay (#395)
* Add startup delay option

* Remove build option

* Add comment back
2025-06-25 20:27:53 -07:00
olebeck
06f2179ea1 make gxm renderer work with new d3drm 2025-06-26 02:34:16 +02:00
olebeck
b41e760d9d Merge remote-tracking branch 'upstream/master' 2025-06-25 22:07:25 +02:00
olebeck
d0020a3b9a avoid sdl renderer for vita, seems broken 2025-06-25 21:40:17 +02:00
Anders Jenbo
b65284a7a0
Move 2D drawing and upscaling to the renderer (#348) 2025-06-25 19:45:26 +02:00
Christian Semmler
87b4c0412e
Enhance compatibility of FetchFS (#424) 2025-06-24 22:03:54 +00:00
Christian Semmler
822a6a338c
Fix debug window 2025-06-24 09:23:32 -07:00
olebeck
b38091ba1b add gxm renderer (not working with display yet) 2025-06-24 16:36:09 +02:00
Danct12
3698f4fb0c
Bump version for SDL_SCALEMODE_PIXELART to 3.3.0 (#403) 2025-06-22 17:54:35 +00:00
Christian Semmler
5a756f033b
Set UseJoystick to true by default (#397) 2025-06-22 18:49:06 +02:00
Christian Semmler
92e0cb0845
Fix JoystickIndex ini default (#400) 2025-06-22 18:34:05 +02:00
olebeck
40a34ef48e remove test window which causes a bug in the vita sdl port to show up 2025-06-22 14:45:19 +02:00
olebeck
cb4fcc55ba select correct renderer for sdl renderer 2025-06-22 12:57:31 +02:00
Anders Jenbo
3678c97ec3
Allow for building on slightly older SDL3 versions (#394) 2025-06-22 03:29:37 +02:00
olebeck
d5f388cf2f use custom pvr apphint 2025-06-22 03:27:22 +02:00
Christian Semmler
c2b8abea36
Fix Windows file finding (#369) 2025-06-21 18:06:08 +02:00
Steven
ed71ac8ec2
Added in game fullscreen toggling (#358) 2025-06-21 07:09:33 -07:00
Anders Jenbo
922794e7ea
Fix loading files from CD or HD (#357) 2025-06-21 15:19:25 +02:00
Christian Semmler
48fd42ea36
Check for files (#352)
* Check for files

* Fix
2025-06-21 00:45:21 +02:00
Christian Semmler
da825d42d4
Fix debug window 2025-06-17 10:40:25 -07:00
Anders Jenbo
eab95514d6
Add an OpenGL ES 2.0 renderer (#287) 2025-06-17 03:47:23 +02:00
Christian Semmler
c234689ae8
Add Emscripten customizations for libwasmfs (#309) 2025-06-14 21:53:36 +02:00
Anders Jenbo
975764dc17
Align OpenGL and SDL_GPU specular with software (#305) 2025-06-14 18:05:25 +02:00
Christian Semmler
2733ffcf69
Fix presenter progress event (#300) 2025-06-13 16:32:25 +00:00
Christian Semmler
5080e372f9
Emscripten port (#229)
* Emscripten port

* Fix NCC

* Update CMakeLists.txt

Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>

* Update CMakeLists.txt

Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>

* Update CMakeLists.txt

Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>

* Update CMakeLists.txt

* cmake: set iniparser cmake options in local scope

* ci: try adding emscripten to test matrix

* cmake: try to make CMake install package more usable

* cmake: fix typo

* Update CMakeLists.txt

Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>

* Add support for .ini loading

* Different default full screen behavior for Emscripten

* Add comments

* Add web platform

---------

Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
Co-authored-by: Anonymous Maarten <anonymous.maarten@gmail.com>
2025-06-13 00:26:43 +02:00
Anders Jenbo
bbb0de6e9a
Implement full screen (#290) 2025-06-12 22:51:52 +02:00
Anonymous Maarten
99c0d2d744
Enable callgrind for specific scenarios (#276) 2025-06-10 23:03:12 +00:00
Christian Semmler
9ebeda5c0e
Add Max LOD and Max Allowed Extras configs (#273)
* Add new config options

* Fix defaults

* Use global for `m_maxAllowedExtras`

* Revert
2025-06-10 01:08:13 +00:00
Anonymous Maarten
7e9acc8d04
Add IDirect3DRMMiniwinDevice interface (#267) 2025-06-09 16:34:37 +00:00
Joshua Peisach
e520a47e2f
Port CONFIG to Qt (#210)
Co-authored-by: Anonymous Maarten <anonymous.maarten@gmail.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
2025-06-03 03:48:04 +02:00
Anders Jenbo
ef7499bdb9 Restructure miniwin and add support for 3D backends 2025-05-29 04:07:53 +02:00
Anonymous Maarten
b24271a51b
Move miniwin to sdl3gpu subdirectory + add suffix to classes (#170) 2025-05-25 17:38:02 +00:00
Christian Semmler
110d9d4f7d
Update isleapp.cpp (#169) 2025-05-25 07:39:41 -07:00
Anonymous Maarten
183efa3d8f
More debug features: pause/step/resume (#140)
* More debug features: pause/step/resume

* Fix palette order (I think)

* Revert "Fix palette order (I think)"

This reverts commit a81de08f78.
2025-05-21 19:54:22 +02:00
Wouter Wijsman
911330e61c
Use SDL_EVENT_QUIT for window close (#126) 2025-05-21 19:33:53 +02:00
Anonymous Maarten
9d06cd9e53
Show imgui window when starting app with --debug (#138)
* Show imgui window when starting app with --debug

* g_closed test in SDL_AppIterate is still needed

* Allow disabling isleapp debugging by configuring with -DISLE_DEBUG=OFF

* clang-format
2025-05-20 23:36:51 +02:00
Christian Semmler
23182618cc
Merge remote-tracking branch 'isle/master' 2025-05-19 17:16:56 -07:00
Erik Schulze
d67318e78b
propagate name changes from commit fce97ea (#1508)
* propagate name changes from commit fce97ea

* remove dependency on omni types

* rename parameter too
2025-05-19 21:25:52 +02:00
AllMeatball
b1dfbe9925
isleapp: Show error dialog if NOCD.si or ISLE.si fails to load (#95)
* isleapp: Show error dialog if NOCD.si fails to load

* isleapp: Return bool in IsleApp::Tick

foxtacles recommended me to return a boolean for if tick failed
instead of just setting `g_closed` and setting `g_closeResult`
to set the return value of the program exit.

I also think this is the better solution. since a similar solution
was used in LoadConfig.

* isleapp: Better error logs & return false in places

foxtacles recommended to use SDL's logging api to show detailed errors
and using false in two places where it should exit because of failure.

This commit adds these two things.

* isleapp: Add missing error dialog when ISLE.si fails

* isleapp: Add missing error dialog when ISLE.si fails

* isleapp: Remove weird duplicate message box

* Move error dialog to loop

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
2025-05-16 23:08:45 +02:00
Anders Jenbo
9ae96cbff6
Implement a functional DirectDraw (#81) 2025-05-15 20:45:53 -07:00
Christian Semmler
662385e60a
Merge branch 'master' of github.com:isledecomp/isle-portable 2025-05-14 16:40:16 -07:00
Christian Semmler
aec7426665
Merge remote-tracking branch 'isle/master' 2025-05-14 16:40:05 -07:00
Anders Jenbo
fce97ea06f
Correct check for lighting support (#1486) 2025-05-15 01:39:55 +02:00
AllMeatball
da056ee45f
isleapp: Add icon upon window creation (#85)
* isleapp/res: Add icon.h

* isleapp: Set icon on non-windows systems

* isleapp: Fix formating to match with .clang-format

* isleapp: Remove _WIN32 ifdefs

This is closer to the original code. I thought it would let Windows
set the icon itself not set the icon upon window creation.

* isleapp: Load internal .BMP instead of raw pixels

This should fix the endianess problem I mentioned in the PR.

* isleapp: Only load icon from IOStream if it's valid

* isleapp: Disable format checking in ISLE/res/

* ISLE/res/resource.h: Prevent recursive inclusion

* ISLE: Remove isle.h from resource.h

also rename isle.h to isle_bmp.h

* isleapp: Fix formatting
2025-05-15 01:18:41 +02:00