On Wed, Nov 4, 2009 at 11:29 AM, Brian Paul <[email protected]> wrote: > Chia-I Wu wrote: >> On Fri, Oct 30, 2009 at 2:32 PM, Chia-I Wu <[email protected] >> <mailto:[email protected]>> wrote: >> >> On Fri, Oct 30, 2009 at 12:44:35PM +0800, Chia-I Wu wrote: >> > It has been a month and several weeks since my last try. >> Comparing to >> > the last try, the number of patches goes down from 34 to 12. Most of >> > them have gone into the master. Due to the size, the patch series is >> > uploaded elsewhere >> > http://0xlab.org/~olv/mesa-es-try2/ >> <http://0xlab.org/%7Eolv/mesa-es-try2/> or >> > http://0xlab.org/~olv/mesa-es-try2.tar.gz >> <http://0xlab.org/%7Eolv/mesa-es-try2.tar.gz> >> I screwed up while merging/rebasing the patches. Please use >> http://0xlab.org/~olv/mesa-es-try2-v2/ >> <http://0xlab.org/%7Eolv/mesa-es-try2-v2/> or >> http://0xlab.org/~olv/mesa-es-try2-v2.tar.gz >> <http://0xlab.org/%7Eolv/mesa-es-try2-v2.tar.gz> >> Sorry for the inconvenience. >> >> Any comment? If there is any concern/question, please let me know. >> I am willing to fix it or discuss more about the design choices. > > Sorry, I'm really busy with other things right now and haven't had > time to review. The bigger the patches, the longer it takes. I'll > try to get to them some evening this week unless someone beats me to it.
I've created a new branch in git for your patches: opengl-es-v2 It has your patches from "glapi: Allow normal entry points to be skipped." up to and including the "OpenGL ES try2" patches. Some of the later patches didn't apply cleanly: $ git-am ~/mesa-es-try2/00* Applying: mesa/main: Add support for point size array in _mesa_GetPointerv. Applying: mesa/main: Add more OpenGL ES types to glheader.h. Applying: glapi: Add is_abi() to test if a function is in the ABI. Applying: glapi: Avoid hardcoded category names in remap helper script. Applying: glapi: Include headers with directory prefixes. Applying: glapi: Add OpenGL ES compatibility mode to scripts. error: patch failed: src/mesa/glapi/gl_apitemp.py:85 error: src/mesa/glapi/gl_apitemp.py: patch does not apply Patch failed at 0006 glapi: Add OpenGL ES compatibility mode to scripts. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". nostromo 125$ git-am --skip Applying: mesa/main: Make _mesa_TexGenf and _mesa_GetTexGenfv global again. Applying: mesa/es: Add OpenGL ES XMLs. Applying: mesa/es: Add OpenGL ES overlay. /home/brian/mh/.git/rebase-apply/patch:229: trailing whitespace. # (below) instead.) /home/brian/mh/.git/rebase-apply/patch:236: trailing whitespace. # dependentvector Used to indicate how many elements are referenced by /home/brian/mh/.git/rebase-apply/patch:352: trailing whitespace. checkparam pname GL_FOG_MODE GL_FOG_DENSITY GL_FOG_START GL_FOG_END /home/brian/mh/.git/rebase-apply/patch:363: trailing whitespace. dependentvector params 1 pname GL_FOG_DENSITY GL_FOG_START GL_FOG_END /home/brian/mh/.git/rebase-apply/patch:371: trailing whitespace. checkparam pname GL_FOG_MODE GL_FOG_DENSITY GL_FOG_START GL_FOG_END warning: squelched 80 whitespace errors warning: 85 lines add whitespace errors. Applying: mesa/es: Add support for GL_OES_draw_texture. /home/brian/mh/.git/rebase-apply/patch:458: trailing whitespace. * /home/brian/mh/.git/rebase-apply/patch:620: trailing whitespace. /home/brian/mh/.git/rebase-apply/patch:761: trailing whitespace. * warning: 3 lines add whitespace errors. Applying: st/es: Add OpenGL ES state trackers. Applying: progs/es: OpenGL ES 1.x and 2.X demo programs. /home/brian/mh/.git/rebase-apply/patch:170: trailing whitespace. /home/brian/mh/.git/rebase-apply/patch:444: trailing whitespace. /home/brian/mh/.git/rebase-apply/patch:756: trailing whitespace. /home/brian/mh/.git/rebase-apply/patch:830: trailing whitespace. * /home/brian/mh/.git/rebase-apply/patch:837: trailing whitespace. * warning: squelched 26 whitespace errors warning: 31 lines add whitespace errors. Maybe you could check out the branch and re-submit the patches that need changes. What's on the branch now compiles and runs (I tested the i915 driver on my laptop) but didn't try any of the ES parts. It would be good if some other people tested the branch. Then it can be merged to master. BTW, I pinged one of the FD.O admins to get your git-write account set up. Fingers crossed... -Brian ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
