Commit Graph

3899 Commits

Author SHA1 Message Date
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
Henrik Rydgard
6d66577f17 Don't write to transformedvertex.color1[4], it doesn't exist. 2013-05-02 20:18:46 +02:00
Peter Thoman
e352432aab Hybrid scaling works now 2013-05-02 20:05:41 +02: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 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
Sacha
a9529f831d Hack for Meego. For some reason it's not compiling ThreadPool.cpp 2013-05-02 17:34:57 +10:00
Sacha
6a2a308069 Buildfix for Symbian. 2013-05-02 17:06:09 +10:00
Unknown W. Brackets
c73657e39a Buildfix for iOS and Android. 2013-05-01 23:31:18 -07:00
Sacha
ae9490ad30 Use boost to do C++11 features on Symbian. Use namespaces. 2013-05-02 15:46:41 +10:00
Peter Thoman
3e5023ea97 Refactored Texture Scaling, changed options & gui to separately select scaling level and method 2013-05-01 23:55:34 +02:00
Henrik Rydgård
dcff4970bd Merge pull request #1616 from PeterTh/master
Add global threadpool, use it for texture scaling parallelization
2013-05-01 11:51:01 -07:00
Peter Thoman
1f7a3776b3 Only scale textures which were never invalidated 2013-05-01 20:31:57 +02:00
Unknown W. Brackets
d412cf5c64 Approximate better with two fixed blend colors.
Having one be constant, or having a nearby blend, is better than fixing
both to 1.0 or 0.0.
2013-05-01 08:00:52 -07:00
Peter Thoman
e19442a8c1 Eliminated C++11 lambdas 2013-05-01 16:31:28 +02:00
Peter Thoman
95e6a5c4ea Adjusted Texture Scaler to use global threadpool 2013-05-01 14:12:10 +02:00
Peter Thoman
af68180319 Parallelized texture scaling 2013-05-01 14:12:09 +02:00
Peter Thoman
5e918a644f Moved texture scaling to separate file 2013-05-01 14:12:09 +02:00
Unknown W. Brackets
4009a37692 Improve blending with two fixed colors.
It's not right, but it's less bad.  Maybe there's a better way?

Improves Popolocrois and Lunar (battle) blending issues.
2013-05-01 00:55:30 -07:00
Peter Thoman
2212e7f609 Fixed threading issue pointed out by unknownbrackets and made texture scaling changes apply immediately 2013-04-30 17:58:05 +02:00
Henrik Rydgård
b7cd4d63e2 Merge pull request #1599 from PeterTh/master
xBRZ texture scaling
2013-04-30 04:29:36 -07:00
Unknown W. Brackets
8f27d03af3 Double alpha at least for a known case.
Makes Popolocrois look much better now.
2013-04-30 00:04:20 -07:00
Unknown W. Brackets
bc1e0d09d4 Report a possible blend error. 2013-04-30 00:04:00 -07:00
Peter Thoman
c7c4ec7c3b Added xBR texture scaling to TextureCache 2013-04-30 03:49:12 +02:00