Commit Graph

106 Commits

Author SHA1 Message Date
Ryan Houdek 3d37a6ce27 Removes the usage of __LINUX__ define
This is defined and set it a ton of different places.
It's checked in a whole lot more
Instead just use __linux__ like a real project should
2014-08-03 13:20:36 -05:00
Gregory Hainaut 4d78b6be31 pcsx2/plugin: sign compare mismatch extra 2014-05-03 10:18:27 +02:00
gregory.hainaut 86ff5185b7 zzogl & VS: thanks Micove for the patch.
* fix failure with VS2008 & 2010


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5169 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-04-21 16:13:45 +00:00
gregory.hainaut e3c741bb2a zzogl: painfully merge the zzogl-dev branch
* new memory management
* asm was replaced by intrinsic
* new GLSL backend (AMD only) Cmake is probably broken anyway with the 2 plugins...
* and lots of others stuff that I forgot about it ;)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5166 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-04-19 21:22:08 +00:00
gregory.hainaut@gmail.com 6a96e46920 zzogl:
* increase a little the hack window (better for screenshot, not too big for small screen)
* Use generic clut function in FlushDecodeClut
* Various clean and comment


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4113 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-12-20 19:57:50 +00:00
gregory.hainaut@gmail.com 8d974015d5 zzogl:
* Create a nice FORCE_TEXDESTROY_THRESH define
* do not call GetMemoryTarget twice in a row. There is already a check in the core function.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4062 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-12-01 14:17:12 +00:00
arcum42 38c229a350 GregMiscellaneous: zzogl-pg: Use some of the routines in the Utilities library instead of the copies in ZZOgl. (Which were basically older versions of the same code.)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@4006 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-11-07 05:51:54 +00:00
arcum42 7501916896 GregMiscellaneous: zzogl-pg: Move the time functions over to be by the Profile code.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3999 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-11-06 06:05:00 +00:00
arcum42 465dd47bde GregMiscellaneous: zzogl-pg: Give VB its own header. Some changes to the Kick functions.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3961 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-23 08:15:39 +00:00
arcum42 c544ec7ca6 GregMiscellaneous: zzogl-pg: Continuing to work on zerogs.cpp and zerogs.h.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3960 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-23 04:14:19 +00:00
gregory.hainaut@gmail.com d886dbfadb GregMiscellaneous:zzogl-pg:
* fix sse2 code for 16bits cluts.
* Fix debug build


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3952 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-21 11:13:49 +00:00
gregory.hainaut@gmail.com 8920c4a059 GregMiscellaneous:zzogl-pg: Rename also the include....
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3950 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-20 09:29:35 +00:00
gregory.hainaut@gmail.com f4584d3c9c GregMiscellaneous: zzogl-pg:
* 16 bits aligned the local clut array to allow sse2 operations


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3947 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-19 17:53:36 +00:00
gregory.hainaut@gmail.com b20c1021e8 GregMiscellaneous: zzogl-pg:
* make code more consistent
* Use some sse2 for 16 bits texture


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3943 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-18 17:39:12 +00:00
arcum42 b0cd667fd6 GregMiscellaneous: zzogl-pg: zerogs.h is now only included by zerogs.cpp.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3937 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-18 11:24:40 +00:00
gregory.hainaut@gmail.com dbd37e2667 GregMiscellaneous: zzogl-pg:
* minor clean


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3932 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-17 16:10:01 +00:00
gregory.hainaut@gmail.com 97cd280684 GregMiscellaneous: zzogl-pg:
* regroup clut core function into one big files

Note: codeblock need to be updated. And I hope template are ms friendly :)


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3931 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-17 15:49:34 +00:00
arcum42 9bde4de02a GregMiscellaneous: zzogl-pg: Add a new header. More work on zerogs.h.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3928 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-17 09:07:16 +00:00
arcum42 bce1dfbade GregMiscellaneous: zzogl-pg: Shuffle more stuff around from zerogs.h.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3927 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-17 08:47:31 +00:00
gregory.hainaut@gmail.com 0da424452c GregMiscellaneous: zzogl-pg:
* Keep same format when reupload the texture after an error...
* various minor clean


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3925 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-16 21:11:56 +00:00
arcum42 465f786dee GregMiscellaneous: zzogl-pg: Remove the ZeroGS namespace.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3924 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-16 11:54:46 +00:00
arcum42 87054c5452 GregMiscellaneous: zzogl-pg: Various legacy printfs were hanging around. Change a few messages to just be in Debug mode.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3923 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-16 11:10:48 +00:00
gregory.hainaut@gmail.com 0b7bccaa17 GregMiscellaneous: zzogl-pg:
* redid the WriteCLUT_T16_I4_CSM1_sse2 functions (more generic, faster, cleaner)
* Create WriteCLUT_T16_I8_CSM1_sse2 based on WriteCLUT_T16_I4_CSM1_sse2
* Change some clut buffer offset... Probably impact the compatibility 


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3920 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-15 09:52:56 +00:00
gregory.hainaut@gmail.com d84d8e8a2a GregMiscellaneous: sync with trunk (3805-3918)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3919 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-15 09:32:41 +00:00
arcum42 0d4e02995d GregMiscellaneous: zzogl-pg: Work around a windows crash by temporarily disabling DO_8_PIX in Windows.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3867 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-03 11:43:38 +00:00
gregory.hainaut@gmail.com fc2bedad66 GregMiscellaneous: zzogl-pg:
* Add an emms because msvc is not happy.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3866 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-03 10:46:04 +00:00
gregory.hainaut@gmail.com ace7ddb1aa GregMiscellaneous: zzogl-pg:
* Windows compilation fix
* Fix alpha value & mask value


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3864 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-10-02 12:13:25 +00:00
gregory.hainaut@gmail.com 7fabbcf065 GregMiscellaneous: zzogl-pg:
* Properly update the different part of the pixels.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3862 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-30 17:34:21 +00:00
gregory.hainaut@gmail.com 523f063f3c GregMiscellaneous: zzogl-pg:
* Really add the new resolve function (the good things is I fix severals issues)
* Fix an issue in 32b to 16b conversions


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3861 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-30 13:03:31 +00:00
gregory.hainaut@gmail.com 28d04d4fbb GregMiscellaneous: zzogl-pg:
* Redo update_4pixels_sse2. Do 128 bits transfer instead of 32bits.
* fix regression on target code. The address was bad in 16bits


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3860 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-29 18:44:53 +00:00
arcum42 c48a820cd5 GregMiscellaneous: zzogl-pg: Disable the Resolve messages by default.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3848 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-28 10:40:08 +00:00
gregory.hainaut@gmail.com 175afa91b1 GregMiscellaneous: zzogl-pg: restore the reverse order loop
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3847 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-28 09:09:18 +00:00
gregory.hainaut@gmail.com 703927056e GregMiscellaneous: zzogl-pg:
* use a fence after non temporal move
* fix a crash in write clut


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3839 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-26 09:25:43 +00:00
arcum42 8036106b07 GregMiscellaneous: zzogl-pg: Move a few functions into CMemoryTargetMngr.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3836 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-25 13:33:58 +00:00
arcum42 0f38318fab GregMiscellaneous: zzogl-pg: Fix for a bug in the new intrinsic code.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3835 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-25 12:23:33 +00:00
arcum42 cd4692a327 GregMiscellaneous: zzogl-pg: Split out some code into a separate function.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3834 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-25 08:57:44 +00:00
gregory.hainaut@gmail.com 3a1ef55cb1 GregMiscellaneous: zzogl-pg:
* Port more ASM to intrinsics. Note use non-cacheable store instead to reduce cache pollution


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3825 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-23 18:00:38 +00:00
gregory.hainaut@gmail.com 79c4b1825d GregMiscellaneous: zzogl-pg:
* Fix wrong integer size.
* Enable sse2 version on windows too.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3822 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-23 11:24:02 +00:00
gregory.hainaut@gmail.com 6e1b11c2b5 GregMiscellaneous: zzogl-pg:
* port ASM GAS to intrinsic.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3820 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-22 19:48:50 +00:00
gregory.hainaut@gmail.com 709a79f513 GregMiscellaneous: zzogl-pg:
* init completely the mask array...
* fix the offset (count is byte not double word)


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3819 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-22 17:30:01 +00:00
gregory.hainaut@gmail.com 5e97756e83 GregMiscellaneous: zzogl-pg:
* GAS seem only support standard C type


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3817 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-22 11:52:03 +00:00
gregory.hainaut@gmail.com 5e4afde9c1 GregMiscellaneous: zzogl-pg:
* remove convfn parameter template. Use instead a boolean (easier & fix windows)
* Protect asm statement with __LINUX__ for the moment
* apply the fbm mask in SSE2 also for 32bits texture. Reduce stack activity.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3816 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-21 19:10:19 +00:00
gregory.hainaut@gmail.com b6a224c4f9 GregMiscellaneous: zzogl-pg:
* fix shift direction in sse2.
* Reduce memory transfter to load pixel.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3815 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-21 11:29:03 +00:00
gregory.hainaut@gmail.com eb10a257cb GregMiscellaneous: zzogl-pg:
* Rework sse2 with somethings easier ans smaler ;)
* do fbm mask with sse2


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3814 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-20 16:16:31 +00:00
arcum42 ac04a4ec3e GregMiscellaneous: zzogl-pg: Rewrote ZZoglMath.h.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3813 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-20 13:03:40 +00:00
gregory.hainaut@gmail.com 189d92b34d GregMiscellaneous: zzogl-pg:
* Use sse2 instruction to convert pixel from 32bits to 16bits.
Note: Seem slower than basic C. I need to opmitize some memory access...


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3811 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-20 12:20:04 +00:00
arcum42 cfb4ba8b2b GregMiscellaneous: zzogl-pg: Apply Zeydlitz's changes from r237 of zzogl. Improves code readability, and gives a slight speedup.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3810 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-20 10:09:46 +00:00
arcum42 1fe66e55e7 GregMiscellaneous: zzogl-pg: Switch to _aligned_malloc in GetMemoryTarget, take 2. (If at first you don't succeed...)
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3809 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-20 09:00:22 +00:00
gregory.hainaut@gmail.com baa78266f2 GregMiscellaneous: zzogl-pg:
* replace previous macro with a template. (could be improve with some template recursion, but no important for the moment)


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3808 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-19 18:57:13 +00:00
gregory.hainaut@gmail.com 129ffacf0a GregMiscellaneous: zzogl-pg:
* Lost a -1 somewhere...


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3807 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-19 10:29:09 +00:00