Henrik Rydgård
61351e4b59
Merge branch 'patch-1' of https://github.com/raven02/ppsspp into raven02-patch-1
...
Conflicts:
Windows/ppsspp.rc
native
2013-07-25 18:20:08 +02:00
raven02
bf8e32f6f6
Remove entire if and contents
2013-07-25 20:54:24 +08:00
raven02
82b2581d79
Remove 'Display raw framebuffer' option
2013-07-25 20:23:22 +08:00
raven02
629a134946
Fix divide by 0 bug
2013-07-25 00:29:05 +08:00
raven02
f79de0b541
Max frameskip as 8 and code cleanup
2013-07-24 22:46:47 +08:00
Henrik Rydgård
9644de0949
Merge pull request #2895 from raven02/patch-4
...
FBO to memory : Skip frame along with frameskipping option
2013-07-23 05:24:05 -07:00
raven02
858d1d6987
Framebuffer to memory : Skip frame inline with frameskipping option
2013-07-23 20:01:31 +08:00
raven02
4514e07ac1
Use LINEAR and LINEARFMV for framebuffer
2013-07-23 19:30:01 +08:00
Henrik Rydgard
0cbe0dc997
Let's try raven02's #2880 , which failed to merge normally so I did it manually instead.
2013-07-22 22:57:12 +02:00
raven02
76bd4e3120
Fix rendering mode switching issue in old & new UI
2013-07-22 08:41:58 +08:00
Henrik Rydgard
ab654a2b6f
Quickfix for crashes switching rendering mode
2013-07-21 23:03:01 +02:00
raven02
100d336fb2
Remove _ suffix and hide the GPU mode on GLES2
2013-07-22 04:17:54 +08:00
raven02
0216f52359
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
UI/GameSettingsScreen.cpp
UI/MenuScreens.cpp
Windows/ppsspp.rc
2013-07-22 00:03:54 +08:00
raven02
87fc81e56d
Consolidate Rendering Mode
2013-07-21 23:17:42 +08:00
raven02
b96e0a0dfe
Add NOTICE_LOG to show GPU vendor
2013-07-21 01:39:37 +08:00
raven02
7ac496529b
Vendor Based Alpha and Color Testing
2013-07-21 01:14:36 +08:00
Henrik Rydgard
444a39f32b
Need to "dirty" framebuffers when updating them from memory. Should fix #2828 .
2013-07-18 20:01:22 +02:00
Henrik Rydgård
ff5dfcec13
Merge pull request #2786 from raven02/patch-6
...
New attempt to generate FBO using fb_stride
2013-07-17 11:45:13 -07:00
raven02
07e118b6a1
New attempt to generate FBO using fb_stride
2013-07-18 02:17:54 +08:00
Henrik Rydgard
81411a74ed
Experimental: Make orientation change possible on Android.
2013-07-16 22:51:25 +02:00
raven02
3d8474a64a
Fix missing title screens in Growlanser
2013-07-15 20:11:23 +08:00
raven02
925714ab39
Better attempt to calc FBO size using viewport , scissor & region all together
2013-07-13 20:26:04 +08:00
Henrik Rydgard
4c913c097e
new attempt at sizing the framebuffers, similar to what raven02 said
2013-07-10 21:59:43 +02:00
Henrik Rydgård
605cf26621
Revert part of 76c3f16b5c
, forcing all
...
framebuffers to 512x512 just can't be the right thing to do and breaks
Dangan Ronpa badly.
2013-07-08 10:16:36 +02:00
raven02
8cf50d62fb
Fix texture misalignment & distortion in multiple games
2013-07-07 12:17:52 +08:00
Henrik Rydgård
c71ae64454
Merge pull request #2648 from raven02/patch-4
...
Fall back to use region instead of viewport to estimate drawing size
2013-07-06 13:13:33 -07:00
Henrik Rydgard
cc58e34cf8
Remove legacy key mapping and associate devices with keys (DInput has been left behind for now, will be fixed up soon). Saving is broken, will be fixed soon.
2013-07-06 20:45:44 +02:00
raven02
e318e49061
Apply scissor() , Last Ranker need it to render correctly
2013-07-07 00:47:25 +08:00
raven02
e362bc8357
Fall back to use region instead of viewport to estimate framebuffer drawing size
2013-07-06 22:37:37 +08:00
Henrik Rydgard
a599bf7500
Assorted warning fixes and cleanups
2013-07-06 11:09:19 +02:00
Henrik Rydgard
25392cd408
More android buildfixin'
2013-07-06 00:40:01 +02:00
arnastia
b5cc23d018
Try to guess GPU to differentiate pixel type to request in glReadPixels(); changed ConvertFromRGBA8888 to iterate linearly.
2013-07-05 02:31:31 +01:00
arnastia
7747fc9ca7
Some changes around pixel format conversion, should work on all cards and Android/OpenGL ES devices now (only fully tested on Nvidia); commenting and code cleanup.
2013-07-04 15:24:37 +01:00
arnastia
5a1071f157
Framebuffers are now read to system memory every third frame (done in Framebuffer::DecimateFBOs()).
2013-07-02 14:10:20 +01:00
arnastia
796800adfd
CPUConvert is now FramebuffersCPUConvert; allocated memory addressed by fb_address is now used in packing code for both OpenGL and OpenGL ES; some code cleanup, most of it pixel format conversion code.
2013-07-02 14:08:59 +01:00
arnastia
2e5e5e7a62
Pixel format switch (should work for both ATI/AMD and Nvidia);
...
Code cleanup;
Update submodules.
2013-07-01 21:51:24 +01:00
arnastia
7824f3c09f
Merge remote-tracking branch 'upstream/master'
2013-07-01 18:59:44 +01:00
arnastia
5099140813
Fixed rendering glitch caused by calling ReadFramebuffersToMem for unfinished framebuffers (non-displayed framebuffers are now read at the beginning of next frame);
...
Fix reversed pixel format for 32-bit textures on Nvidia cards.
2013-07-01 18:35:38 +01:00
arnastia
9696948a60
Pixels should now be read correctly on ATI cards (tested on ATI Mobility Radeon HD5165); Visual artifacts on blank areas after rendering second quad remain.
2013-07-01 13:22:19 +01:00
Unknown W. Brackets
0e5f741a48
Properly scale FBOs on copy to output.
...
Fixes Tales of Destiny 2 and Star Ocean when buffered rendering is on.
Should only draw the top left 480x272.
2013-06-30 23:56:22 -07:00
raven02
5d275d7fe9
Consolildate Texture filtering option
2013-06-30 14:58:46 +08:00
oioitff
dc04584ca1
Add a new option to enable
...
Linear Filtering only for CGs.
2013-06-30 03:35:28 +08:00
Unknown W. Brackets
92ae7cb8e6
Do less memcpy when copying the framebuf to mem.
2013-06-28 22:27:04 -07:00
arnastia
ad5df976bd
Blit framebuffers using screen aligned quads (buggy);
...
Implement asynchronous framebuffer readback for OpenGL and optional CPU-side pixel format conversion (needs optimization);
Add OpenGL ES support (untested).
2013-06-28 14:48:36 +01:00
Henrik Rydgard
604ad0181b
Merge branch 'new-ui'. Still incomplete. Enable by setting NewUI=True in ppsspp.ini
...
Conflicts:
UI/MenuScreens.cpp
2013-06-27 16:28:38 +02:00
Henrik Rydgard
f93de8be51
Quick Android/GLES2 buildfix. The new read framebuffer code was not OpenGL ES friendly.
2013-06-26 23:23:16 +02:00
arnastia
98b9acf0d3
Add FramebuffersToMem option to allow disabling of reading framebuffer contents to memory (defaults to false).
2013-06-26 01:32:48 +01:00
arnastia
4fa30ce6ec
Add support for reading framebuffers to memory.
...
Signed-off-by: arnastia <arnastia@gmail.com>
2013-06-25 13:50:35 +01:00
Unknown W. Brackets
8c7dfdb0f7
Iterate over vfbs_ using size_t not iter.
...
This way we know for sure that our erase()s are safe.
2013-06-23 08:51:35 -07:00
Unknown W. Brackets
03cab6edf7
Centralize destruction of FBOs, use std::vector.
2013-06-23 08:19:36 -07:00