--- Brian Paul <[EMAIL PROTECTED]> wrote:
> For the GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB query?
>
> I guess it should return GL_TRUE if there's no actual program.
>
> The attached patch should fix that.
> > Index: r200_vertprog.c
> ===================================================================
> RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_vertprog.c,v
> retrieving revision 1.8
> diff -c -r1.8 r200_vertprog.c
> *** r200_vertprog.c 24 Aug 2006 22:03:38 -0000 1.8
> --- r200_vertprog.c 24 Aug 2006 23:51:31 -0000
> ***************
> *** 405,414 ****
> int are_srcs_scalar;
> unsigned long hw_op;
>
> ! vp->native = GL_FALSE;
> !
> ! if (!mesa_vp->Base.String)
> return GL_FALSE;
>
> if ((mesa_vp->Base.InputsRead &
> ~(VERT_BIT_POS | VERT_BIT_NORMAL | VERT_BIT_COLOR0 | VERT_BIT_COLOR1 |
> --- 405,419 ----
> int are_srcs_scalar;
> unsigned long hw_op;
>
> ! if (!mesa_vp->Base.String) {
> ! /* Spec says GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB is only zero if the
> ! * program (if it exists) exceeds hw limits.
> ! */
> ! vp->native = GL_TRUE;
> return GL_FALSE;
> + }
> +
> + vp->native = GL_FALSE;
>
> if ((mesa_vp->Base.InputsRead &
> ~(VERT_BIT_POS | VERT_BIT_NORMAL | VERT_BIT_COLOR0 | VERT_BIT_COLOR1 |
>
Brian,
I think this patch is wrong - shouldn't it say:
! if (!mesa_vp->Base.String) {
! /* Spec says GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB is only zero if the
! * program (if it exists) exceeds hw limits.
! */
! vp->native = GL_TRUE;
return GL_TRUE; /* <<<< HERE */
+ }
The bottom line is that my Xorg server locks up if I apply your patch and run
$ WoW.exe -opengl
but works OK if r200_translate_vertex_program() returns GL_TRUE if
mesa_vp->Base.String is NULL.
Cheers,
Chris
___________________________________________________________
Try the all-new Yahoo! Mail. "The New Version is radically easier to use" The
Wall Street Journal
http://uk.docs.yahoo.com/nowyoucan.html
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
