I'm not, in principle, opposed to merging st/nine into the tree. I've reviewed all the patches that I'm qualified to review (which is the vast minority of them -- 3 total), and I have outstanding feedback on one of them (the atomic stuff).
I've asked Axel to provide a sample program which could be used as the basis of a set of piglit tests that target d3d9 directly (a stand-alone linux program that draws a single triangle). This removes the dependency on wine (which, at present, has no intention on merging their patches). This will allow me (and other developers) to verify any changes we make to st/nine as API's change/etc without having to worry about futzing with wine to test things out. Cheers, -ilia On Mon, Nov 17, 2014 at 11:02 AM, Axel Davy <axel.d...@ens.fr> wrote: > Sorry, patch 4 is too big the mailing list. > > The entire serie can be found here: > https://github.com/iXit/Mesa-3D/commits/for-upstream-5 > > On 17/11/2014 16:58, Axel Davy wrote : > >> Hi, >> >> Here is last (4th) iteration of Gallium Nine patches. >> >> We have integrated the new feedback we have got and hope >> the status of the serie is good enough now for merge. >> >> >> Thanks, >> >> Axel Davy >> >> Axel Davy (2): >> nine: Add drirc options (v2) >> nine: Implement threadpool >> >> Christoph Bumiller (5): >> tgsi/ureg: add ureg_UARL shortcut (v2) >> winsys/sw/wrapper: implement is_displaytarget_format_supported for >> swrast >> gallium/auxiliary: implement sw_probe_wrapped (v2) >> gallium/auxiliary: add inc and dec alternative with return (v2) >> gallium/auxiliary: add contained and rect checks (v6) >> >> Joakim Sindholt (1): >> nine: Add state tracker nine for Direct3D9 (v3) >> >> configure.ac | 37 + >> include/D3D9/d3d9.h | 1858 +++++++++++ >> include/D3D9/d3d9caps.h | 387 +++ >> include/D3D9/d3d9types.h | 1797 ++++++++++ >> include/d3dadapter/d3dadapter9.h | 101 + >> include/d3dadapter/drm.h | 44 + >> include/d3dadapter/present.h | 136 + >> src/gallium/Automake.inc | 3 +- >> src/gallium/Makefile.am | 4 + >> src/gallium/auxiliary/pipe-loader/pipe_loader.h | 11 + >> src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 23 + >> .../auxiliary/target-helpers/inline_sw_helper.h | 28 + >> src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h | 1 + >> src/gallium/auxiliary/util/u_atomic.h | 78 + >> src/gallium/auxiliary/util/u_box.h | 118 + >> src/gallium/auxiliary/util/u_rect.h | 18 + >> src/gallium/state_trackers/nine/Makefile.am | 13 + >> src/gallium/state_trackers/nine/Makefile.sources | 73 + >> src/gallium/state_trackers/nine/README | 78 + >> src/gallium/state_trackers/nine/adapter9.c | 1091 ++++++ >> src/gallium/state_trackers/nine/adapter9.h | 139 + >> .../state_trackers/nine/authenticatedchannel9.c | 78 + >> .../state_trackers/nine/authenticatedchannel9.h | 65 + >> src/gallium/state_trackers/nine/basetexture9.c | 504 +++ >> src/gallium/state_trackers/nine/basetexture9.h | 138 + >> src/gallium/state_trackers/nine/cryptosession9.c | 115 + >> src/gallium/state_trackers/nine/cryptosession9.h | 86 + >> src/gallium/state_trackers/nine/cubetexture9.c | 274 ++ >> src/gallium/state_trackers/nine/cubetexture9.h | 79 + >> src/gallium/state_trackers/nine/device9.c | 3458 >> ++++++++++++++++++++ >> src/gallium/state_trackers/nine/device9.h | 801 +++++ >> src/gallium/state_trackers/nine/device9ex.c | 400 +++ >> src/gallium/state_trackers/nine/device9ex.h | 149 + >> src/gallium/state_trackers/nine/device9video.c | 62 + >> src/gallium/state_trackers/nine/device9video.h | 57 + >> src/gallium/state_trackers/nine/guid.c | 66 + >> src/gallium/state_trackers/nine/guid.h | 36 + >> src/gallium/state_trackers/nine/indexbuffer9.c | 218 ++ >> src/gallium/state_trackers/nine/indexbuffer9.h | 88 + >> src/gallium/state_trackers/nine/iunknown.c | 126 + >> src/gallium/state_trackers/nine/iunknown.h | 153 + >> src/gallium/state_trackers/nine/nine_debug.c | 104 + >> src/gallium/state_trackers/nine/nine_debug.h | 135 + >> src/gallium/state_trackers/nine/nine_defines.h | 55 + >> src/gallium/state_trackers/nine/nine_dump.c | 813 +++++ >> src/gallium/state_trackers/nine/nine_dump.h | 52 + >> src/gallium/state_trackers/nine/nine_ff.c | 2257 +++++++++++++ >> src/gallium/state_trackers/nine/nine_ff.h | 32 + >> src/gallium/state_trackers/nine/nine_helpers.c | 100 + >> src/gallium/state_trackers/nine/nine_helpers.h | 176 + >> src/gallium/state_trackers/nine/nine_lock.c | 3319 >> +++++++++++++++++++ >> src/gallium/state_trackers/nine/nine_lock.h | 51 + >> src/gallium/state_trackers/nine/nine_pdata.h | 45 + >> src/gallium/state_trackers/nine/nine_pipe.c | 410 +++ >> src/gallium/state_trackers/nine/nine_pipe.h | 568 ++++ >> src/gallium/state_trackers/nine/nine_quirk.c | 49 + >> src/gallium/state_trackers/nine/nine_quirk.h | 36 + >> src/gallium/state_trackers/nine/nine_shader.c | 2959 >> +++++++++++++++++ >> src/gallium/state_trackers/nine/nine_shader.h | 142 + >> src/gallium/state_trackers/nine/nine_state.c | 1489 +++++++++ >> src/gallium/state_trackers/nine/nine_state.h | 234 ++ >> .../state_trackers/nine/nineexoverlayextension.c | 46 + >> .../state_trackers/nine/nineexoverlayextension.h | 49 + >> src/gallium/state_trackers/nine/pixelshader9.c | 172 + >> src/gallium/state_trackers/nine/pixelshader9.h | 82 + >> src/gallium/state_trackers/nine/query9.c | 358 ++ >> src/gallium/state_trackers/nine/query9.h | 83 + >> src/gallium/state_trackers/nine/resource9.c | 230 ++ >> src/gallium/state_trackers/nine/resource9.h | 107 + >> src/gallium/state_trackers/nine/stateblock9.c | 533 +++ >> src/gallium/state_trackers/nine/stateblock9.h | 71 + >> src/gallium/state_trackers/nine/surface9.c | 711 ++++ >> src/gallium/state_trackers/nine/surface9.h | 181 + >> src/gallium/state_trackers/nine/swapchain9.c | 944 ++++++ >> src/gallium/state_trackers/nine/swapchain9.h | 142 + >> src/gallium/state_trackers/nine/swapchain9ex.c | 113 + >> src/gallium/state_trackers/nine/swapchain9ex.h | 61 + >> src/gallium/state_trackers/nine/texture9.c | 342 ++ >> src/gallium/state_trackers/nine/texture9.h | 75 + >> src/gallium/state_trackers/nine/threadpool.c | 183 ++ >> src/gallium/state_trackers/nine/threadpool.h | 55 + >> src/gallium/state_trackers/nine/vertexbuffer9.c | 223 ++ >> src/gallium/state_trackers/nine/vertexbuffer9.h | 76 + >> .../state_trackers/nine/vertexdeclaration9.c | 518 +++ >> .../state_trackers/nine/vertexdeclaration9.h | 89 + >> src/gallium/state_trackers/nine/vertexshader9.c | 177 + >> src/gallium/state_trackers/nine/vertexshader9.h | 89 + >> src/gallium/state_trackers/nine/volume9.c | 604 ++++ >> src/gallium/state_trackers/nine/volume9.h | 141 + >> src/gallium/state_trackers/nine/volumetexture9.c | 253 ++ >> src/gallium/state_trackers/nine/volumetexture9.h | 75 + >> src/gallium/targets/d3dadapter9/Makefile.am | 132 + >> src/gallium/targets/d3dadapter9/d3d.pc.in | 11 + >> src/gallium/targets/d3dadapter9/d3dadapter9.sym | 6 + >> src/gallium/targets/d3dadapter9/drm.c | 376 +++ >> src/gallium/targets/d3dadapter9/getproc.c | 47 + >> src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c | 14 + >> src/mesa/drivers/dri/common/xmlpool/t_options.h | 18 + >> 98 files changed, 33403 insertions(+), 1 deletion(-) >> create mode 100644 include/D3D9/d3d9.h >> create mode 100644 include/D3D9/d3d9caps.h >> create mode 100644 include/D3D9/d3d9types.h >> create mode 100644 include/d3dadapter/d3dadapter9.h >> create mode 100644 include/d3dadapter/drm.h >> create mode 100644 include/d3dadapter/present.h >> create mode 100644 src/gallium/state_trackers/nine/Makefile.am >> create mode 100644 src/gallium/state_trackers/nine/Makefile.sources >> create mode 100644 src/gallium/state_trackers/nine/README >> create mode 100644 src/gallium/state_trackers/nine/adapter9.c >> create mode 100644 src/gallium/state_trackers/nine/adapter9.h >> create mode 100644 >> src/gallium/state_trackers/nine/authenticatedchannel9.c >> create mode 100644 >> src/gallium/state_trackers/nine/authenticatedchannel9.h >> create mode 100644 src/gallium/state_trackers/nine/basetexture9.c >> create mode 100644 src/gallium/state_trackers/nine/basetexture9.h >> create mode 100644 src/gallium/state_trackers/nine/cryptosession9.c >> create mode 100644 src/gallium/state_trackers/nine/cryptosession9.h >> create mode 100644 src/gallium/state_trackers/nine/cubetexture9.c >> create mode 100644 src/gallium/state_trackers/nine/cubetexture9.h >> create mode 100644 src/gallium/state_trackers/nine/device9.c >> create mode 100644 src/gallium/state_trackers/nine/device9.h >> create mode 100644 src/gallium/state_trackers/nine/device9ex.c >> create mode 100644 src/gallium/state_trackers/nine/device9ex.h >> create mode 100644 src/gallium/state_trackers/nine/device9video.c >> create mode 100644 src/gallium/state_trackers/nine/device9video.h >> create mode 100644 src/gallium/state_trackers/nine/guid.c >> create mode 100644 src/gallium/state_trackers/nine/guid.h >> create mode 100644 src/gallium/state_trackers/nine/indexbuffer9.c >> create mode 100644 src/gallium/state_trackers/nine/indexbuffer9.h >> create mode 100644 src/gallium/state_trackers/nine/iunknown.c >> create mode 100644 src/gallium/state_trackers/nine/iunknown.h >> create mode 100644 src/gallium/state_trackers/nine/nine_debug.c >> create mode 100644 src/gallium/state_trackers/nine/nine_debug.h >> create mode 100644 src/gallium/state_trackers/nine/nine_defines.h >> create mode 100644 src/gallium/state_trackers/nine/nine_dump.c >> create mode 100644 src/gallium/state_trackers/nine/nine_dump.h >> create mode 100644 src/gallium/state_trackers/nine/nine_ff.c >> create mode 100644 src/gallium/state_trackers/nine/nine_ff.h >> create mode 100644 src/gallium/state_trackers/nine/nine_helpers.c >> create mode 100644 src/gallium/state_trackers/nine/nine_helpers.h >> create mode 100644 src/gallium/state_trackers/nine/nine_lock.c >> create mode 100644 src/gallium/state_trackers/nine/nine_lock.h >> create mode 100644 src/gallium/state_trackers/nine/nine_pdata.h >> create mode 100644 src/gallium/state_trackers/nine/nine_pipe.c >> create mode 100644 src/gallium/state_trackers/nine/nine_pipe.h >> create mode 100644 src/gallium/state_trackers/nine/nine_quirk.c >> create mode 100644 src/gallium/state_trackers/nine/nine_quirk.h >> create mode 100644 src/gallium/state_trackers/nine/nine_shader.c >> create mode 100644 src/gallium/state_trackers/nine/nine_shader.h >> create mode 100644 src/gallium/state_trackers/nine/nine_state.c >> create mode 100644 src/gallium/state_trackers/nine/nine_state.h >> create mode 100644 >> src/gallium/state_trackers/nine/nineexoverlayextension.c >> create mode 100644 >> src/gallium/state_trackers/nine/nineexoverlayextension.h >> create mode 100644 src/gallium/state_trackers/nine/pixelshader9.c >> create mode 100644 src/gallium/state_trackers/nine/pixelshader9.h >> create mode 100644 src/gallium/state_trackers/nine/query9.c >> create mode 100644 src/gallium/state_trackers/nine/query9.h >> create mode 100644 src/gallium/state_trackers/nine/resource9.c >> create mode 100644 src/gallium/state_trackers/nine/resource9.h >> create mode 100644 src/gallium/state_trackers/nine/stateblock9.c >> create mode 100644 src/gallium/state_trackers/nine/stateblock9.h >> create mode 100644 src/gallium/state_trackers/nine/surface9.c >> create mode 100644 src/gallium/state_trackers/nine/surface9.h >> create mode 100644 src/gallium/state_trackers/nine/swapchain9.c >> create mode 100644 src/gallium/state_trackers/nine/swapchain9.h >> create mode 100644 src/gallium/state_trackers/nine/swapchain9ex.c >> create mode 100644 src/gallium/state_trackers/nine/swapchain9ex.h >> create mode 100644 src/gallium/state_trackers/nine/texture9.c >> create mode 100644 src/gallium/state_trackers/nine/texture9.h >> create mode 100644 src/gallium/state_trackers/nine/threadpool.c >> create mode 100644 src/gallium/state_trackers/nine/threadpool.h >> create mode 100644 src/gallium/state_trackers/nine/vertexbuffer9.c >> create mode 100644 src/gallium/state_trackers/nine/vertexbuffer9.h >> create mode 100644 src/gallium/state_trackers/nine/vertexdeclaration9.c >> create mode 100644 src/gallium/state_trackers/nine/vertexdeclaration9.h >> create mode 100644 src/gallium/state_trackers/nine/vertexshader9.c >> create mode 100644 src/gallium/state_trackers/nine/vertexshader9.h >> create mode 100644 src/gallium/state_trackers/nine/volume9.c >> create mode 100644 src/gallium/state_trackers/nine/volume9.h >> create mode 100644 src/gallium/state_trackers/nine/volumetexture9.c >> create mode 100644 src/gallium/state_trackers/nine/volumetexture9.h >> create mode 100644 src/gallium/targets/d3dadapter9/Makefile.am >> create mode 100644 src/gallium/targets/d3dadapter9/d3d.pc.in >> create mode 100644 src/gallium/targets/d3dadapter9/d3dadapter9.sym >> create mode 100644 src/gallium/targets/d3dadapter9/drm.c >> create mode 100644 src/gallium/targets/d3dadapter9/getproc.c >> > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
