Commit Graph
27588 Commits
Author SHA1 Message Date
Unknown W. Brackets c141c368fc Skip some conversion warnings. 2014-08-24 01:25:59 -07:00
Unknown W. Brackets e141280f8d Only create 1 miplevel in TextDrawer.
Fixes missing text in D3D.
2014-08-24 01:22:25 -07:00
Ced2911 e0c3b5a112 [Gpu] somes fixes, monster hunter 2 run between 140 and 200% with vertex cache enabled
Conflicts:
	GPU/Directx9/FramebufferDX9.cpp
	GPU/Directx9/GPU_DX9.cpp
	GPU/Directx9/VertexDecoderDX9.cpp
	GPU/Directx9/helper/global.cpp
2014-08-24 10:21:08 +02:00
Ced2911 ace1e71456 [Misc] Windows fixes
Conflicts:
	GPU/Directx9/TransformPipelineDX9.cpp
	GPU/Directx9/VertexDecoderDX9.cpp
	GPU/Directx9/helper/fbo.cpp
	GPU/Directx9/helper/global.cpp
2014-08-24 10:17:11 +02:00
Henrik Rydgard dcd8753ee1 Cherry-pick a tiny part of cf41d2af29633146e5b07c8851382efe72491091 2014-08-24 09:56:01 +02:00
Ced2911 d4adc3abb8 [dx9] don't do alpha test in pixel shader, use state mapping
hrydgard: Cleaned up a bit, disabled by default

Conflicts:
	GPU/Directx9/TextureCacheDX9.cpp
2014-08-24 09:52:34 +02:00
Henrik Rydgård 3524d45575 Merge pull request #6773 from unknownbrackets/thin3d
Switch to GLEW_STATIC to remove linker warning spam
2014-08-24 09:44:29 +02:00
Unknown W. Brackets 5f015793d8 Seems like this else was a mistake. 2014-08-23 21:54:04 -07:00
Unknown W. Brackets afe2a17ef5 Compile projects using GLEW_STATIC.
To avoid compilation warnings about dllimport.
2014-08-23 21:53:33 -07:00
Unknown W. Brackets 6b223e2cc6 d3d: Fix a crash on a shader compile error. 2014-08-23 21:53:00 -07:00
Henrik Rydgård 56d9cf0e54 Update native with fragment shader fix by unknown. may help #6771 2014-08-24 02:06:43 +02:00
Henrik Rydgård 6af33015d0 Merge pull request #232 from unknownbrackets/glsl-fix
Add the prelude to fragment shaders
2014-08-24 02:05:23 +02:00
Henrik Rydgård ba8fe92d71 Revert accidental change 2014-08-24 01:18:13 +02:00
Unknown W. Brackets d726e7f389 Try not to crash on shader compile errors. 2014-08-23 10:40:12 -07:00
Unknown W. Brackets 1ea54accef Add the prelude to fragment shaders. 2014-08-23 09:27:35 -07:00
Unknown W. Brackets d4ec7d8019 Add another memcpy variant.
Fixes #4324 (Marvel Ultimate Alliance 2 videos), thanks daniel229.
2014-08-23 08:45:25 -07:00
Henrik Rydgård dae07e9f28 Mac buildfix 2014-08-23 14:24:24 +02:00
Unknown W. Brackets 2eafb096d8 Update native (Linux buildfix.) 2014-08-23 02:54:44 -07:00
Unknown W. Brackets 6b5e9f6b7c Linux buildfix. 2014-08-23 02:12:13 -07:00
Unknown W. Brackets 0702861df7 Qt buildfix. 2014-08-23 02:09:23 -07:00
Henrik Rydgård 5d836bfa5a Merge pull request #6765 from hrydgard/thin3d
Switch UI drawing from GL to Thin3D. This activates the D3D9 path as well.
2014-08-23 10:52:21 +02:00
Henrik Rydgard 7ae886afa9 Update native 2014-08-23 10:51:47 +02:00
Henrik Rydgård 467599cf56 Merge pull request #230 from hrydgard/thin3d
Thin3d - the thinnest wrapper around D3D9 and GL around
2014-08-23 10:51:22 +02:00
Henrik Rydgard 308b13fdf0 Set the right ortho matrix for the backend (although doesn't seem to matter too much for 2D) 2014-08-23 10:49:40 +02:00
Henrik Rydgard e01a97649a Merge branch 'thin3d' of github.com:hrydgard/ppsspp into thin3d 2014-08-23 10:48:03 +02:00
Henrik Rydgard 4231af2c0f Disable OpenGL debug log output 2014-08-23 10:47:32 +02:00
Henrik Rydgård 2faf15f2e6 Merge pull request #6767 from unknownbrackets/thin3d
Buildfix Linux
2014-08-23 10:44:06 +02:00
Henrik Rydgård b7da82eebb Merge pull request #6762 from unknownbrackets/fpu-rounding
Handle fpu rounding mode at least in jits
2014-08-23 10:43:22 +02:00
Henrik Rydgard 49602416cf More thin3d minor fixes 2014-08-23 10:31:23 +02:00
Henrik Rydgard 7f4758baae Provide more info to thin3d d3d init 2014-08-23 10:20:57 +02:00
Henrik Rydgard 6f96004381 Thin3d D3D: More system information, other minor fixes 2014-08-23 10:20:27 +02:00
Unknown W. Brackets 0bed77ed0d Buildfix Linux. 2014-08-23 01:20:26 -07:00
Henrik Rydgard 75b7ccd739 Clean up D3DX loader a little 2014-08-23 10:01:03 +02:00
Henrik Rydgard 0f973a3276 Get it running on Android again 2014-08-23 09:48:08 +02:00
Henrik Rydgard 7708558c2f Remove a comment, add some checks. 2014-08-23 09:47:30 +02:00
Henrik Rydgård 1179d29323 Merge pull request #231 from unknownbrackets/thin3d
Fix Android/Linux compilation
2014-08-23 09:38:16 +02:00
Unknown W. Brackets 8c35e4b5fc Fix some type conversion warnings. 2014-08-23 00:35:14 -07:00
Unknown W. Brackets 110f640ca8 Fix Linux/Android compilation. 2014-08-23 00:35:13 -07:00
Unknown W. Brackets e9b5e6f277 armjit: Maintain rounding mode throughout jit. 2014-08-22 19:57:50 -07:00
Henrik Rydgard 1556234825 Bit more d3d stuff. Can't get depth right, pretty sure it's the projection matrix calc. 2014-08-23 01:52:46 +02:00
Henrik Rydgard a758917919 D3d cleanups and improvements 2014-08-22 22:16:46 +02:00
Henrik Rydgard 00d5793f7d D3D9: Don't crash on bad vertex formats. 2014-08-22 21:27:27 +02:00
Henrik Rydgard 1401de50dc Thin3d: Minor shader cleanup 2014-08-22 21:26:46 +02:00
Henrik Rydgard e2ecbb7a4d Convert more UI code to Thin3D 2014-08-22 20:55:18 +02:00
Henrik Rydgard e539c7009f Hook up DX9 backend. Not really working though, it seems. 2014-08-22 20:55:12 +02:00
Henrik Rydgard 92c3775d95 Start hooking up D3D 2014-08-22 20:55:04 +02:00
Henrik Rydgard 808f05da89 (Partially) slip thin3d underneath DrawBuffer. 2014-08-22 20:54:53 +02:00
Henrik Rydgard ff5df25135 Add Thin3d support to draw_text (Qt not touched) 2014-08-22 20:54:28 +02:00
Henrik Rydgard a1ff7a4488 Thin3D: Add APIName query. Swizzle texture colors in D3D.
(not sure whether it's best done in the shader or in the texture data...)
2014-08-22 20:54:27 +02:00
Henrik Rydgard ecb33f005e Thin3D now actually draws some stuff 2014-08-22 20:54:27 +02:00