ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,450 Commits 27 Branches 4,308 Tags 380 MiB
Commit Graph

46 Commits

Author SHA1 Message Date
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 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
Jake.Stine ed7638488c zzogl-pg: compilation fixex for MSVC builds: 
* resolve a namespace conflict between std::count (due to a 'using namespatce std;' directive)  [debug builds only]
 * switch all MSW-specific code to be unicode compliant so that unicode-only Utilities lib can be used under Windows.  [should work, but needs proper testing]
 * fix some properties sheets so that windows-specific DLL dependencies (common controls and UUID stuff provided by Windows) are linked automatically into wx/utils based plugins.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4140 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-12-25 04:38:44 +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 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 8219ed5527 GregMiscellaneous: zzogl-pg: Remove the Gust hack from Mana Khemia. A few misc changes. 
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3966 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-10-24 04:09:42 +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 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 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
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 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 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
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 ed9bf27015 pcsx2: Update the project files to no longer have coroutine. Fix a compiler warning. (zzogl-pg: Modify comments.) 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3569 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-07-26 10:51:06 +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
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 f058e38f5b zzogl-pg: Commit patch from zzogl-213 for shaking when interlace is on in FFX-2. (Issue 768). 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3334 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-28 10:54:26 +00:00
arcum42 2787e6e2a1 zzogl-pg: Assorted cleanup. Added ZZoglCRTC.h, to clean up some clutter in ZZoglCRTC.cpp. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3319 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-06-27 00:53:06 +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 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
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 a6c4df49ea zzogl-pg: Ran a bunch of the files through AStyle, so I don't find myself messing with the source code formatting so much. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2931 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-05-01 20:33:53 +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
arcum42 07a16bc76d zzogl-pg: Get rid of RELEASE_TO_PUBLIC, and use ZEROGS_DEVBUILD instead. Fix a typo I noticed. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2901 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-04-25 09:02:36 +00:00
arcum42 9293c2eb8e zzogl-pg: Got rid of the logging macros. Changed the text of some of the messages a bit. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2900 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-04-25 08:33:05 +00:00
arcum42 0ccd832efe zzogl-pg: Start reworking the way logging works. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2899 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-04-25 07:21:29 +00:00
sudonim1 4457fe40fc Removed all trailing whitespace in *.c *.cpp *.h because it irritates me. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2897 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-04-25 00:31:27 +00:00
arcum42 790cd55608 zzogl-pg: I don't think this should be hardcoded to 640x480... 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2896 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-04-24 23:22:49 +00:00
arcum42 df401326aa zzogl-pg: Fix various compiler warnings, and one or two things I missed earlier. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2750 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-03-19 06:38:44 +00:00
arcum42 e80b5c5af5 zzogl-pg: Work more on separating out the windowing code. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2748 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-03-19 05:24:36 +00:00
arcum42 28df00c2a3 zzogl-pg: Move a bunch of X11 stuff to a separate file. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2745 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-03-19 02:04:55 +00:00
arcum42 799da2100e zzogl-pg: Create a local fork of ZZOgl to play with. Currently just ZZOgl 211 with name and version changes. 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2739 96395faa-99c1-11dd-bbfe-3dabce05a288
 2010-03-19 00:31:15 +00:00