android-x86-mesa.git/src/gallium/drivers/nv40, branch r300 Androïd/x86 port of Mesa drivers https://git.hiegel.fr/cgit/android-x86-mesa.git/atom?h=r300 2010-03-15T09:44:52Z Merge commit 'origin/master' into gallium-sampler-view 2010-03-15T09:44:52Z Keith Whitwell keithw@vmware.com 2010-03-15T09:44:52Z urn:sha1:42910ebe7b9748c0ecb6a597bae3e7d43c7e170f Conflicts: src/gallium/drivers/nv30/nv30_context.h src/gallium/drivers/nv30/nv30_state.c src/gallium/drivers/nv40/nv40_context.h src/gallium/drivers/nv40/nv40_state.c src/gallium/drivers/r300/r300_emit.c nv30, nv40: move last files to nvfx/ and rm -rf nv30 nv40 2010-03-15T04:03:04Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T14:13:12Z urn:sha1:f9d09a2e7859a2cf025d71b7c3cb189edb6688c4 This is the last nvfx unification patch. nv[34]0_fragtex.c are moved to the common directory nv[34]0_shader.h are renamed to nv[34]0_vertprog.h and moved to the common directory The separate nv30 and nv40 directories are removed from the build system nv30, nv40: partially non-trivially unify sampler state in nv[34]0_state.c 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-24T14:08:48Z urn:sha1:7d210fa05f286eb19398ac2f8c8f631f6f83c859 Many things, like texture wrap modes and min/mag filters are common. Some others, like annisotropy and lod settings, are not. nv30, nv40: partially non-trivially unify nv[34]0_fragtex.c 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T14:07:17Z urn:sha1:5bb68e5d174afa7a177c5e972fa80bf66e37f6ab The bulk files cannot be unified, but the frontend can and allows to share some code and simplify state_emit.c nv30, nv40: unify nv[34]0_context.c 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T13:40:32Z urn:sha1:da5103c3b382ca08368a19a195a24278596db4cb They are now almost identical, except for nv30 vs nv40 fragtex initialization. nv30, nv40: fully unify nv[34]0_context.h 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T13:38:04Z urn:sha1:6992be543383ba0850bd813153def24ab4e28911 Move the remaining content to the common header. nv30, nv40: non-trivially unify nv[34]0_screen.c 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T13:31:27Z urn:sha1:10f464fc1073e8f3b53dbcf2209a2204f4924094 The files have the same structure but are substantially different. They are unified with appropriate conditionals. nv30, nv40: non-trivially unify nv[34]0_vertprog.c 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T12:33:48Z urn:sha1:840c36f5e6d940343a3154af7e76fec341ca46e6 vertprog.c is similar but has substantial differences: 1. nv40 supports clip planes 2. nv40 uses a more advanced register allocator 3. Some register setup is different 4. Constants with the same name have different values This patch unifies the two files. nv30 gains clip plane support and the nv40 register allocator. A new NVFX_VP(x) macro is introduced that at runtime resolved to either the nv30 or the nv40 constant value. nv30 clip planes are not tested and might not work nv30, nv40: partially unify nv[34]0_state.c 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T11:39:21Z urn:sha1:c65a8f3ed2ab1650df38a3ed32d1e91e84b50520 state.c is identical except for: 1. Sampler state creation is different 2. nv40 swtnl support 3. Separate blend equations on nv40 This patch unifies nv[34]0_state.c, except the sampler state creation code. nv30, nv40: unify nv[34]0_vbo.c 2010-03-15T04:03:03Z Luca Barbieri luca@luca-barbieri.com 2010-02-21T10:12:08Z urn:sha1:6e1d0fc5eba8cda4f4c8f3188f53fec6d2d2e9c3 The files are identical, except for swtnl support which is commented out on nv30 and restart being initialized on nv30 to avoid a compiler warning.