Markus Wick
6f01b4226a
Merge pull request #2131 from JosJuice/gameini-2015-02-25
...
Gameini updates. (PR #2130 fixed and rebased)
2015-02-26 15:52:01 +01:00
Markus Wick
d6ccbb1f9c
Merge pull request #2004 from randomstuff/stringutil-c-locale
...
Use the C locale for non-Windows CharArrayFromFormatV() and StringFromFormat()
2015-02-25 13:17:04 +01:00
degasus
967eaad8df
VideoCommon: rename efb2tex and efb2ram
2015-02-24 23:10:13 +01:00
degasus
1313d3461f
VideoCommon: always enable efb copy
2015-02-24 23:01:01 +01:00
Markus Wick
5fc62ac563
Merge pull request #2085 from degasus/ogl_paletted
...
OGL: support palette texture decoding
2015-02-24 22:59:58 +01:00
degasus
ac7102918d
OGL: support palette texture decoding
2015-02-24 22:51:55 +01:00
Markus Wick
be6a151355
Merge pull request #2116 from Sonicadvance1/fix_exception_handler_crash
...
Fix a crash with fastmem disabled.
2015-02-24 12:02:22 +01:00
Markus Wick
c04270c073
Merge pull request #2111 from dolphin-emu/revert-1629-FIR-resampler
...
Revert "High quality resampler"
2015-02-23 18:48:35 +01:00
Markus Wick
e0b0ef3868
Revert "High quality resampler"
2015-02-23 18:43:13 +01:00
degasus
b35fa222f5
VideoCommon: perf querys by async events
2015-02-22 08:41:15 +01:00
degasus
edbd402101
VideoCommon: bbox by async events
2015-02-22 08:41:15 +01:00
degasus
ad7264da7d
VideoCommon: implement swap requests in the full async way
2015-02-22 08:41:15 +01:00
degasus
bc248f8941
VideoCommon: use a new async event system for efb access
2015-02-22 08:41:15 +01:00
Markus Wick
95c48b2be7
Merge pull request #2018 from JosJuice/gameini-region-wildcard
...
Support game INIs that match all regions
2015-02-21 15:47:57 +01:00
Markus Wick
6bbf774507
Merge pull request #2075 from magumagu/titantron-fix
...
Partially fix WWE12 titantron videos.
2015-02-21 10:09:47 +01:00
Markus Wick
5da28f394a
Merge pull request #2083 from phire/zfreeze-regression
...
Fix regression with directx when zfreeze=true and ztest=false.
2015-02-21 09:30:05 +01:00
Markus Wick
1a3bc8f286
Merge pull request #2001 from mimimi085181/multiple-texture-cache-entries
...
Allow multiple texture cache entries for textures at the same address
2015-02-19 01:08:07 +01:00
Markus Wick
86226cb2b9
Merge pull request #1979 from Mullin/head
...
Use clock_gettime instead of gettimeofday, it's more efficiency on low power system
2015-02-18 21:54:16 +01:00
Markus Wick
f38b3ace38
Merge pull request #2038 from magumagu/disable-thread-safety-checks
...
Disable thread safety assertions added in PR1987.
2015-02-15 10:33:19 +01:00
Markus Wick
405444d4fe
Merge pull request #1803 from lioncash/rgb
...
OnScreenDisplay: Allow for different colored messages
2015-02-14 10:47:47 +01:00
degasus
c404e87226
ShaderGen: Fix pixel offset correction
...
We want to move the vertex by 1/12 pixel, but the old code
did miss the perspective division. So by multiplying with pos.w,
the position is moved correctly after the perspective division.
2015-02-11 20:54:15 +01:00
Markus Wick
2aef84d80c
Merge pull request #2025 from phire/be-neobrain
...
Remove VBeam Speed Hack.
2015-02-09 12:55:58 +01:00
Markus Wick
b79015186e
Merge pull request #2023 from mrgreywater/d3d-efb-ms-crash-fix
...
D3D: Fixed crash rendering EFB textures with MSAA
2015-02-08 22:11:15 +01:00
Markus Wick
550dc273f3
Merge pull request #2014 from degasus/master
...
HotKey: fix warnings
2015-02-05 13:32:07 +01:00
degasus
68c70be960
HotKey: fix warnings
2015-02-04 20:19:16 +01:00
Markus Wick
235fa05171
Merge pull request #2013 from lioncash/emplace
...
Use emplace_* functions where in-place construction is preferable
2015-02-04 17:46:07 +01:00
Markus Wick
b2df8cb87f
Merge pull request #2005 from magumagu/d3d-efb-depth
...
Fix regression for D3D EFB depth copies.
2015-02-03 20:50:20 +01:00
degasus
081137bd4f
VideoBackends: set GLInterface to zero after deleting it
...
This fixes a crash on opening the gfx settings after closing a game.
2015-02-01 13:51:34 +01:00
Markus Wick
3c475b91ea
Merge pull request #1993 from Armada651/line-perspective
...
GeometryShaderGen: Perspective divide the line coordinates before comparing the angle.
2015-01-31 23:45:54 +01:00
Markus Wick
ca5e2e6f16
Merge pull request #1989 from lioncash/leak
...
OGL: Fix a memory leak that would occur every time a game is launched
2015-01-31 23:06:21 +01:00
Markus Wick
22e27ffd23
Merge pull request #1990 from Tilka/getvertexsize
...
VertexLoaderManager: assimilate GetVertexSize()
2015-01-31 19:15:09 +01:00
Markus Wick
92294bf8be
Merge pull request #1986 from lioncash/unique
...
Use unique_ptr for some IVolume instances
2015-01-30 12:40:10 +01:00
degasus
20628b6e5d
OpcodeDecoder: Calculate decoding time for vertices
2015-01-29 19:55:28 +01:00
Markus Wick
b0afc3de07
Merge pull request #1981 from Sonicadvance1/fix_x86_64_clang
...
Fix clang on x86_64.
2015-01-29 12:44:34 +01:00
Markus Wick
aa5ab45104
Merge pull request #1977 from rohit-n/unused-variable
...
Silence -Wunused-variable warning.
2015-01-28 21:18:02 +01:00
Markus Wick
109fa8c2c8
Merge pull request #1800 from randomstuff/jit-register
...
Add support of more JIT-compiled code for profiling
2015-01-28 13:23:32 +01:00
Markus Wick
eedc7bb582
Merge pull request #1975 from Tilka/fix_warning
...
CoreTiming: fix warning
2015-01-28 09:33:39 +01:00
Markus Wick
c559e9e13d
Merge pull request #1974 from magumagu/efb-copy-d3d-unset
...
Fix D3D regression from PR1948.
2015-01-28 09:33:12 +01:00
Markus Wick
beaa9905a6
Merge pull request #1966 from magumagu/unify-efb-encode
...
Unify EFB encoding shader generation
2015-01-27 23:14:18 +01:00
Markus Wick
da31314775
Merge pull request #1970 from magumagu/d3d-cleanup
...
D3D: delete unnecessary code.
2015-01-27 22:26:46 +01:00
Markus Wick
43605f8716
Merge pull request #1948 from magumagu/remove-efb-cache
...
Remove EFB to RAM cache, and simplify code.
2015-01-27 09:42:15 +01:00
Markus Wick
8eda3ca844
Merge pull request #1956 from Tilka/vertex_loader_jit
...
VertexLoader: clean up and fix some problems
2015-01-27 09:15:09 +01:00
Markus Wick
53a9df10f9
Merge pull request #1817 from Armada651/custom-anaglyph
...
PostProcessing: Add support for user-supplied anaglyph shaders.
2015-01-26 11:08:29 +01:00
Markus Wick
ae514cb0f2
Merge pull request #1955 from degasus/master
...
TexCache: Rewrite the texID generation for paletted textures
2015-01-24 15:37:25 +01:00
degasus
51990fcdfa
TexCache: Rewrite the texID generation for paletted textures
...
This changes the behavior if both texture are available. The old code did
try to load the modfied texID, the new code tries the unmodified texID first.
2015-01-24 13:58:20 +01:00
Markus Wick
4f6d0049a7
Merge pull request #1951 from Sonicadvance1/Remove_old_defines
...
Remove an old GLES define that I missed.
2015-01-24 13:38:26 +01:00
degasus
7cf4dd63e4
CustomTexture: fix texture format
2015-01-21 23:33:42 +01:00
degasus
1d0557a5e6
CustomTexture: use xxhash
2015-01-21 21:47:18 +01:00
degasus
84c8645d22
CustomTexture: Convert old format automatically
2015-01-21 21:22:55 +01:00
degasus
f9ced4eb13
CustomTexture: also support the legacy format
2015-01-21 21:22:55 +01:00
degasus
62402efa6c
CustomTexture: Mark textures with mipmaps
2015-01-21 21:22:55 +01:00
degasus
ee9d05d67f
CustomTexture: Use another file name with wildcards
2015-01-21 21:22:55 +01:00
degasus
a353ead3cb
CustomTexture: Use always safe texture hash
2015-01-21 21:22:55 +01:00
degasus
eeaad06a07
CustomTexture: check for min/max index on paletted textures
2015-01-21 21:22:55 +01:00
degasus
402fb4bd20
xxhash: Add cmake + VS files
...
Based on riking's PR.
2015-01-21 07:35:34 +01:00
degasus
b1206ffbad
Externals: add xxhash
...
Files are copied unmodified from https://code.google.com/p/xxhash/
2015-01-20 21:19:27 +01:00
Markus Wick
49352cfcb9
Merge pull request #1928 from rohit-n/build-pch
...
Fix building with PCH disabled.
2015-01-20 18:23:18 +01:00
Markus Wick
8ff1dc9c87
Merge pull request #1925 from Tilka/vertex_loader_jit
...
VertexLoaderX64: fix alpha of indirect 8888 colors
2015-01-20 09:40:46 +01:00
Markus Wick
0d0f7ec662
Merge pull request #1894 from Armada651/exclusive-fix
...
D3D: Fix Dolphin immediately exiting exclusive fullscreen.
2015-01-19 23:29:43 +01:00
Markus Wick
7454297820
Merge pull request #1922 from Tilka/vertex_loader_jit
...
VertexLoader: fix position offset bug
2015-01-19 17:53:50 +01:00
Markus Wick
5357b9c95f
Merge pull request #1899 from degasus/texcache
...
Texture Pool
2015-01-19 00:12:22 +01:00
degasus
9f13a77799
TexCache: don't try to aggressive reuse the entry
...
As we pool them now, freeing and reallocating them is quite fast.
2015-01-18 19:58:33 +01:00
degasus
8565f02699
TexCache: use an unordered_multimap for the tex pool
2015-01-18 19:58:33 +01:00
degasus
4639d3b1bc
TexCache: also incude textures within the render target pool
2015-01-18 19:47:48 +01:00
degasus
6cd6e6546f
TexCache: merge texture and rendertarget factory function
2015-01-18 19:47:48 +01:00
degasus
615ae9f106
TexCache: remove PC_TexFormat
...
We only support rgba32 for a while now, so there is no need to have everything in common configureable.
2015-01-18 19:47:48 +01:00
Markus Wick
0acbb88aa2
Merge pull request #1905 from degasus/master
...
VideoSW: Fix vertex skipping
2015-01-18 04:59:16 +01:00
degasus
3630de99ed
VideoSW: Fix vertex skipping
2015-01-18 04:52:56 +01:00
Markus Wick
dbdae093cc
Merge pull request #1902 from mimimi085181/master
...
Fix another small bug with the efb2ram cache
2015-01-18 01:45:36 +01:00
Markus Wick
7069450ce5
Merge pull request #1872 from degasus/texcache
...
Texcache cleanup 2
2015-01-13 22:45:49 +01:00
Markus Wick
0932282caf
Merge pull request #1818 from ZephyrSurfer/master
...
Fix scaling in Virtual XFB.
2015-01-13 07:58:54 +01:00
Markus Wick
980ce440ef
Merge pull request #1813 from Armada651/convergence
...
Add UI for per-game stereoscopy settings.
2015-01-13 00:25:38 +01:00
Markus Wick
5be85cf928
Merge pull request #1814 from phire/worldspace_untangling
...
Move worldpos into it's own varying.
2015-01-12 22:59:21 +01:00
Markus Wick
197c38e865
Merge pull request #1878 from skidau/fifo-overflow-xfb
...
Made the CPU thread wait for the GPU thread to swap
2015-01-12 22:53:46 +01:00
degasus
22e06daf5c
TexCache: recreate the entry on level missmatch
2015-01-11 23:11:04 +01:00
degasus
7284312568
OGL: Warn about wrong texture sizes
2015-01-11 22:47:40 +01:00
degasus
a9eb08b85d
TexCache: Choose texture based on mipmap count
2015-01-11 22:41:04 +01:00
degasus
744b1c1624
TexCache: rewrite level calculation
2015-01-11 22:23:35 +01:00
degasus
d95e5e2b6f
TexCache: create a const Config struct
2015-01-11 22:23:35 +01:00
degasus
d640453274
TexCache: cleanup max texture level
2015-01-11 22:23:35 +01:00
degasus
1261f5f7f4
TextureCache: inline arguments into texture cache
2015-01-11 22:23:35 +01:00
degasus
2b47df07b6
TexCache: use c++11 syntax for std::map::erase
2015-01-11 22:23:35 +01:00
degasus
1c98a43203
TexCache: clean up frameCount handling
2015-01-11 22:23:35 +01:00
degasus
6ba613fbd3
TexCache: unify global variables
2015-01-11 22:23:35 +01:00
degasus
774596dbed
TexCache: rename OverlapsMemoryRange
2015-01-11 22:23:35 +01:00
degasus
dddcea5a9a
TexCache: don't invalidate efb copys because of config changes
...
We'll loose data on invalidating them. So just keep them until a new copy is done.
A wrong scaled copy is better than no copy if the game doesn't creates a new one.
2015-01-11 22:23:35 +01:00
Markus Wick
763f073bf6
Merge pull request #1871 from FioraAeterna/fixlocale
...
StringUtils: use C locale instead of .1252
2015-01-11 13:30:26 +01:00
Markus Wick
6c46f27709
Merge pull request #1501 from degasus/texture_creation
...
D3D: remove load texture on creation optimization
2015-01-11 01:01:18 +01:00
Markus Wick
5dd93fd62b
Merge pull request #1866 from mimimi085181/master
...
Fix a small efb2ram bug
2015-01-10 23:53:26 +01:00
degasus
38f42da55a
TexCache: remove expanded_width
...
This variable isn't use any more.
2015-01-10 12:22:03 +01:00
degasus
614d058db1
TexCache: don't load tex level 0 on creation
...
This reverts an optimization which isn't worth imo. Every texture uploads have to alloc vram and a staging buffer, so there is no need to do both in the same call.
2015-01-10 12:21:33 +01:00
degasus
8bdbe37c91
TexCache: Wipe pal hash
2015-01-10 11:55:16 +01:00
Markus Wick
cdf15bbe0a
Merge pull request #1858 from Armada651/patch-1
...
FramebufferManager: Remove unnecessary sampler declaration.
2015-01-09 14:56:28 +01:00
Markus Wick
f0f8384639
Merge pull request #1785 from degasus/custom_texture
...
VideoCommon: Custom texture handling
2015-01-08 13:29:45 +01:00
Markus Wick
660e0476c7
Merge pull request #1851 from Tilka/indentation
...
Fix indentation
2015-01-07 22:50:02 +01:00
Markus Wick
a2ec4d5f51
Merge pull request #1836 from FioraAeterna/catchillegalinst
...
JIT: catch illegal instruction errors
2015-01-06 23:10:46 +01:00
Markus Wick
f63361ad26
Merge pull request #1810 from Stevoisiak/FreelookDefaultHotkeyFix
...
Changed default freelook hotkey to match description
2015-01-06 20:52:00 +01:00
Markus Wick
f080e0221e
Merge pull request #1758 from rohit-n/build-pch
...
Fix building with PCH disabled.
2015-01-06 20:42:50 +01:00
Markus Wick
09a10622dd
Merge pull request #1621 from FioraAeterna/pscleanup
...
JIT: cleanups/optimizations for ps loadstore
2015-01-06 20:12:50 +01:00
Markus Wick
25fac0282c
Merge pull request #1764 from Armada651/safe-exclusive
...
D3D: Only try to apply exclusive mode when the renderer is in focus.
2015-01-06 11:00:47 +01:00