Commit Graph

57 Commits

Author SHA1 Message Date
gregory.hainaut 40e26648c6 all: gcc warning clean (round 2)
* reorder static initialization list
* Add missing virtual desctrutor to virtual object
* int -> uint/u32/uint32 cast of for loop index
* add a missing return in pxTrySetFocus
* fix size parameter of memset m_clut
* disable missing-field-initializers warning
* disable unused-local-typedefs warning


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5685 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-06-28 17:32:37 +00: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 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 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 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 2d38e89194 zzogl: align_16 array before sse2 instruction + minor stuff
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4263 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-01-25 19:29: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
arcum42 f68eb19543 zzogl-pg: Fix compilation in Debug mode.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4086 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-12-12 00:33:10 +00:00
arcum42 5f1d99188d zzogl-pg: Mess around a bit with FlushReGetTarget.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4067 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-12-02 11:12:42 +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 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 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 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
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 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 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
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
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
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 59262101db zzogl-pg: Add in changes from zzogl r218. (I'll still need to go through r214-217 and grab any important changes, though.)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3659 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-08-18 10:52:57 +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
Jake.Stine f2d637a6e0 zzogl-pg:
* Removed extern "C" and applied static const to s_clut16 vars.  Should be fine since the old x86.S files that needed extern "C" have been removed from zzogl.
 * Fixed a compilation error in Win32/Debug builds.
 * Changed some references of DEVBUILD ZEROGS_DEVBUILD.  Not sure if all of them should be changed over or not, so I just stuck to some of the more obviously correct bits.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3500 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-16 03:48:13 +00:00
arcum42 749b180005 zzogl-pg: Removed some redundant code in the new register code.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3452 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-11 03:30:35 +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 83adf0f0d4 zzogl-pg: Add -fno-strict-aliasing to zzogl-pg's compiler flags. (Fixes FF X-2.)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3415 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-07 10:41:17 +00:00
arcum42 b5d8508989 zzogl-pg: Change a few assertions into warnings. (Makes it possible to run Final Fantasy X-2 with Debug builds. With tons of console spam, mind.)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3413 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-07-07 10:14:42 +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 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 fd28ec1012 zzogl-pg: Forgot to remove this...
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3246 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-06-19 22:36:20 +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 1681fa0b76 zzogl-pg: Fix the Windows port back up.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3233 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-06-19 09:07:21 +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 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 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 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