ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,849 Commits 23 Branches 4,240 Tags 516 MiB
Commit Graph

65 Commits

Author SHA1 Message Date
Gregory Hainaut cdba010794 zzogl: kill a couple of gcc warning 2014-06-13 23:04:21 +02:00
gregory.hainaut 85bfc2ed66 zzogl: 
* Fix context code for the common shader and set the indices for the uniform... (will fix most of GLSL-related  black screen issue)
* some memory improvements were not merged from zzogl-dev branch


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5252 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-06-01 08:21:31 +00:00
gregory.hainaut 36181d35bb zzogl: 
* use 128 vertex buffer instead of 512 that will avoid to fill the GPU vram
* Use separate shader infrastructure for GLSL 4 as Nvidia cg. Beside code is much easier to understand


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5208 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-13 17:14:05 +00:00
gregory.hainaut a8209d610b zzogl: Try to use opengl3/4 feature for GLSL api. The API is easier and I had a better experience with GSdx-ogl 
* Clean the zzsetparameter API to always use the program for uniform that depends on the program. Future goal is to use a nice OO interface
* Use uniform buffer. Would allow future optimization and remove most initialization stuff. Don't support yet the 2 zzogl contexts.



git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5201 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-07 19:51:58 +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 35b9dfce3f pcsx2: zzogl:onepad: gsdx: merge linux-gsopen2 branch (4730) into trunk 
* Gsopen2 support for GS plugins => Support of the PCSX2 GS window configuration panel. Support of all PCSX2 shortcut.
* new shortcut: shift-f12 to stole the input. ZZogl shortcut must be prefixed with ctrl
* onepad: Support/fix/improve of configuration gui, multiple key, mouse/wiimote for analog joystick, dualshock3/sixaxis (basic), dual pad and experimental forcefeedback

Note: it is advices to delete OnePAD.ini


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4731 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-06-12 14:48:36 +00:00
arcum42 ae61d6010c zzogl-pg: Merge some of the changes from the NewRegs code into the normally used Reg code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4155 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-12-27 12:32:38 +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 07ecc09711 GregMiscellaneous: zzogl-pg: A few minor changes. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3985 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-31 07:10:21 +00:00
gregory.hainaut@gmail.com 3c6dd04c19 GregMiscellaneous: zzogl-pg: 
* use a size of 4 for the gsvertex array (allow compiler to optimize a % into an and)
* Reuse previous computed vertex for _strip & _fan primitives


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3973 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-26 21:14:15 +00:00
gregory.hainaut@gmail.com 9f2e92f31b GregMiscellaneous: zzogl-pg: 
* Use addvertex in register (stole from the new register code).
* Use primNext at the end of KickVertex function allow to use current index in draw primitive.
* Create a primPrev


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3971 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-25 18:31:38 +00:00
gregory.hainaut@gmail.com 6eedbaf346 GregMiscellaneous: zzogl-pg: * Revert previous commit and remove the = overloading 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3970 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-25 17:34:10 +00:00
gregory.hainaut@gmail.com d99d8d5745 GregMiscellaneous: zzogl-pg: 
* Use an union to improve a little the copy of vertex


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3969 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-24 12:05:18 +00:00
gregory.hainaut@gmail.com 02efc340e8 GregMiscellaneous: zzogl-pg: 
* copy some vertex instead of re compute them twice
* pass vertex as reference avoid useless copy on the stack...


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3964 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-23 17:59:10 +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
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
arcum42 01c171e9e7 GregMiscellaneous: zzogl-pg: Add a header for HostMemory. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3930 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-17 10:03:12 +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
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 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 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
gregory.hainaut@gmail.com 14174a8c9a GregMiscellaneous: zzogl-pg: 
* #if 0 some codes that are not called anymore.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3779 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-16 11:57:25 +00:00
gregory.hainaut@gmail.com a51455656a GregMiscellaneous: zzogl-pg: 
* Properly fix the 'missing external linkage' thanks to Gigaherz.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3773 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-15 21:26:59 +00:00
gregory.hainaut@gmail.com 888a309e1a GregMiscellaneous: sync and refresh the branch (3728:3768) 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3769 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-15 16:54:19 +00:00
gregory.hainaut@gmail.com 5e8f776adb GregMiscellaneous: sync from trunk (3679:3727) 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3729 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-05 15:33:08 +00:00
arcum42 a4155a2240 Minor cleanup from the last commit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3715 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-01 10:34:02 +00:00
arcum42 e686d47cd7 ZZOgl-pg: Rework the GLX11Win.cpp code a bunch. Fix a bug leading to crashes. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3714 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-01 10:28:37 +00:00
gregory.hainaut@gmail.com ec44d0f8cf GregMiscellaneous: Sync from trunk. Before there are too many conflict 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3679 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-22 10:48:23 +00:00
gregory.hainaut@gmail.com 1c1eef8bde GregMiscellaneous: Various clean 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3665 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-18 14:04:10 +00:00
arcum42 9a5e9e24e1 zzogl: Get a start on abstracting the memory code a bit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3657 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-18 08:54:16 +00:00
gregory.hainaut@gmail.com 7f5b0f49a3 GregMiscellaneous: Forget to clean one structure. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3656 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-17 22:16:20 +00:00
gregory.hainaut@gmail.com cd1a4b7d15 GregMiscellaneous: 
* Fix some parameter
* Use some functions created by Zeydlitz to reduce the code.

Current status: blur effect is removed in FFX with UserHacks_SkipDraw=1 and various random crashes ;)


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3655 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-17 22:14:45 +00:00
gregory.hainaut@gmail.com fbdf7521e5 GregMiscellaneous: Try to remove blur from some games. Gets the code from GSdx. 
note: it is not working for the moment.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3653 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-17 13:38:57 +00:00
arcum42 699e623998 zzogl-pg: Work on GetRectMemAddress. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3639 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-14 08:15:19 +00:00
Jake.Stine b6af82efa8 GSdx / zzogl-pg / pcsx2: 
* Implemented support for legacy GS plugins (considered anything prior to the Reordering merge).
 * Added a lot of 'const' qualifiers to the GSgifTransfer functions in both GSdx and zzogl.

DevNote: GS plugins shouldn't be modifying the data provided to them from PCSX2 -- zzogl wasn't, GSdx was.  I had to do a little bit of juggling to remove the mem modifications from GSdx's TEX0/TEX2 handlers.  With luck, nothing's broken. ;)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3536 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-19 15:49:30 +00:00
arcum42 472358345a ReorderingMTGS: zzogl-pg: Add GSgifTransfer. pcsx2: Add an include so Linux compiles. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3459 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-11 06:16:16 +00:00
arcum42 fab3d1d4b7 zzogl-pg: A few Windows changes, and fix an incorrect variable type. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3450 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 12:41:49 +00:00
arcum42 f03c302ae2 zzogl-pg: Be more consistant about the plugin name and years in the headers. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3447 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 08:20:50 +00:00
arcum42 f07f522238 zzogl-pg: More changes to the new register code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3444 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-10 06:04:32 +00:00
arcum42 6a3f1bdab2 zzogl-pg: Mucking around with the new register code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3412 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-07 09:59:29 +00:00
arcum42 1a593a4134 zzogl-pg: Fence off an area where I can work on the register code without worrying too much about it. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3394 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-05 13:22:02 +00:00
gregory.hainaut 1394b9e03c [copyright]: * Update copyright to use the new postal address of the Free Software Foundation. Nothing to see. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3391 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-04 22:49:00 +00:00
arcum42 4289d544d2 zzogl-pg: Move various stuff related to GSmain around. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3368 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-02 12:10:40 +00:00
arcum42 328d046d6c zzogl-pg: Revamp configuration code. (Likely breaks Windows. I'll take care of that. Also, you may need to reset a few settings in ZZOgl after this commit... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3232 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 08:46:40 +00:00
arcum42 6de9dbeca0 zzogl-pg: A bit of refactoring and debugging code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3208 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-15 10:32:22 +00:00
arcum42 68eeefd130 zzogl-pg: Shuffle things around a bit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3199 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-11 11:48:07 +00:00
arcum42 12ad5308ed zzogl-pg: Part 2 of the re-formatting; ran AStyle over the headers. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2932 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-05-01 22:54:23 +00:00
arcum42 e4d42b1e7b zzogl-pg: Work on reducing the amount of platform specific code a bit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2927 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-04-30 04:40:31 +00:00