Commit graph

343 commits

Author SHA1 Message Date
willrandship
dbeaf9e922 Fixed a few spots in the code, mostly about whitespace and comments. 2014-05-14 22:28:14 -07:00
willrandship
977de262d2 Added a new option "wrpAntiAliasing #" that enables antialiasing for Glide64mk2. 2014-05-14 22:28:14 -07:00
Richard Goedeken
fff233037f Merge pull request #5 from bentley/master
Detect OpenBSD's PowerPC platforms, macppc and socppc.
2014-05-10 08:43:00 -07:00
Anthony J. Bentley
479551441d Detect OpenBSD's PowerPC platforms, macppc and socppc. 2014-05-09 22:00:48 -06:00
Richard Goedeken
e1bebb35f7 SDL 1.2 is not deprecated for us, and we shouldnt frighten the user with 6 lines of exclamation points 2014-05-04 11:37:40 -07:00
Ursula Abendroth
1c06f02291 Switch by default to SDL2 for Mupen64Plus 2.1
The current version of SDL is 2.0.3. All new releases of distributions contain
this library already. Current Linux distributions and OpenBSD even backporting
patches from Mupen64Plus 2.1 repo to use SDL 2. Android and other mobile
platform don't have support for legacy SDL 1.2.

People like Anthony J. Bentley and Riley Labrecque already requested
a new release of Mupen64Plus 2.1 with SDL2
2014-04-23 19:33:14 +02:00
Richard Goedeken
f773f375e6 Merge pull request #3 from ecsv/osx_ftbfs
Use glGetHandleARB to get program object
2014-03-08 22:03:34 -08:00
Sven Eckelmann
c6b3395ce5 Use glGetHandleARB to get program object
Some systems don't define the GLHandleARB as unsigned integer and thus want to
get a complete pointer when calling glUseProgramObjectARB. This makes it
necessary to change the program variable to GLHandleARB and replace the
glGetIntegerv call to the old ARB glGetHandleARB to make sure that the returned
data can be of any type and not only integer.
2014-03-08 19:00:43 +01:00
Richard Goedeken
af3ce5ac49 Merge pull request #2 from ecsv/config_api
Export special settings to overwrite game-specific settings
2014-01-19 09:11:55 -08:00
Sven Eckelmann
5f03867bd3 Allow to overwrite special game-specific settings
The user may need to change the settings which are usually set per game. This
is done by exposing the default settings with value -1 to the mupen64plus
config api and only use them when the value was changed to >= 0.
2014-01-19 15:51:04 +01:00
David Roth
49995db545 Add additional options aspectmode and read_always to exported options
Those two options are now editable by the user and frontends.

aspectmode values:

0 = Force 4:3 (default)
1 = Force 16:9
2 = Stretch
3 = Original

Signed-off-by: David Roth <davidroth9@gmail.com>
2014-01-19 13:27:45 +01:00
Sven Eckelmann
19a277ecfb Remove ported and unused settings from Glide64mk2.ini
All used non-special are currently exported by the config API. The only missing
ones for the special configuration options which would be be overwritten by
special game settings and thus need a special config rewrite

 * alt_tex_size
 * use_sts1_only
 * force_calc_sphere
 * correct_viewport
 * increase_texrect_edge
 * decrease_fillrect_edge
 * texture_correction
 * pal230
 * stipple_mode
 * stipple_pattern
 * force_microcheck
 * force_quad3d
 * clip_zmin
 * clip_zmax
 * fast_crc
 * adjust_aspect
 * zmode_compare_less
 * old_style_adither
 * n64_z_scale
 * optimize_texrect
 * ignore_aux_copy
 * hires_buf_clear
 * fb_read_alpha
 * useless_is_useless
 * fb_crc_mode
 * filtering
 * fog
 * buff_clear
 * swapmode
 * aspect
 * lodmode
 * fb_smart
 * fb_hires
 * read_back_to_screen
 * detect_cpu_write
 * fb_get_info
 * fb_render
2014-01-19 13:27:45 +01:00
Richard Goedeken
9f18a24517 Merge pull request #1 from ecsv/re2
Handle empty display list as found in Resident Evil II
2014-01-08 21:41:55 -08:00
Bobby Smiles
cb07ed9b91 Handle empty display list as found in Resident Evil II
The case when display list pointer is null wasn't handled previously
and could cause infinite loops. This patch addresses this case.
Now Resident Evil II boots even with the HLE rsp plugin.
2014-01-08 10:34:27 +01:00
Sven Eckelmann
9d821ce213 Reduce optimization to avoid problems with old C++ compilers 2013-12-20 12:10:18 +01:00
Sven Eckelmann
6bf363d38b Force line ending type for specific files
Different operation systems (Unix vs. Windows) use different line ending types.
It can easily happen that users from different systems edit files and replace
all line endings of a file with the system specific version. This screws up
diffs and makes merges harder.

Git can normalize line endings for specific files and avoid this problem.
Binary files should be marked to avoid accidentally normalization.
2013-12-19 14:19:08 +01:00
Sven Eckelmann
811a1f0ce1 Convert .hgignore to .gitignore 2013-12-19 14:13:38 +01:00
Sven Eckelmann
1e1d1f91e4 Set shader again after displaying OSD
Some titles like Resident Evil 2/Biohazard 2 display a cutscene and the shader
is only set for the first frame. The next frames just expect that the old
shader is still set.

The OSD workaround only disabled the shader program before and expected that
the next frame automatically sets it again. This assumption was wrong and
instead the program has to be reassigned again to the current rendering
context when the renderCallback for the OSD was called.
2013-12-15 12:19:28 +01:00
Sven Eckelmann
977e839df4 Don't include thread headers when filter threads are disabled 2013-11-08 11:42:07 +01:00
Sven Eckelmann
eab6575957 Reduce diff to upstream S2TC by just not compiling env config code 2013-11-05 17:51:44 +01:00
Rudolf Polzer
3db55b8fa5 Fix uninitialized memory access in s2tc
Origin: upstream, c9a70d0f45
2013-11-05 17:46:27 +01:00
Sven Eckelmann
64e651c1d3 Reset s2tc refinement to faster default value
The alpha pixel bleeding effect was fixed in the last three commits and
therefore the faster refinement method can be used again.
2013-11-04 12:44:51 +01:00
Rudolf Polzer
edb80102f9 reenable alpha 0 pixel ignorance for DXT1
As DXT1 never stores color values where alpha is 0.

Origin: upstream, 8d4ff5b2c8
2013-11-04 12:42:13 +01:00
Rudolf Polzer
aa6880f62e Fix a weird bug in selecting initial colors by wrong order of loads/stores.
Origin: upstream, 239cf33564
2013-11-04 12:42:13 +01:00
Rudolf Polzer
eaa576cd51 Fix alpha zero pixels wreaking havoc
One place accidentally ignored alpha-zero pixels, making it inconsistent
with the rest and causing bad visual errors in MODE_FAST.

Origin: upstream, 1fc9f34d7c
2013-11-04 12:42:13 +01:00
Sven Eckelmann
7a8f1e8029 Don't fail rebuild when header is removed
The *.d depends files for make just list the files used when building an
object file. Removing a file listed in such a dependency file causes make to
search for a way to recreate it. This usually cannot work because these files
aren't autogenerated.

The gcc option -MP can be used to generate empty rule for these files. Removing
a file in a dependency list will then execute this empty rule and continue with
the execution of the creation of the object file. This compilation process will
then automatically correct the dependency file.
2013-09-20 10:31:54 +02:00
Sven Eckelmann
f80a90d704 Allow to compile under kFreeBSD and Hurd 2013-09-01 14:11:56 +02:00
Sven Eckelmann
92e06a08a9 Add a workaround for systems not defining PATH_MAX 2013-09-01 14:11:35 +02:00
Sven Eckelmann
c261bed510 Fix broken swprintf on windows 2013-08-26 09:18:46 +02:00
Sven Eckelmann
b29bc90c92 Enable the dump_cache to allow loading of dat files 2013-08-23 22:56:23 +02:00
Sven Eckelmann
e94390db86 Remove finished asm2C item from TODO list 2013-07-17 07:57:46 +02:00
Sven Eckelmann
06af677c3e Fix warnings in S2TC 2013-07-16 23:48:37 +02:00
Sven Eckelmann
9701fde95b Replace patented S3TC algorithm with S2TC 57881ec6 2013-07-16 23:48:27 +02:00
Richard Goedeken
a774ef1908 fix compiler warning 2013-07-11 21:34:34 -07:00
Sven Eckelmann
63bae44652 Don't try to reinit txc_dxtn when it was already loaded 2013-07-11 07:54:27 +02:00
Sven Eckelmann
ef4f026b50 Allow to replace patented S3TC algorithm with compatible txc_dxtn
The S3TC is patented in some countries which makes it hard for distribution.
Mesa is using an external library which is using a compatible algorithm called
S2TC. But also S3TC implementations of this library are available.

Distributions can use this option to be on the safe side regarding the provided
functionality.
2013-07-10 23:18:54 +02:00
Sven Eckelmann
e5a2c4a1e2 Avoid wrong colors in compressed fxt1 textures
mesa-7.8.1-24878-g3998cfa has better support for fxt1 and can even make the
YUV/ARGB hacks unnecessary. Mesa is now the upstream for this code and
therefore it is a good source when upgrading.
2013-07-10 23:15:17 +02:00
Richard Goedeken
44865ac350 video plugin should call VidExt_Quit when it is done 2013-07-09 23:27:40 -07:00
Anthony J. Bentley
9cac2e3123 Don't use nonportable (and redundant) GCC construct.
This doesn't exist in all versions of GCC, and the #else case generates
the same assembly code anyway with -O2.
2013-07-08 21:49:15 -06:00
Sven Eckelmann
e7c156e47c Enable RGB and YUV input for hires quantization filter 2013-07-08 22:52:10 +02:00
richard42
cc19d820a5 simplify OSX platform detection in makefile using xcode-select. based on patch from John Pender 2013-07-08 07:43:09 -07:00
Richard Goedeken
016657e90d Added tag 2.0 for changeset 158331c72625 2013-07-04 15:48:35 -07:00
Richard Goedeken
25af1a819c update version number to 2.0 2013-07-03 07:15:51 -07:00
Richard Goedeken
c1819b551c updated LICENSES 2013-06-27 22:58:54 -07:00
Richard Goedeken
fb63115f2f update text files for upcoming 2.0 release 2013-06-26 23:07:53 -07:00
Richard42
21a0acb5e2 OSX build fixes 2013-06-12 09:23:47 -07:00
Richard Goedeken
0424cdfb56 tagged v2.0-rc2 2013-06-01 18:00:33 -07:00
Richard Goedeken
df69329d51 fixed warnings due to changes for win32 build. update makefile to reflect main.cpp file renamed to glitchmain.cpp 2013-06-01 09:27:33 -07:00
richard42
3fdf973e14 renamed msvc10 project folder to msvc11 2013-06-01 08:18:52 -07:00
richard42
56f2b7ef85 1. Update msvc11 project file to visual studio 2012 (msvc11)
2. fixed warnings and errors in vs2012
2013-06-01 08:07:39 -07:00