Commit graph

4441 commits

Author SHA1 Message Date
Sacha
e0ef9a9505 Buildfix (all C++0x compilers). Drop the std::, do a static_cast for narrowing conversion as required by C++0x spec. 2013-05-04 00:06:41 +10:00
Henrik Rydgård
3ddf1d016a Merge pull request #1649 from raven02/patch-4
Minor UI fix
2013-05-03 07:03:51 -07:00
raven02
4286c8e031 Minor UI fix 2013-05-03 21:29:45 +08:00
Henrik Rydgård
9f76a533ad Merge pull request #1648 from PeterTh/master
Scaler cleaning, speedup
2013-05-03 05:49:23 -07:00
Peter Thoman
f4f0a958d3 Applied loop tiling/strip mining to algorithms where it makes sense 2013-05-03 14:38:24 +02:00
Henrik Rydgård
831681110d Merge pull request #1647 from raven02/patch-3
Add Hybrid option for Texture Scaling
2013-05-03 05:26:55 -07:00
raven02
401d373068 Add Hybrid option for Texture Scaling 2013-05-03 20:23:43 +08:00
Peter Thoman
fa8250ba12 Avoid scaling empty and flat textures 2013-05-03 13:35:24 +02:00
Peter Thoman
75bbe9df9f Clean up (and slightly speed up) blinear scaling 2013-05-03 13:17:36 +02:00
Henrik Rydgård
655e7dbfbb Merge pull request #1640 from PeterTh/master
Texture scaling improvements
2013-05-03 01:37:39 -07:00
Henrik Rydgård
1a6c5daf0c Merge pull request #1646 from unknownbrackets/texcache
Minor texture cache optimizations + blend fix
2013-05-03 01:35:20 -07:00
Peter Thoman
7d2fd0ea31 Removed Bilinear texture filtering option 2013-05-03 10:29:29 +02:00
Unknown W. Brackets
9537be9ebb Don't double src alpha when it's not safe to do so.
Fixes LittleBigPlanet vignette.
2013-05-03 01:10:59 -07:00
Unknown W. Brackets
df65bb40ac Avoid copying a tex if the PSP format is perfect. 2013-05-03 01:02:00 -07:00
Henrik Rydgård
4df7549a8c Merge pull request #1637 from raven02/patch-2
Hide mouse cursor in full screen mode (Windows)
2013-05-03 00:16:04 -07:00
Unknown W. Brackets
57c7b21640 Convert colors before applying clut, not after.
No reason to build it wrong and fix it afterward.
2013-05-03 00:12:42 -07:00
Sacha
8cb0423f32 Avoid name collision with ThreadPool on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry. 2013-05-03 16:31:53 +10:00
Sacha
2396574f45 Avoid name collision with StringUtil on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry. 2013-05-03 16:22:15 +10:00
Sacha
8dd683f63f Fix name collision when building on Windows. Was preventing Blackberry from building. 2013-05-03 16:10:23 +10:00
raven02
b3f7df6d29 Minor fix 2013-05-03 09:10:02 +08:00
Peter Thoman
49fbf2b177 Fixed merging messup 2013-05-03 02:57:23 +02:00
Peter Thoman
edf94091db Final Hybrid scaling adjustments & remove debug output 2013-05-03 02:51:07 +02:00
Peter Thoman
39f0b6e6cf Adapt non-windows UI to new config names 2013-05-03 02:46:34 +02:00
Peter Thoman
ed870dbcc9 Better alpha component fix for xbrz 2013-05-03 02:44:27 +02:00
raven02
f53c5dc381 Rename 2X Render Resolution to "Anti-Aliasing" for Andriod/iOS 2013-05-03 06:44:08 +08:00
raven02
77653f03b5 Better Align OK/Back button 2013-05-03 06:39:28 +08:00
raven02
7e9c3052f8 Hide mouse cursor in full screen mode 2013-05-03 06:27:46 +08:00
Peter Thoman
d8df8a6796 Merge branch 'master' of https://github.com/hrydgard/ppsspp
Conflicts:
	Core/Config.cpp
	Core/Config.h
2013-05-03 00:24:03 +02:00
Peter Thoman
c692aaa936 remove outdated config parameters 2013-05-03 00:20:38 +02:00
Unknown W. Brackets
4665226064 Fix typo breaking XBRZ option. 2013-05-02 14:32:45 -07:00
Henrik Rydgard
cd55068026 iFrameSkip should be an int. 2013-05-02 21:36:36 +02:00
Henrik Rydgard
0ccebacbd6 Turn off screensavers. Note that this won't work on Vista+ when there's a password. 2013-05-02 20:58:50 +02:00
Henrik Rydgård
51493ab8cb Merge pull request #1633 from raven02/patch-1
Fix message dialog oversize
2013-05-02 11:27:36 -07:00
Henrik Rydgård
10b4b0acf8 Merge pull request #1632 from unknownbrackets/config
Stick to a single config entry per option
2013-05-02 11:27:22 -07:00
Henrik Rydgard
6d66577f17 Don't write to transformedvertex.color1[4], it doesn't exist. 2013-05-02 20:18:46 +02:00
Peter Thoman
ec52816c17 Merge 2013-05-02 20:09:43 +02:00
Peter Thoman
e352432aab Hybrid scaling works now 2013-05-02 20:05:41 +02:00
Peter Thoman
64146f343a xbrz: fixed byte order, made distance function alpha-aware 2013-05-02 18:24:23 +02:00
raven02
e1587744e4 Fix message dialog oversize 2013-05-02 23:24:59 +08:00
Unknown W. Brackets
a1cb85cd05 Stick to a single config entry per option.
We don't need a bool in the ini AND an int setting.

This should also fix the anistropy setting, which appears to have been
pretty much broken.  Also makes frameskip enable even if you don't tap
auto, which is what I'd assumed it did before.
2013-05-02 08:15:50 -07:00
Henrik Rydgård
45b6670310 Merge pull request #1629 from raven02/xbrz
Add xBRZ texture scaling to Android/iOS
2013-05-02 06:13:27 -07:00
raven02
773864566a Take out above 3x 2013-05-02 21:01:20 +08:00
Jacky TSUI
3d27799601 Add xBRZ texture scaling to Android/iOS 2013-05-02 20:51:02 +08:00
Peter Thoman
d70641d3f2 Manual merge 2013-05-02 14:25:18 +02:00
Peter Thoman
7ae3894365 Added functionality for hybrid scaling (not yet working) 2013-05-02 14:09:46 +02:00
Henrik Rydgård
c84ca2968e Merge pull request #1626 from tpunix/master
DLC bug fix
2013-05-02 03:30:48 -07:00
tpu
f3d6cffd72 npdrmLseek/npdrmRead BUG fix 2013-05-02 17:47:34 +08:00
Henrik Rydgard
42a4a1e4ba Brightness fix for scaled RGB565 and RGB5551 textures. Fix broken color conversion in DecodeTexture (which is not normally used). 2013-05-02 10:59:45 +02:00
Henrik Rydgard
a125da7af6 Don't scale textures in "kernel" memory (like the 2048x2048 PPGe texture). 2013-05-02 10:18:26 +02:00
Henrik Rydgård
837e249aa4 Merge pull request #1624 from unknownbrackets/windows
Clean up some menu options / consistency in Windows menus
2013-05-02 01:07:04 -07:00