Re: [Mesa3d-dev] R300 fog support and fp16 fix
On Sun, 9 Apr 2006 22:54:10 +0200 Ewald Snel <[EMAIL PROTECTED]> wrote: > Hi, > > Here are two patches for the R300 DRI driver. One adds conventional fog > support to the R300 driver, the other fixes a problem with rectangular fp16 > textures. > > The fog patch is not based on actual register values of the fglrx driver, but > rather by trial and error writing to the registers related to fog. The fglrx > driver initializes these registers to uninteresting defaults, probably > because the vertex and fragment program calculate fog intensity. Commited. I found couple problems with fog patch: -fog didnt get disabled when doing buffer clears -when enabling fog, fog state needs to be updated since r300Fogfv returns -gb_select was already part of gb_misc Some mesa demos still fail for some reason. I think its somehow related to use of glOrtho as gluPerspective & gluLookAt combo seems to work. Thanks! -- Aapo Tahkola --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] [PATCH] Add noexec stack markings to mesa assembler files
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Kristian Høgsberg wrote: > I just added the attached patch to our rawhide RPM for mesa. It just > adds the following snippet to all assembler files (generated or > handwritten): > > #ifdef __ELF__ > .section .note.GNU-stack,"",%progbits > #endif Is this this right ifdef? Are there other ELF platforms where this would cause problems? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.1 (GNU/Linux) iD8DBQFEOvcOX1gOwKyEAw8RArSDAKCJZvXOeaWzAG2amf6c8lVF6lKlWACfYi7T CV7t+4Eo/gx6xI2QZG79reU= =Q3Kz -END PGP SIGNATURE- --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid0944&bid$1720&dat1642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[Mesa3d-dev] Re: [PATCH] Add noexec stack markings to mesa assembler files
Oops, patch attached... Index: src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S === RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S,v retrieving revision 1.5 diff -u -p -r1.5 r200_vtxtmp_x86.S --- src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S 2 Jun 2004 22:09:11 - 1.5 +++ src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S 10 Apr 2006 21:48:16 - @@ -493,3 +493,7 @@ GLOBL( _sse_MultiTexCoord2f_2 ) ret GLOBL( _sse_MultiTexCoord2f_2_end ) #endif + +#ifdef __ELF__ + .section .note.GNU-stack,"",%progbits +#endif Index: src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S === RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S,v retrieving revision 1.3 diff -u -p -r1.3 radeon_vtxtmp_x86.S --- src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S 13 Oct 2005 14:30:20 - 1.3 +++ src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S 10 Apr 2006 21:48:16 - @@ -492,3 +492,7 @@ GLOBL( _sse_MultiTexCoord2f_2 ) ret GLOBL( _sse_MultiTexCoord2f_2_end ) #endif + +#ifdef __ELF__ + .section .note.GNU-stack,"",%progbits +#endif Index: src/mesa/glapi/gl_x86-64_asm.py === RCS file: /cvs/mesa/Mesa/src/mesa/glapi/gl_x86-64_asm.py,v retrieving revision 1.6 diff -u -p -r1.6 gl_x86-64_asm.py --- src/mesa/glapi/gl_x86-64_asm.py 2 Dec 2005 00:25:06 - 1.6 +++ src/mesa/glapi/gl_x86-64_asm.py 10 Apr 2006 21:48:18 - @@ -190,6 +190,10 @@ class PrintGenericStubs(gl_XML.gl_print_ print ' .long 2,4,20/* Minimum kernel version w/TLS */' print '3: .p2align 2/* pad out section */' print '#endif /* GLX_USE_TLS */' + print '' + print '#ifdef __ELF__' + print ' .section .note.GNU-stack,"",%progbits' + print '#endif' return Index: src/mesa/glapi/gl_x86_asm.py === RCS file: /cvs/mesa/Mesa/src/mesa/glapi/gl_x86_asm.py,v retrieving revision 1.16 diff -u -p -r1.16 gl_x86_asm.py --- src/mesa/glapi/gl_x86_asm.py 4 Nov 2005 00:58:17 - 1.16 +++ src/mesa/glapi/gl_x86_asm.py 10 Apr 2006 21:48:18 - @@ -188,6 +188,10 @@ class PrintGenericStubs(gl_XML.gl_print_ print ' .long 2,4,20/* Minimum kernel version w/TLS */' print '3: .p2align 2/* pad out section */' print '#endif /* GLX_USE_TLS */' + print '' + print '#ifdef __ELF__' + print ' .section .note.GNU-stack,"",%progbits' + print '#endif' return Index: src/mesa/tnl/t_vtx_x86_gcc.S === RCS file: /cvs/mesa/Mesa/src/mesa/tnl/t_vtx_x86_gcc.S,v retrieving revision 1.13 diff -u -p -r1.13 t_vtx_x86_gcc.S --- src/mesa/tnl/t_vtx_x86_gcc.S 17 Sep 2004 05:10:33 - 1.13 +++ src/mesa/tnl/t_vtx_x86_gcc.S 10 Apr 2006 21:48:19 - @@ -555,3 +555,7 @@ GLOBL( _tnl_x86_dispatch_vertexattribfv ret $8 /* return */ GLOBL( _tnl_x86_dispatch_vertexattribfv_end ) #endif /* defined (STDCALL_API) */ + +#ifdef __ELF__ + .section .note.GNU-stack,"",%progbits +#endif Index: src/mesa/x86/3dnow_normal.S === RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_normal.S,v retrieving revision 1.9 diff -u -p -r1.9 3dnow_normal.S --- src/mesa/x86/3dnow_normal.S 4 Jan 2005 14:33:47 - 1.9 +++ src/mesa/x86/3dnow_normal.S 10 Apr 2006 21:48:20 - @@ -846,3 +846,7 @@ LLBL (G3R_end): RET #endif + +#ifdef __ELF__ + .section .note.GNU-stack,"",%progbits +#endif Index: src/mesa/x86/3dnow_xform1.S === RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform1.S,v retrieving revision 1.3 diff -u -p -r1.3 3dnow_xform1.S --- src/mesa/x86/3dnow_xform1.S 4 Jan 2005 14:33:47 - 1.3 +++ src/mesa/x86/3dnow_xform1.S 10 Apr 2006 21:48:20 - @@ -431,3 +431,7 @@ LLBL( G3TP3R_3 ): RET #endif + +#ifdef __ELF__ + .section .note.GNU-stack,"",%progbits +#endif Index: src/mesa/x86/3dnow_xform2.S === RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform2.S,v retrieving revision 1.3 diff -u -p -r1.3 3dnow_xform2.S --- src/mesa/x86/3dnow_xform2.S 4 Jan 2005 14:33:47 - 1.3 +++ src/mesa/x86/3dnow_xform2.S 10 Apr 2006 21:48:20 - @@ -471,3 +471,7 @@ LLBL( G3TPIR_4 ): POP_L ( ESI ) RET #endif + +#ifdef __ELF__ + .section .note.GNU-stack,"",%progbits +#endif Index: src/mesa/x86/3dnow_xform3.S === RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow_xform3.S,v retrieving revision 1.4 diff -u -p -r1.4 3dnow_xform3.S --- src/mesa/x86/3dnow_xform3.S 4 Jan 2005 14:33:47 - 1.4 +++ src/mesa/x86/3dnow_xform3.S 10 Apr 2006 21:48:20 - @@ -555,3 +555,7 @@ LLBL( G3TPIR_2 ): POP_L ( ESI ) RET #endif + +#ifdef __ELF__ + .section .note.GNU-stack,"",%progbits +#end
[Mesa3d-dev] [PATCH] Add noexec stack markings to mesa assembler files
Hi, I just added the attached patch to our rawhide RPM for mesa. It just adds the following snippet to all assembler files (generated or handwritten): #ifdef __ELF__ .section .note.GNU-stack,"",%progbits #endif which would otherwise default to having executable stacks, which in turn causes libGL.so and the DRI drivers to require executable stack. Ok to commit? cheers, Kristian
Re: [Mesa3d-dev] Re: DRI and Mesa core patch for GLSL varyings
Michał Król wrote: On 10/04/06, Brian Paul <[EMAIL PROTECTED]> wrote: Michał Król wrote: On 07/04/06, Brian Paul<[EMAIL PROTECTED]> wrote: The GLSL vertex attributes cannot alias with conventional attributes. Right. That's not what I meant though. Now I get it.I will refrain from commiting changes till the next week and see whatI can do with s_tritemp.h. Don't worry about s_tritemp.h now. That can be a future project (like when the number of varying attributes needs to increase). You can check in your patch now. -Brian --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid0944&bid$1720&dat1642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] Re: DRI and Mesa core patch for GLSL varyings
On 10/04/06, Brian Paul <[EMAIL PROTECTED]> wrote: > Michał Król wrote: > > On 07/04/06, Brian Paul <[EMAIL PROTECTED]> wrote: > > The GLSL vertex attributes cannot alias with conventional attributes. > > Right. That's not what I meant though. > Now I get it. I will refrain from commiting changes till the next week and see what I can do with s_tritemp.h. -- Pozdrawiam, Michal Krol
Re: [Mesa3d-dev] R300 fog support and fp16 fix
Hi Brian, [...] > The patch looks OK to me, but Aapo Tahkola ([EMAIL PROTECTED]) should > probably review all the R300 patches since he's been doing most (all?) > of the recent work on that driver. > > Aapo? > > In the future, you may want to submit your patches through bugzilla. Okay, I will. Thanks. Bye, Ewald --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] EXT_texture_from_pixmap update
Ian Romanick wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 David Reveman wrote: Patch for mesa with a set of updates for EXT_tfp. Includes necessary FBConfig support, adds attrib_list to BindTexImage and fixes CreateDrawable so that glXCreatePixmap works. Xgl and compiz requires this patch. Can I commit this to head? Other than my one comment below, this looks good. Index: include/GL/internal/glcore.h === RCS file: /cvs/mesa/Mesa/include/GL/internal/glcore.h,v retrieving revision 1.8 diff -u -r1.8 glcore.h --- include/GL/internal/glcore.h6 Jun 2004 02:20:20 - 1.8 +++ include/GL/internal/glcore.h9 Apr 2006 10:46:54 - @@ -136,6 +136,13 @@ /* OML_swap_method */ GLint swapMethod; +/* EXT_texture_from_pixmap */ +GLint bindToTextureRgb; +GLint bindToTextureRgba; +GLint bindToMipmapTexture; +GLint bindToTextureTargets; +GLint yInverted; + GLint screen; } __GLcontextModes; Ai!!! Additions to __GLcontextModes *MUST* go at the end. Any driver compiled against an old version of the structure will get a nasty surprise if it tries to access the screen field. :) That's critical information which must be documented in the code. Ian, would you please update the comments in glcore.h accordingly? -Brian --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] EXT_texture_from_pixmap update
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 David Reveman wrote: > Patch for mesa with a set of updates for EXT_tfp. Includes necessary > FBConfig support, adds attrib_list to BindTexImage and fixes > CreateDrawable so that glXCreatePixmap works. > > Xgl and compiz requires this patch. > > Can I commit this to head? Other than my one comment below, this looks good. > Index: include/GL/internal/glcore.h > === > RCS file: /cvs/mesa/Mesa/include/GL/internal/glcore.h,v > retrieving revision 1.8 > diff -u -r1.8 glcore.h > --- include/GL/internal/glcore.h 6 Jun 2004 02:20:20 - 1.8 > +++ include/GL/internal/glcore.h 9 Apr 2006 10:46:54 - > @@ -136,6 +136,13 @@ > /* OML_swap_method */ > GLint swapMethod; > > +/* EXT_texture_from_pixmap */ > +GLint bindToTextureRgb; > +GLint bindToTextureRgba; > +GLint bindToMipmapTexture; > +GLint bindToTextureTargets; > +GLint yInverted; > + > GLint screen; > } __GLcontextModes; Ai!!! Additions to __GLcontextModes *MUST* go at the end. Any driver compiled against an old version of the structure will get a nasty surprise if it tries to access the screen field. :) The DRI interface version (as returned by __glXGetInternalVersion in src/glx/x11/glxcmds.c) should NOT bumped. This all works because the driver allocates these structures by calling _gl_context_modes_create in libGL. If the driver wants a new version, it will specify a minimum_size that is larger than what libGL thinks sizeof(__GLcontextModes) is. If the driver wants an old version, libGL will give it a new version, with properly initialized fields, anyway. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.1 (GNU/Linux) iD8DBQFEOnkAX1gOwKyEAw8RAmd5AJsGuxO9AqOCVVeJO84zzG/xDUg81QCggfSV J17TQUILSvhA+3iydaZwUtQ= =XiMG -END PGP SIGNATURE- --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] Re: DRI and Mesa core patch for GLSL varyings
Michał Król wrote: On 07/04/06, Brian Paul <[EMAIL PROTECTED]> wrote: Before we get to that point, I'd like to reconsider a few things in the code. Specifically, the way the tnl and swrast modules interface in terms of vertex attributes. The span_arrays struct is getting pretty big (over 800KB now) and the s_tritemp.h code is becoming unwieldy. There's got to be a better way of handling all the interpolants and use less memory. The GLSL vertex attributes cannot alias with conventional attributes. Right. That's not what I meant though. It seems to me that generic (varying) interpolants, texcoords, fog coord, colors, etc. could all be handled with the same code, rather than a separate #ifdef for each type of attribute. It would take some effort to do though because the attributes aren't all the same: - perspective correction? - float vs. int/fixed-pt interpolation - 1, 3 or 4 components per attributes - clamping? It's kind of a mess. In the TNL module we used to treat all the vertex attributes with special code (i.e. colors, normals, texcoord, etc). When I implemented vertex programs I was able to replace a lot of specialized code with generic attribute code (i.e. attrib[0], attrib[1], etc). It would be nice to do that in the swrast code. This makes a total count of 32 vertex attribute vectors. The same apply to varyings, they cannot alias with texcoords. I can only cut in half the fat by tightly packing varyings. This gives 500K of varyings for 4096 viewport width. When I started working with tnl to swrast interface I falsely concluded, by quick look at the structures, that number of vertex attrib slots must be equal to number of fragment attrib (varying) slots. Funny. I suspect there can be an issue regarding vertex attrib aliasing in NV_vp. I can be wrong, but some code assumes VERT_ATTRIB_MAX to be always equal to MAX_VERTEX_PROGRAM_ATTRIBS. And now, when VERT_ATTRIB_MAX is pumped up to 32, it can result in wrong behaviour. Yeah, the code should be inspected for places where that's wrong. There's a few things that didn't work. First, the patch didn't apply cleanly the the CVS trunk. I had to manually apply a few of the patches. t_vb_arbshader.c was the main one. In r300_state.c you need to replace "r300_outputs_written" with "union r300_outputs_written". In C++ you don't need the 'union', but you do for C. In savetris.c you need to replace _TNL_BIT_TEX1 with _TNL_ATTRIB_TEX1 at line 880. BTW, I'd still like to see the code re-indented to the Mesa standard someday (3-space indentation, etc) and filtered to remove the carriage return chars. Okay, I understand that with this changes I can safely commit the code now. Sure. Please monitor the list, though, in case any new driver bugs appear because of the changes. -Brian --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid0944&bid$1720&dat1642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] EXT_texture_from_pixmap update
David Reveman wrote: Patch for mesa with a set of updates for EXT_tfp. Includes necessary FBConfig support, adds attrib_list to BindTexImage and fixes CreateDrawable so that glXCreatePixmap works. Xgl and compiz requires this patch. Can I commit this to head? In general, it looks OK to me. The only question I have is about adding new fields to the __GLcontextModesRec structure. I'm not sure if that struct is part of the ABI between any DRI components. If so, adding new fields might break compatibility somewhere. Ian would probably know. -Brian --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] R300 fog support and fp16 fix
Ewald Snel wrote: Hi, Here are two patches for the R300 DRI driver. One adds conventional fog support to the R300 driver, the other fixes a problem with rectangular fp16 textures. The fog patch is not based on actual register values of the fglrx driver, but rather by trial and error writing to the registers related to fog. The fglrx driver initializes these registers to uninteresting defaults, probably because the vertex and fragment program calculate fog intensity. The patch looks OK to me, but Aapo Tahkola ([EMAIL PROTECTED]) should probably review all the R300 patches since he's been doing most (all?) of the recent work on that driver. Aapo? In the future, you may want to submit your patches through bugzilla. -Brian --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[Mesa3d-dev] [Bug 6484] 64 Bit mesa-6.4.2 crashes on Solaris 9 compiled with gcc 4.0.2
Please do not reply to this email: if you want to comment on the bug, go to the URL shown below and enter yourcomments there. https://bugs.freedesktop.org/show_bug.cgi?id=6484 --- Additional Comments From [EMAIL PROTECTED] 2006-04-10 21:09 --- Thank you Alan, I hope that could help solving the solaris problem. I hope you've an installed at least gcc 3.4.2 on that machine, too. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
