Commit Graph

37 Commits

Author SHA1 Message Date
gregory.hainaut b665499a6b gsdx ogl:
* split GSDeviceOGl header. Will allow easy sharing with zzogl.
* fix some gcc warning
zzogl:
* import Uniform buffer and Vertex array from GSdx



git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5207 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-05-13 17:09:18 +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 49f4168974 zzogl-pg: import GSdump feature from GSdx
* Only available on debug build
* ctrl F9 -> dump a couple of frames
* ctrl shift F9 -> start/stop a stream of frames.
* Build a replayer too, called pcsx2_ZZReplayLoader

Note: dump are saved in /tmp.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5152 96395faa-99c1-11dd-bbfe-3dabce05a288
2012-04-07 21:23:01 +00:00
gregory.hainaut@gmail.com 7ecd913a7d onepad: remove deadcode
zzogl-pg: disable opengl3 context creation for the moment (crash with geforce7)


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4789 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-07-01 09:01:50 +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 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
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
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 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
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
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 2a9e644b18 GregMiscellaneous: zzogl: Restore the good size when quit fullscreen.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3743 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-08 19:04:11 +00:00
gregory.hainaut@gmail.com b6dcd319fd GregMiscellaneous: zzogl:
* restore widescreen option. Force a 4/3 mode when disabled.
* Also force 4/3 in window mode. In widescreen and fullscreen uses all the screen.
* Clean


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3740 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-08 11:16:27 +00:00
gregory.hainaut@gmail.com 873cb9656f GregMiscellaneous: zzogl:
* add more locking to X11. Never too safe.
* Free the visual (memory leak)
* Only search event of the current window
* force 4:3 in fullscreen mode (will need a toggle box to enable/disable it)
* do not grab cursor on debug (this one will need more test)


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3739 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-06 22:21:07 +00:00
gregory.hainaut@gmail.com ddb33652ab GregMiscellaneous: Minor clean
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3737 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-06 12:23:45 +00:00
arcum42 a468a27523 GregMiscellaneous: zzogl: Got rid x & y in GLWin. Make sure nBackBuffer gets set to the right width and height.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3735 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-06 09:46:33 +00:00
gregory.hainaut@gmail.com dc49a995d6 GregMiscellaneous: zzogl: Fix fullscreen setting & remove useless library
Major issue left: widescreen.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3734 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-05 22:08:55 +00:00
gregory.hainaut@gmail.com 65b985698e GregMiscellaneous: zzogl: add some locking. Work far better.
The trick was to call XInitThreads in the beginning.


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3732 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-05 16:30:47 +00:00
gregory.hainaut@gmail.com 0845dffb5b GregMiscellaneous: zzogl: rework fullscreen (to be friend with the WM). Note: it is not crash free for the moment.
* use alt-enter to toggle the fullscreen mode. (toggle quickly multiple time to crash it...) I suspect need of XLockDisplay & XUnlockDisplay
* escape: will quit for both mode

Not yet done: 
* good support of fullscreen conf flag. Which is wrong for the moment. (actually may be a source of crash)
* Better support of widescreen screen


git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3731 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-09-05 15:47:09 +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 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 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 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 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 5c20358c19 zzogl-pg: A quick persistant window hack.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2924 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-28 02:56:40 +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
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
ramapcsx2 a57761c934 Crashfix for ZZogl / ZeroGSogl. Thanks "jur".
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2825 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-08 21:58:14 +00:00
arcum42 02fdc8f9fc zzogl-pg: Use the memcpy_fast routines from Utilities in Linux. (Right now, Windows is using an old copy of it, and Linux wasn't using it at all.)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2774 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-03-26 09:19:41 +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