Posts: 5
Threads: 0
Joined: Jan 2011
Reputation:
0
Hi gregory
If I understand you right, you mean to mix good version (r4048) with other more recent versions, both with regard to the plugin and "the other parts" of pcsx2.
I've tried this, and the results further indicates there's some kind of regression introduced with r4049. I seem to be able to use any revision (including latest) as long I have the zzogl plugin from r4048.
I've begun to look trough the details of the problematic patchset, in order to find out what change exactly is making it crash for me, but the sheer size of it makes this a very difficult process. My idea was to split out the re-organization and then gradually apply the changes. If I'll be able to is yet to see, however. I'm not so experienced in coding.
Bug report is on my todo, (but I want to do some more experiments before I file it) =)
Sponsored links
Posts: 543
Threads: 16
Joined: Dec 2008
Reputation:
7
Location: Las Vegas, NV
Given that r4049 was the GregMiscellaneous branch being merged in, the best approach would probably be to check out that branch instead of the trunk, and then go backwards in revisions from r4049 until you know which one you started having issues with. That ought to narrow down which change it was a lot more...
Posts: 6.069
Threads: 68
Joined: May 2010
Reputation:
167
Location: Grenoble, France
01-08-2011, 11:25 AM
(This post was last modified: 01-08-2011, 11:26 AM by gregory.)
As Arcum said it would be better to check my branch svn co https://pcsx2.googlecode.com/svn/branche...cellaneous The previous idea was just to know if the bad code was on my zzogl changeset or in pcsx2 changeset.
Here the changelog of the branch to know interesting version to check. Others do not have any impact on the branch only on the trunk. Note some versions are broken... I made quiete invasive change, so skip Arcum change, it would reduced the number of test. Note: I have a doubt on r3984 with 24bits texture, maybe worth to check this one first.
By the way, which game cause the crash.
Thanks very much for the help.
Code: ------------------------------------------------------------------------
r4047 | arcum42 | 2010-11-23 09:39:12 +0100 (Tue, 23 Nov 2010) | 1 line
GregsMisc: Just a bit of cleanup.
------------------------------------------------------------------------
r4046 | arcum42 | 2010-11-23 04:35:01 +0100 (Tue, 23 Nov 2010) | 1 line
GregsMisc: zzogl-pg: Rename ZZKick.{cpp,h} to ZZoglDrawing.{cpp,h}, to make syncing with zzogl easier.
------------------------------------------------------------------------
r4045 | arcum42 | 2010-11-23 04:11:08 +0100 (Tue, 23 Nov 2010) | 1 line
GregsMisc: Sync with trunk (r3983-r4044)
------------------------------------------------------------------------
r4018 | arcum42 | 2010-11-14 03:21:18 +0100 (Sun, 14 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Quick fix to the last commit.
------------------------------------------------------------------------
r4017 | arcum42 | 2010-11-14 02:38:10 +0100 (Sun, 14 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Work on the GLWin functions a bit.
------------------------------------------------------------------------
r4011 | arcum42 | 2010-11-10 12:15:48 +0100 (Wed, 10 Nov 2010) | 1 line
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.
------------------------------------------------------------------------
r4009 | arcum42 | 2010-11-09 13:04:07 +0100 (Tue, 09 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Get rid of an extraneous function or two, straighten up some includes, and move some things around to appropriate places.
------------------------------------------------------------------------
r4008 | [email protected] | 2010-11-07 11:27:27 +0100 (Sun, 07 Nov 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Clean the mem swizzle interface
------------------------------------------------------------------------
r4007 | arcum42 | 2010-11-07 10:14:48 +0100 (Sun, 07 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Fix Windows compilation issues.
------------------------------------------------------------------------
r4006 | arcum42 | 2010-11-07 06:51:54 +0100 (Sun, 07 Nov 2010) | 1 line
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.)
------------------------------------------------------------------------
r4005 | arcum42 | 2010-11-07 05:45:10 +0100 (Sun, 07 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Start gathering the hack code in one place.
------------------------------------------------------------------------
r4002 | arcum42 | 2010-11-06 08:00:48 +0100 (Sat, 06 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Fix up NewRegs.cpp so it compiles again.
------------------------------------------------------------------------
r4001 | arcum42 | 2010-11-06 07:41:56 +0100 (Sat, 06 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Have the Windows version use the Utilities version of memcpy_amd like the Linux version does, and get rid of the redundant file...
------------------------------------------------------------------------
r4000 | arcum42 | 2010-11-06 07:28:45 +0100 (Sat, 06 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Windows compilation fixes.
------------------------------------------------------------------------
r3999 | arcum42 | 2010-11-06 07:05:00 +0100 (Sat, 06 Nov 2010) | 1 line
GregMiscellaneous: zzogl-pg: Move the time functions over to be by the Profile code.
------------------------------------------------------------------------
r3990 | [email protected] | 2010-10-31 16:27:36 +0100 (Sun, 31 Oct 2010) | 4 lines
GregMiscellaneous: zzogl-pg:
* Improve a little previous commit
* Remove a fixme that was fix long time ago
------------------------------------------------------------------------
r3989 | [email protected] | 2010-10-31 15:19:46 +0100 (Sun, 31 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Fix a regression of my commit r3965 (missing draw in god of war)
------------------------------------------------------------------------
r3988 | [email protected] | 2010-10-31 12:47:56 +0100 (Sun, 31 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Backport prim change from regs to newregs
------------------------------------------------------------------------
r3987 | [email protected] | 2010-10-31 11:34:37 +0100 (Sun, 31 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Mem swizzle: fix mask scrambling & bad copy paste
------------------------------------------------------------------------
r3986 | arcum42 | 2010-10-31 09:17:56 +0100 (Sun, 31 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Consolidate the context-specific Registry code, as was already done in NewRegs.
------------------------------------------------------------------------
r3985 | arcum42 | 2010-10-31 08:10:21 +0100 (Sun, 31 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: A few minor changes.
------------------------------------------------------------------------
r3984 | [email protected] | 2010-10-30 23:42:40 +0200 (Sat, 30 Oct 2010) | 4 lines
GregMiscellaneous: zzogl-pg:
* For 24 bits texture: there is some spare room in gsmemory so do not bother to avoid overflow in the copy
* Port some swizzle function to sse2. It would avoid some copy in a temporary buffer
------------------------------------------------------------------------
r3983 | [email protected] | 2010-10-30 13:24:03 +0200 (Sat, 30 Oct 2010) | 2 lines
GregMiscellaneous: sync with trunk (3805:3982)
------------------------------------------------------------------------
r3973 | [email protected] | 2010-10-26 23:14:15 +0200 (Tue, 26 Oct 2010) | 4 lines
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
------------------------------------------------------------------------
r3971 | [email protected] | 2010-10-25 20:31:38 +0200 (Mon, 25 Oct 2010) | 5 lines
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
------------------------------------------------------------------------
r3970 | [email protected] | 2010-10-25 19:34:10 +0200 (Mon, 25 Oct 2010) | 2 lines
GregMiscellaneous: zzogl-pg: * Revert previous commit and remove the = overloading
------------------------------------------------------------------------
r3969 | [email protected] | 2010-10-24 14:05:18 +0200 (Sun, 24 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Use an union to improve a little the copy of vertex
------------------------------------------------------------------------
r3968 | [email protected] | 2010-10-24 12:44:09 +0200 (Sun, 24 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg: Forget 1 line in previous commit ....
------------------------------------------------------------------------
r3967 | [email protected] | 2010-10-24 12:23:06 +0200 (Sun, 24 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Improve a little sprite vertex processing
------------------------------------------------------------------------
r3966 | arcum42 | 2010-10-24 06:09:42 +0200 (Sun, 24 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Remove the Gust hack from Mana Khemia. A few misc changes.
------------------------------------------------------------------------
r3965 | [email protected] | 2010-10-24 01:02:19 +0200 (Sun, 24 Oct 2010) | 5 lines
GregMiscellaneous: zzogl-pg:
* Regoup drawing primitive in one function
* Increase the inital size of the vertex buffer
* various clean
------------------------------------------------------------------------
r3964 | [email protected] | 2010-10-23 19:59:10 +0200 (Sat, 23 Oct 2010) | 4 lines
GregMiscellaneous: zzogl-pg:
* copy some vertex instead of re compute them twice
* pass vertex as reference avoid useless copy on the stack...
------------------------------------------------------------------------
r3963 | arcum42 | 2010-10-23 14:14:15 +0200 (Sat, 23 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Get zzogl-pg working in Windows again.
------------------------------------------------------------------------
r3962 | arcum42 | 2010-10-23 10:22:32 +0200 (Sat, 23 Oct 2010) | 1 line
GregMiscellaneous: zerogs: Revert an accidental change to zerogs...
------------------------------------------------------------------------
r3961 | arcum42 | 2010-10-23 10:15:39 +0200 (Sat, 23 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Give VB its own header. Some changes to the Kick functions.
------------------------------------------------------------------------
r3960 | arcum42 | 2010-10-23 06:14:19 +0200 (Sat, 23 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Continuing to work on zerogs.cpp and zerogs.h.
------------------------------------------------------------------------
r3957 | [email protected] | 2010-10-22 17:53:17 +0200 (Fri, 22 Oct 2010) | 4 lines
GregMiscellaneous:zzogl-pg:
* Add a sse test to compare GSMem and clut buffer
* minor 16-bits clut fix
------------------------------------------------------------------------
r3953 | [email protected] | 2010-10-21 14:11:28 +0200 (Thu, 21 Oct 2010) | 3 lines
GregMiscellaneous:zzogl-pg:
* More clut fix.
------------------------------------------------------------------------
r3952 | [email protected] | 2010-10-21 13:13:49 +0200 (Thu, 21 Oct 2010) | 4 lines
GregMiscellaneous:zzogl-pg:
* fix sse2 code for 16bits cluts.
* Fix debug build
------------------------------------------------------------------------
r3951 | [email protected] | 2010-10-21 09:19:08 +0200 (Thu, 21 Oct 2010) | 3 lines
GregMiscellaneous:zzogl-pg:
* Forgot one line in previous commit
------------------------------------------------------------------------
r3950 | [email protected] | 2010-10-20 11:29:35 +0200 (Wed, 20 Oct 2010) | 2 lines
GregMiscellaneous:zzogl-pg: Rename also the include....
------------------------------------------------------------------------
r3949 | [email protected] | 2010-10-20 11:09:31 +0200 (Wed, 20 Oct 2010) | 3 lines
GregMiscellaneous:zzogl-pg:
* rename filename (Clut to ZZClut)
------------------------------------------------------------------------
r3948 | [email protected] | 2010-10-19 22:29:01 +0200 (Tue, 19 Oct 2010) | 6 lines
GregMiscellaneous: spu2x:
* Copy wavfile back to spu2x directory. Note I shrink the file to only usefull feature to keep it small.
Rationale: Wavfile is not delivered by the soundtouch library (it is an example).
------------------------------------------------------------------------
r3947 | [email protected] | 2010-10-19 19:53:36 +0200 (Tue, 19 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* 16 bits aligned the local clut array to allow sse2 operations
------------------------------------------------------------------------
r3943 | [email protected] | 2010-10-18 19:39:12 +0200 (Mon, 18 Oct 2010) | 4 lines
GregMiscellaneous: zzogl-pg:
* make code more consistent
* Use some sse2 for 16 bits texture
------------------------------------------------------------------------
r3940 | [email protected] | 2010-10-18 15:13:40 +0200 (Mon, 18 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Bad copy/paste: restore 256 entries texture
------------------------------------------------------------------------
r3937 | arcum42 | 2010-10-18 13:24:40 +0200 (Mon, 18 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: zerogs.h is now only included by zerogs.cpp.
------------------------------------------------------------------------
r3936 | arcum42 | 2010-10-18 11:06:12 +0200 (Mon, 18 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Add the Clut files to the CodeBlocks project...
------------------------------------------------------------------------
r3935 | [email protected] | 2010-10-18 07:51:13 +0200 (Mon, 18 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* It is better with the files:p
------------------------------------------------------------------------
r3932 | [email protected] | 2010-10-17 18:10:01 +0200 (Sun, 17 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* minor clean
------------------------------------------------------------------------
r3931 | [email protected] | 2010-10-17 17:49:34 +0200 (Sun, 17 Oct 2010) | 5 lines
GregMiscellaneous: zzogl-pg:
* regroup clut core function into one big files
Note: codeblock need to be updated. And I hope template are ms friendly :)
------------------------------------------------------------------------
r3930 | arcum42 | 2010-10-17 12:03:12 +0200 (Sun, 17 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Add a header for HostMemory.
------------------------------------------------------------------------
r3929 | arcum42 | 2010-10-17 11:42:49 +0200 (Sun, 17 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Create ZZKick.cpp & ZZKick.h, and move appropriate code there.
------------------------------------------------------------------------
r3928 | arcum42 | 2010-10-17 11:07:16 +0200 (Sun, 17 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Add a new header. More work on zerogs.h.
------------------------------------------------------------------------
r3927 | arcum42 | 2010-10-17 10:47:31 +0200 (Sun, 17 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Shuffle more stuff around from zerogs.h.
------------------------------------------------------------------------
r3926 | arcum42 | 2010-10-17 09:57:25 +0200 (Sun, 17 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Move target-related structures from zerogs.h to targets.h.
------------------------------------------------------------------------
r3925 | [email protected] | 2010-10-16 23:11:56 +0200 (Sat, 16 Oct 2010) | 4 lines
GregMiscellaneous: zzogl-pg:
* Keep same format when reupload the texture after an error...
* various minor clean
------------------------------------------------------------------------
r3924 | arcum42 | 2010-10-16 13:54:46 +0200 (Sat, 16 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Remove the ZeroGS namespace.
------------------------------------------------------------------------
r3923 | arcum42 | 2010-10-16 13:10:48 +0200 (Sat, 16 Oct 2010) | 1 line
GregMiscellaneous: zzogl-pg: Various legacy printfs were hanging around. Change a few messages to just be in Debug mode.
------------------------------------------------------------------------
r3922 | [email protected] | 2010-10-15 19:47:36 +0200 (Fri, 15 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Forgot to remove the dis-alignment
------------------------------------------------------------------------
r3921 | [email protected] | 2010-10-15 14:18:35 +0200 (Fri, 15 Oct 2010) | 3 lines
GregMiscellaneous: zzogl-pg:
* Fix previous commit :)
------------------------------------------------------------------------
r3920 | [email protected] | 2010-10-15 11:52:56 +0200 (Fri, 15 Oct 2010) | 5 lines
GregMiscellaneous: zzogl-pg:
* redid the WriteCLUT_T16_I4_CSM1_sse2 functions (more generic, faster, cleaner)
* Create WriteCLUT_T16_I8_CSM1_sse2 based on WriteCLUT_T16_I4_CSM1_sse2
* Change some clut buffer offset... Probably impact the compatibility
------------------------------------------------------------------------
r3919 | [email protected] | 2010-10-15 11:32:41 +0200 (Fri, 15 Oct 2010) | 2 lines
GregMiscellaneous: sync with trunk (3805-3918)
------------------------------------------------------------------------
Posts: 6.069
Threads: 68
Joined: May 2010
Reputation:
167
Location: Grenoble, France
I found some strange logical code for me.
The function CheckFrame16vs32Conversion updates fbh value before calling convert32/16 function.
1/ I would expect to call InitialiseDefaultTexture with RH(fbh*2) (compensate the previous /2) instead of RH(fbh)*2.
2/ Convert32 reupdates the fbh value (fbh /= 2) however the similar code in Convert16 is commented. Maybe a forget things.
Posts: 5
Threads: 0
Joined: Jan 2011
Reputation:
0
01-08-2011, 10:10 PM
(This post was last modified: 01-09-2011, 01:43 AM by xjx.)
That's helped me immensely. Thanks!
I've made a patch for a partial revert in ZZoglCreate.cpp that makes trunk work again, I'll send you the patch for reviewing as a private message.
Just for the record, it crashed before any game could start. In fact I triggered it by just starting after selecting the 'No Disc' menu option. Instant crash before the emulator window shows. This happened on Fedora 14, with an intel G45 mobile igp.
-xjx
Edit: Also if anyone beside greg is interested in viewing the patch, I make a pastebin
Posts: 543
Threads: 16
Joined: Dec 2008
Reputation:
7
Location: Las Vegas, NV
I went ahead and put a modified version of that patch in r4187. The shame is that that particular change was made because calling glGetString(GL_EXTENSIONS) has been depreciated, as well as the code being cleaner. Oh well, even if it's depreciated, it still works...
Posts: 6.069
Threads: 68
Joined: May 2010
Reputation:
167
Location: Grenoble, France
xjx,
Could you test the attached patch (in debug mode, rev) and give me the output of zzogl. The patch adds additional check to understand what it is going on your system during the crash.
Thanks very much.
Posts: 5
Threads: 0
Joined: Jan 2011
Reputation:
0
I didn't build a debug version (yet) but a release version reports: ZZogl-PG: Failed to get glGetStringi interface
glXGetProcAddress return a null pointer, because GlGetStringi is OpenGL 3.0+ only 
I saw that pcsx2 had glew. Can we use that, or do we get other issues like those mention in http://rastergrid.com/blog/2010/03/sad-f...libraries/ ?
Posts: 6.069
Threads: 68
Joined: May 2010
Reputation:
167
Location: Grenoble, France
01-09-2011, 06:18 PM
(This post was last modified: 01-09-2011, 07:22 PM by gregory.)
It is a shame that the intel driver is not capable of supporting such basic function of opengl3. The debug version is not needed anymore. The crash appears because we call a null pointer as a function...
It is a drivers issue not opengl extensions library. Except if there is some issue with the opengl context creation, but it seems to work for nvidia/amd.
Edit: I restore the new method and fallback to the old otherwise. At least Sandybridge supports opengl 3.
Posts: 1
Threads: 0
Joined: Jan 2011
Reputation:
0
01-12-2011, 06:58 AM
(This post was last modified: 01-12-2011, 11:16 AM by Bernard.)
Hi.
First of all, thanks to everyone involved in the Linux version of PCSX2.
So after some fossicking about, I got PCSX2 running on this AMD64 Ubuntu system. ZZogl always dies with the following:
Quote:Cannot find ps2hw.dat in working directory. Exiting.
ps2hw.dat is in the plugin directory.
I just have a small feature request. Replace "working directory" with "working directory ('/path/to/workingdir/')".
As to why it's not working, I'm fairly stumped. I checked permissions, and put it in a few other places, but nothing seemed to take.
Thanks again!
EDIT
Okay, my stupid fault. Through the magic of `strace -f` I found it was looking for the file in /usr/share/games/pcsx2/shaders, and then I tweaked. I'd replaced the .so with one from a deb package when it wasn't loading (I had the libCg stuff in the wrong place). False alarm on account of my stupidity. >_<
|
