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

61 Commits

Author SHA1 Message Date
gregory.hainaut 3b22f0fb0c zzogl glsl4: 
* properly delete program and vertex array. Avoid a crash on plugin reload
* reset shader state. Avoid to reuse invalid data on plugin reload
gsdx:
* add an hack to unattach/attach the gl context from different thread. Help to solve some crashes. The best will be to move gpu operation out of gsreadfifo but it would need more works
* implement logz for test purpose (don't seem to help)
gsdx replay:
* use default xdg location


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5289 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-06-12 18:14:01 +00:00
gregory.hainaut 333b74c2a5 zzogl glsl: used the fog parameter correctly... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5256 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-06-01 14:26:37 +00:00
gregory.hainaut e4e2366bce zzogl glsl: 
* clean macro selection and redundant code
* Request GLSL Core profile instead of the compatibility profile


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5223 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-24 06:39:39 +00:00
gregory.hainaut cdeaa5e03c zzogl: GLSL is working again for AMD gpu. Nvidia test is welcome 
* properly release shader in release mode
* set stream format every time an array buffer is bound


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5219 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-21 06:43:28 +00:00
gregory.hainaut 05fc11daf5 zzogl: 
* some parameters was set after the shader setup. Extend the API to do the shader setup before the draw
* remove the useless shader compatibility bits


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5212 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-15 06:45:26 +00:00
gregory.hainaut d062ca1727 zzogl: 
* fix properly context, directly save the state in the shader
* replace the last deprecated variable in the shader. Remain the issue that host enable 1 output and the shader write 2 outputs
* It seems that VBO does't depends on the VAO but vertex format depends on both VBO/VAO so I set the format multiple time. Not sure the behavior is fully correct


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5211 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-15 06:40:45 +00:00
gregory.hainaut e7de58c3e2 zzogl: plug vertex array object and remove most deprecated variable from shader. Only remains gl_FragData 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5210 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-05-13 20:22:15 +00:00
gregory.hainaut 8396c49eb5 zzogl: 
* add some code to support OGL4 debugging. Not enable on CmakeList.txt by default
* LOAD_PS/LOAD_VS were using a "std" argument instead of a reference.
* reuse the opengl context creation developed for GSdx. For the moment only enable OGL2
* Add some documentation for the zzShader API


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5188 96395faa-99c1-11dd-bbfe-3dabce05a288
 2012-04-29 18:50:07 +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 6b8a605845 zzogl-pg: open the dat file... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4817 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-07-19 18:33:22 +00:00
gregory.hainaut@gmail.com 5adba505e7 pcsx2, zzogl-pg: allow to change some default path with compilation flags. 
cmake: Add PLUGIN_DIR and GAMEINDEX_DIR options to easily select install directory. Install GameIndex.dbt during install phase.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4811 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-07-17 11:25:17 +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
gregory.hainaut@gmail.com 90eda53e42 zzogl: print the full string of extensions... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4197 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-01-10 17:45:16 +00:00
gregory.hainaut@gmail.com b9948d67c7 zzogl: restore the opengl3 method for fill extension, fallback to the old method if not supported 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4194 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-01-09 17:19:41 +00:00
arcum42 bdc4e2caf4 zzogl-pg: Revert some changes to CreateFillExtensionsMap for the moment. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4187 96395faa-99c1-11dd-bbfe-3dabce05a288
 2011-01-09 06:21:47 +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
arcum42 c09df50a58 zzogl-pg: Fix a compilation error when not building a Release build. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4051 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-11-24 04:45:24 +00:00
arcum42 b3e7bea66e GregsMisc: zzogl-pg: Rename ZZKick.{cpp,h} to ZZoglDrawing.{cpp,h}, to make syncing with zzogl easier. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@4046 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-11-23 03:35:01 +00:00
arcum42 951d45677f GregMiscellaneous: zzogl-pg: Work on the GLWin functions a bit. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@4017 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-11-14 01:38:10 +00:00
arcum42 0779f7bc32 GregMiscellaneous: zzogl-pg: Rework CreateFillExtensionsMap to be less depreciated (and so it writes the extension list to the log, but doesn't print it except in debug mode). Fix a few minor potential bugs. Other minor changes. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@4011 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-11-10 11:15:48 +00:00
arcum42 3aabab685a GregMiscellaneous: zzogl-pg: Get rid of an extraneous function or two, straighten up some includes, and move some things around to appropriate places. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@4009 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-11-09 12:04:07 +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
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 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 d114ae7e93 GregMiscellaneous: zzogl-pg: Create ZZKick.cpp & ZZKick.h, and move appropriate code there. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3929 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-17 09:42:49 +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 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 0a832acabb GregMiscellaneous: Sync against trunk. (3768:3804) 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3805 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-19 08:01:48 +00:00
gregory.hainaut@gmail.com 5d75ab97cb GregMiscellaneous: zzogl-pg: 
* replace magic number with a symbolic name
* Remove 16 bits texture survivors.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3781 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-16 18:07:23 +00:00
gregory.hainaut@gmail.com 337e573c35 GregMiscellaneous: zzogl-pg: 
* Remove support of 16bits pixel. Very slow and same quality that 8 bits.
* Fix a compilation error on debug...


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3778 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-09-16 11:18:56 +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
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 d183232e69 zzogl: Limit texture supported to 8k 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3678 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-22 10:22:07 +00:00
arcum42 661ddf088c ZZOgl-pg: Catch up with some of the changes in recent revisions of zzogl. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3677 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-08-22 09:42:28 +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
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 cc47fdbb8c zzogl-pg: Enable a GifTransfer shortcut from GSdx. Comment out two variables that weren't being used. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3382 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-04 03:53:01 +00:00
arcum42 84c5073b7c zzogl-pg: Hack and slash at zerogs.h. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3379 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-03 07:57:56 +00:00
Jake.Stine 390b811a1a ... and it helps when I save both files before committing. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3364 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-01 20:22:26 +00:00
arcum42 85657682da zzogl-pg: Printing to the console now works. Fixed AA+/-. Misc. pcsx2: Took care of two non-POD safe objects. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3259 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-21 12:03:14 +00:00
arcum42 6db8dd3bd7 zzogl-pg: Fix Windows again. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3247 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-20 07:33:47 +00:00
arcum42 a04e71cf9d zzogl-pg: A bit more refactoring. Rename DrawTriangle. Move some code around. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3237 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 12:59:51 +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 9f21cc3dcd zzogl-pg: If ZZOgl automatically turns a game hack on, it shouldn't leave it on. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3231 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 06:23:40 +00:00
arcum42 d3266a3921 zzogl-pg: Some refactoring, a bit of work on logging. Some disabled stuff I was fiddling with. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3230 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-19 05:41:06 +00:00
arcum42 ee1d7f137b ZZogl-pg: In the Debug build, downgrade various assertions to log messages. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3209 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-15 11:20:52 +00:00
arcum42 c160aa495a zzogl-pg: Missed the Windows specific files. BOOL->bool in a few places. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2933 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-05-01 23:34:44 +00:00