Move nv30, nv50 and nvc0 to nouveau.

It is planned to ship openSUSE 13.1 with -shared libs.
nouveau.la, nv30.la, nv50.la and nvc0.la are currently LIBADDs in all nouveau
related targets.
This change makes it possible to easily build one shared libnouveau.so which is
then LIBADDed.
Also dlopen will be faster for one library instead of three and build time on
-jX will be reduced.

Whitespace fixes were requested by 'git am'.

Signed-off-by: Johannes Obermayr <johannesobermayr@gmx.de>
Acked-by: Christoph Bumiller <christoph.bumiller@speed.at>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>

configure.ac

@@ -1796,7 +1796,7 @@ if test "x$with_gallium_drivers" != x; then
             HAVE_GALLIUM_NOUVEAU=yes
             PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
             gallium_require_drm_loader
-            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv30 nv50 nvc0"
+            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau"
             gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "" "xvmc-nouveau" "vdpau-nouveau"
             ;;
         xfreedreno)
@@ -1996,9 +1996,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/drivers/ilo/Makefile
 		src/gallium/drivers/llvmpipe/Makefile
 		src/gallium/drivers/nouveau/Makefile
-		src/gallium/drivers/nv30/Makefile
-		src/gallium/drivers/nv50/Makefile
-		src/gallium/drivers/nvc0/Makefile
 		src/gallium/drivers/r300/Makefile
 		src/gallium/drivers/r600/Makefile
 		src/gallium/drivers/radeon/Makefile

src/gallium/Android.mk

@@ -48,10 +48,7 @@ endif
 ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
 SUBDIRS += \
 	winsys/nouveau/drm \
-	drivers/nouveau \
-	drivers/nvfx \
-	drivers/nv50 \
-	drivers/nvc0
+	drivers/nouveau
 endif
 
 # r300g/r600g/radeonsi

src/gallium/drivers/Makefile.am

@@ -86,7 +86,7 @@ endif
 
 if HAVE_GALLIUM_NOUVEAU
 
-SUBDIRS += nouveau nv30 nv50 nvc0
+SUBDIRS += nouveau
 
 endif
 

src/gallium/drivers/nouveau/Android.mk

@@ -28,7 +28,13 @@ include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(C_SOURCES)
+LOCAL_SRC_FILES := $(C_SOURCES) \
+	$(NV30_C_SOURCES) \
+	$(NV50_CODEGEN_SOURCES) \
+	$(NV50_C_SOURES) \
+	$(NVC0_CODEGEN_SOURCES) \
+	$(NVC0_C_SOURCES)
+
 LOCAL_C_INCLUDES := $(DRM_TOP) \
 	$(DRM_TOP)/include/drm \
 	$(DRM_TOP)/nouveau

src/gallium/drivers/nouveau/Makefile.am

@@ -27,9 +27,15 @@ noinst_LTLIBRARIES = libnouveau.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gallium/drivers/nouveau/include \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/include \
 	$(GALLIUM_CFLAGS) \
-	$(LIBDRM_CFLAGS)
+	$(LIBDRM_CFLAGS) \
+	$(NOUVEAU_CFLAGS) \
+	$(VISIBILITY_CFLAGS)
 
-libnouveau_la_SOURCES = $(C_SOURCES)
+libnouveau_la_SOURCES = \
+	$(C_SOURCES) \
+	$(NV30_C_SOURCES) \
+	$(NV50_CODEGEN_SOURCES) \
+	$(NV50_C_SOURCES) \
+	$(NVC0_CODEGEN_SOURCES) \
+	$(NVC0_C_SOURCES)

src/gallium/drivers/nouveau/Makefile.sources

@@ -8,3 +8,94 @@ C_SOURCES := \
 	nouveau_vp3_video.c \
 	nouveau_vp3_video_bsp.c \
 	nouveau_vp3_video_vp.c
+
+NV30_C_SOURCES := \
+	nv30/nv30_screen.c \
+	nv30/nv30_context.c \
+	nv30/nv30_format.c \
+	nv30/nv30_resource.c \
+	nv30/nv30_transfer.c \
+	nv30/nv30_miptree.c \
+	nv30/nv30_state.c \
+	nv30/nv30_state_validate.c \
+	nv30/nv30_texture.c \
+	nv30/nv30_fragtex.c \
+	nv30/nv40_verttex.c \
+	nv30/nv30_fragprog.c \
+	nv30/nv30_vertprog.c \
+	nv30/nv30_clear.c \
+	nv30/nv30_vbo.c \
+	nv30/nv30_push.c \
+	nv30/nv30_draw.c \
+	nv30/nv30_query.c \
+	nv30/nvfx_vertprog.c \
+	nv30/nvfx_fragprog.c
+
+NV50_C_SOURCES := \
+	nv50/nv50_context.c \
+	nv50/nv50_formats.c \
+	nv50/nv50_miptree.c \
+	nv50/nv50_resource.c \
+	nv50/nv50_screen.c \
+	nv50/nv50_state.c \
+	nv50/nv50_state_validate.c \
+	nv50/nv50_surface.c \
+	nv50/nv50_tex.c \
+	nv50/nv50_transfer.c \
+	nv50/nv50_vbo.c \
+	nv50/nv50_program.c \
+	nv50/nv50_shader_state.c \
+	nv50/nv50_push.c \
+	nv50/nv50_query.c \
+	nv50/nv84_video.c \
+	nv50/nv84_video_bsp.c \
+	nv50/nv84_video_vp.c \
+	nv50/nv98_video.c \
+	nv50/nv98_video_bsp.c \
+	nv50/nv98_video_vp.c \
+	nv50/nv98_video_ppp.c
+
+NV50_CODEGEN_SOURCES := \
+	codegen/nv50_ir.cpp \
+	codegen/nv50_ir_bb.cpp \
+	codegen/nv50_ir_build_util.cpp \
+	codegen/nv50_ir_emit_nv50.cpp \
+	codegen/nv50_ir_from_tgsi.cpp \
+	codegen/nv50_ir_graph.cpp \
+	codegen/nv50_ir_lowering_nv50.cpp \
+	codegen/nv50_ir_peephole.cpp \
+	codegen/nv50_ir_print.cpp \
+	codegen/nv50_ir_ra.cpp \
+	codegen/nv50_ir_ssa.cpp \
+	codegen/nv50_ir_target.cpp \
+	codegen/nv50_ir_target_nv50.cpp \
+	codegen/nv50_ir_util.cpp
+
+NVC0_CODEGEN_SOURCES := \
+	codegen/nv50_ir_emit_gk110.cpp \
+	codegen/nv50_ir_emit_nvc0.cpp \
+	codegen/nv50_ir_lowering_nvc0.cpp \
+	codegen/nv50_ir_target_nvc0.cpp
+
+NVC0_C_SOURCES := \
+	nvc0/nvc0_compute.c \
+	nvc0/nvc0_context.c \
+	nvc0/nvc0_formats.c \
+	nvc0/nvc0_miptree.c \
+	nvc0/nvc0_resource.c \
+	nvc0/nvc0_screen.c \
+	nvc0/nvc0_state.c \
+	nvc0/nvc0_state_validate.c \
+	nvc0/nvc0_surface.c \
+	nvc0/nvc0_tex.c \
+	nvc0/nvc0_transfer.c \
+	nvc0/nvc0_vbo.c \
+	nvc0/nvc0_vbo_translate.c \
+	nvc0/nvc0_program.c \
+	nvc0/nvc0_shader_state.c \
+	nvc0/nvc0_query.c \
+	nvc0/nve4_compute.c \
+	nvc0/nvc0_video.c \
+	nvc0/nvc0_video_bsp.c \
+	nvc0/nvc0_video_vp.c \
+	nvc0/nvc0_video_ppp.c

src/gallium/drivers/nv50/codegen/nv50_ir.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir.cpp

@@ -20,9 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
-#include "nv50_ir_target.h"
-#include "nv50_ir_driver.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_target.h"
+#include "codegen/nv50_ir_driver.h"
 
 extern "C" {
 #include "nv50/nv50_program.h"
@@ -1131,7 +1131,7 @@ nv50_ir_init_prog_info(struct nv50_ir_prog_info *info)
    info->io.sampleMask = 0xff;
    info->io.backFaceColor[0] = info->io.backFaceColor[1] = 0xff;
 }
-   
+
 int
 nv50_ir_generate_code(struct nv50_ir_prog_info *info)
 {

src/gallium/drivers/nv50/codegen/nv50_ir.h → src/gallium/drivers/nouveau/codegen/nv50_ir.h

@@ -30,10 +30,10 @@
 #include <list>
 #include <vector>
 
-#include "nv50_ir_util.h"
-#include "nv50_ir_graph.h"
+#include "codegen/nv50_ir_util.h"
+#include "codegen/nv50_ir_graph.h"
 
-#include "nv50_ir_driver.h"
+#include "codegen/nv50_ir_driver.h"
 
 namespace nv50_ir {
 
@@ -1190,7 +1190,7 @@ protected:
 
 // =============================================================================
 
-#include "nv50_ir_inlines.h"
+#include "codegen/nv50_ir_inlines.h"
 
 } // namespace nv50_ir
 

src/gallium/drivers/nv50/codegen/nv50_ir_bb.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
+#include "codegen/nv50_ir.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nv50/codegen/nv50_ir_build_util.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_build_util.cpp

@@ -20,8 +20,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
-#include "nv50_ir_build_util.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_build_util.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir_target_nvc0.h"
+#include "codegen/nv50_ir_target_nvc0.h"
 
 // CodeEmitter for GK110 encoding of the Fermi/Kepler ISA.
 

src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp

@@ -20,8 +20,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
-#include "nv50_ir_target_nv50.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_target_nv50.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir_target_nvc0.h"
+#include "codegen/nv50_ir_target_nvc0.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp

@@ -28,9 +28,9 @@ extern "C" {
 
 #include <set>
 
-#include "nv50_ir.h"
-#include "nv50_ir_util.h"
-#include "nv50_ir_build_util.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_util.h"
+#include "codegen/nv50_ir_build_util.h"
 
 namespace tgsi {
 
@@ -382,7 +382,7 @@ static nv50_ir::TexTarget translateTexture(uint tex)
       return nv50_ir::TEX_TARGET_2D;
    }
 }
-   
+
 nv50_ir::DataType Instruction::inferSrcType() const
 {
    switch (getOpcode()) {
@@ -490,7 +490,7 @@ nv50_ir::CondCode Instruction::getSetCond() const
 }
 
 #define NV50_IR_OPCODE_CASE(a, b) case TGSI_OPCODE_##a: return nv50_ir::OP_##b
-   
+
 static nv50_ir::operation translateOpcode(uint opcode)
 {
    switch (opcode) {
@@ -2151,7 +2151,7 @@ Converter::handleInstruction(const struct tgsi_full_instruction *insn)
          src1 = fetchSrc(1, c);
          src2 = fetchSrc(2, c);
          mkOp3(op, dstTy, dst0[c], src0, src1, src2);
-      }      
+      }
       break;
    case TGSI_OPCODE_MOV:
    case TGSI_OPCODE_ABS:

src/gallium/drivers/nv50/codegen/nv50_ir_graph.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp

@@ -20,11 +20,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir_graph.h"
+#include "codegen/nv50_ir_graph.h"
 #include <limits>
 #include <list>
 #include <stack>
-#include "nv50_ir.h"
+#include "codegen/nv50_ir.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nv50/codegen/nv50_ir_graph.h → src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h

@@ -23,7 +23,7 @@
 #ifndef __NV50_IR_GRAPH_H__
 #define __NV50_IR_GRAPH_H__
 
-#include "nv50_ir_util.h"
+#include "codegen/nv50_ir_util.h"
 #include <vector>
 
 namespace nv50_ir {

src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp

@@ -20,10 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50/codegen/nv50_ir.h"
-#include "nv50/codegen/nv50_ir_build_util.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_build_util.h"
 
-#include "nv50_ir_target_nv50.h"
+#include "codegen/nv50_ir_target_nv50.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp

@@ -20,10 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50/codegen/nv50_ir.h"
-#include "nv50/codegen/nv50_ir_build_util.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_build_util.h"
 
-#include "nv50_ir_target_nvc0.h"
+#include "codegen/nv50_ir_target_nvc0.h"
 
 #include <limits>
 

src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp

@@ -20,9 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
-#include "nv50_ir_target.h"
-#include "nv50_ir_build_util.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_target.h"
+#include "codegen/nv50_ir_build_util.h"
 
 extern "C" {
 #include "util/u_math.h"

src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp

@@ -20,8 +20,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
-#include "nv50_ir_target.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_target.h"
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>

src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp

@@ -20,8 +20,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
-#include "nv50_ir_target.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_target.h"
 
 #include <stack>
 #include <limits>

src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_ssa.cpp

@@ -20,8 +20,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir.h"
-#include "nv50_ir_target.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_target.h"
 
 namespace nv50_ir {
 
@@ -34,7 +34,7 @@ class DominatorTree : public Graph
 public:
    DominatorTree(Graph *cfg);
    ~DominatorTree() { }
-   
+
    bool dominates(BasicBlock *, BasicBlock *);
 
    void findDominanceFrontiers();

src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_target.cpp

@@ -20,8 +20,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50/codegen/nv50_ir.h"
-#include "nv50/codegen/nv50_ir_target.h"
+#include "codegen/nv50_ir.h"
+#include "codegen/nv50_ir_target.h"
 
 namespace nv50_ir {
 
@@ -437,7 +437,7 @@ RelocEntry::apply(uint32_t *binary, const RelocInfo *info) const
 } // namespace nv50_ir
 
 
-#include "nv50/codegen/nv50_ir_driver.h"
+#include "codegen/nv50_ir_driver.h"
 
 extern "C" {
 

src/gallium/drivers/nv50/codegen/nv50_ir_target.h → src/gallium/drivers/nouveau/codegen/nv50_ir_target.h

@@ -23,7 +23,7 @@
 #ifndef __NV50_IR_TARGET_H__
 #define __NV50_IR_TARGET_H__
 
-#include "nv50_ir.h"
+#include "codegen/nv50_ir.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir_target_nv50.h"
+#include "codegen/nv50_ir_target_nv50.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nv50/codegen/nv50_ir_target_nv50.h → src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.h

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50/codegen/nv50_ir_target.h"
+#include "codegen/nv50_ir_target.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir_target_nvc0.h"
+#include "codegen/nv50_ir_target_nvc0.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.h → src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.h

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50/codegen/nv50_ir_target.h"
+#include "codegen/nv50_ir_target.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nv50/codegen/nv50_ir_util.cpp → src/gallium/drivers/nouveau/codegen/nv50_ir_util.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_ir_util.h"
+#include "codegen/nv50_ir_util.h"
 
 namespace nv50_ir {
 

src/gallium/drivers/nv50/codegen/nv50_ir_util.h → src/gallium/drivers/nouveau/codegen/nv50_ir_util.h

@@ -244,7 +244,7 @@ public:
 
       Item() { memset(&u, 0, sizeof(u)); }
    };
-   
+
    Stack() : size(0), limit(0), array(0) { }
    ~Stack() { if (array) FREE(array); }
 

src/gallium/drivers/nvc0/codegen/target_lib_nvc0.asm.h → src/gallium/drivers/nouveau/codegen/target_lib_nvc0.asm.h

@@ -110,4 +110,3 @@ static const uint16_t nvc0_builtin_offsets[NVC0_BUILTIN_COUNT] =
    0x0180,
    0x0188
 };
-

src/gallium/drivers/nvc0/codegen/target_lib_nve4.asm.h → src/gallium/drivers/nouveau/codegen/target_lib_nve4.asm.h

@@ -590,4 +590,3 @@ static const uint16_t nve4_builtin_offsets[NVC0_BUILTIN_COUNT] =
    0x0f08,
    0x0f18,
 };
-

src/gallium/drivers/nouveau/nouveau_mm.c

@@ -296,4 +296,3 @@ nouveau_mm_destroy(struct nouveau_mman *cache)
 
    FREE(cache);
 }
-

src/gallium/drivers/nouveau/nouveau_screen.c

@@ -85,7 +85,7 @@ nouveau_screen_bo_from_handle(struct pipe_screen *pscreen,
 	struct nouveau_device *dev = nouveau_screen(pscreen)->device;
 	struct nouveau_bo *bo = 0;
 	int ret;
- 
+
 	ret = nouveau_bo_name_ref(dev, whandle->handle, &bo);
 	if (ret) {
 		debug_printf("%s: ref name 0x%08x failed with %d\n",
@@ -106,7 +106,7 @@ nouveau_screen_bo_get_handle(struct pipe_screen *pscreen,
 {
 	whandle->stride = stride;
 
-	if (whandle->type == DRM_API_HANDLE_TYPE_SHARED) { 
+	if (whandle->type == DRM_API_HANDLE_TYPE_SHARED) {
 		return nouveau_bo_name_get(bo, &whandle->handle) == 0;
 	} else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) {
 		whandle->handle = bo->handle;

src/gallium/drivers/nouveau/nouveau_video.c

@@ -27,7 +27,7 @@
 #include "nouveau_context.h"
 #include "nouveau_video.h"
 
-#include "nouveau/nouveau_buffer.h"
+#include "nouveau_buffer.h"
 #include "util/u_video.h"
 #include "util/u_format.h"
 #include "util/u_sampler.h"

src/gallium/drivers/nv30/nv30_clear.c → src/gallium/drivers/nouveau/nv30/nv30_clear.c

@@ -26,11 +26,11 @@
 #include "pipe/p_defines.h"
 #include "util/u_pack_color.h"
 
-#include "nouveau/nouveau_gldefs.h"
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_format.h"
+#include "nouveau_gldefs.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_format.h"
 
 static INLINE uint32_t
 pack_rgba(enum pipe_format format, const float *rgba)

src/gallium/drivers/nv30/nv30_context.c → src/gallium/drivers/nouveau/nv30/nv30_context.c

@@ -25,13 +25,13 @@
 
 #include "draw/draw_context.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
 
-#include "nouveau/nouveau_fence.h"
-#include "nv30_context.h"
-#include "nv30_transfer.h"
-#include "nv30_state.h"
+#include "nouveau_fence.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_transfer.h"
+#include "nv30/nv30_state.h"
 
 static void
 nv30_context_kick_notify(struct nouveau_pushbuf *push)

src/gallium/drivers/nv30/nv30_context.h → src/gallium/drivers/nouveau/nv30/nv30_context.h

@@ -4,10 +4,10 @@
 #include "pipe/p_format.h"
 #include "util/u_blitter.h"
 
-#include "nv30_screen.h"
-#include "nv30_state.h"
+#include "nv30/nv30_screen.h"
+#include "nv30/nv30_state.h"
 
-#include "nouveau/nouveau_context.h"
+#include "nouveau_context.h"
 
 #define BUFCTX_FB          0
 #define BUFCTX_VTXTMP      1

src/gallium/drivers/nv30/nv30_draw.c → src/gallium/drivers/nouveau/nv30/nv30_draw.c

@@ -29,10 +29,10 @@
 #include "draw/draw_vbuf.h"
 #include "draw/draw_private.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_format.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_format.h"
 
 struct nv30_render {
    struct vbuf_render base;

src/gallium/drivers/nv30/nv30_format.c → src/gallium/drivers/nouveau/nv30/nv30_format.c

@@ -23,9 +23,9 @@
  *
  */
 
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_format.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_format.h"
 
 #define NV30_3D_RT_FORMAT_COLOR_X1R5G5B5 2
 

src/gallium/drivers/nv30/nv30_fragprog.c → src/gallium/drivers/nouveau/nv30/nv30_fragprog.c

@@ -25,10 +25,10 @@
 
 #include "tgsi/tgsi_parse.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nvfx_shader.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nvfx_shader.h"
 
 static void
 nv30_fragprog_upload(struct nv30_context *nv30)

src/gallium/drivers/nv30/nv30_fragtex.c → src/gallium/drivers/nouveau/nv30/nv30_fragtex.c

@@ -25,10 +25,10 @@
 
 #include "util/u_inlines.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_format.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_format.h"
 
 void
 nv30_fragtex_validate(struct nv30_context *nv30)

src/gallium/drivers/nv30/nv30_miptree.c → src/gallium/drivers/nouveau/nv30/nv30_miptree.c

@@ -27,11 +27,11 @@
 #include "util/u_inlines.h"
 #include "util/u_surface.h"
 
-#include "nouveau/nv_m2mf.xml.h"
-#include "nv30_screen.h"
-#include "nv30_context.h"
-#include "nv30_resource.h"
-#include "nv30_transfer.h"
+#include "nv_m2mf.xml.h"
+#include "nv30/nv30_screen.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_resource.h"
+#include "nv30/nv30_transfer.h"
 
 static INLINE unsigned
 layer_offset(struct pipe_resource *pt, unsigned level, unsigned layer)

src/gallium/drivers/nv30/nv30_push.c → src/gallium/drivers/nouveau/nv30/nv30_push.c

@@ -29,10 +29,10 @@
 #include "util/u_format.h"
 #include "translate/translate.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_resource.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_resource.h"
 
 struct push_context {
    struct nouveau_pushbuf *push;

src/gallium/drivers/nv30/nv30_query.c → src/gallium/drivers/nouveau/nv30/nv30_query.c

@@ -23,10 +23,10 @@
  *
  */
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_screen.h"
-#include "nv30_context.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_screen.h"
+#include "nv30/nv30_context.h"
 
 #define LIST_FIRST_ENTRY(__type, __item, __field) \
    LIST_ENTRY(__type, (__item)->next, __field)

src/gallium/drivers/nv30/nv30_resource.c → src/gallium/drivers/nouveau/nv30/nv30_resource.c

@@ -26,10 +26,10 @@
 #include "util/u_format.h"
 #include "util/u_inlines.h"
 
-#include "nv30_screen.h"
-#include "nv30_context.h"
-#include "nv30_resource.h"
-#include "nv30_transfer.h"
+#include "nv30/nv30_screen.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_resource.h"
+#include "nv30/nv30_transfer.h"
 
 static struct pipe_resource *
 nv30_resource_create(struct pipe_screen *pscreen,

src/gallium/drivers/nv30/nv30_resource.h → src/gallium/drivers/nouveau/nv30/nv30_resource.h

@@ -1,7 +1,7 @@
 #ifndef __NV30_RESOURCE_H__
 #define __NV30_RESOURCE_H__
 
-#include "nouveau/nouveau_buffer.h"
+#include "nouveau_buffer.h"
 
 void nv30_resource_screen_init(struct pipe_screen *);
 void nv30_resource_init(struct pipe_context *);

src/gallium/drivers/nv30/nv30_screen.c → src/gallium/drivers/nouveau/nv30/nv30_screen.c

@@ -26,16 +26,16 @@
 #include "util/u_format.h"
 #include "util/u_format_s3tc.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nouveau/nv_m2mf.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv01_2d.xml.h"
-
-#include "nouveau/nouveau_fence.h"
-#include "nv30_screen.h"
-#include "nv30_context.h"
-#include "nv30_resource.h"
-#include "nv30_format.h"
+#include "nv_object.xml.h"
+#include "nv_m2mf.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv01_2d.xml.h"
+
+#include "nouveau_fence.h"
+#include "nv30/nv30_screen.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_resource.h"
+#include "nv30/nv30_format.h"
 
 #define RANKINE_0397_CHIPSET 0x00000003
 #define RANKINE_0497_CHIPSET 0x000001e0

src/gallium/drivers/nv30/nv30_screen.h → src/gallium/drivers/nouveau/nv30/nv30_screen.h

@@ -8,11 +8,11 @@
 
 #include "util/u_double_list.h"
 
-#include "nouveau/nouveau_screen.h"
-#include "nouveau/nouveau_fence.h"
-#include "nouveau/nouveau_heap.h"
-#include "nv30_winsys.h"
-#include "nv30_resource.h"
+#include "nouveau_screen.h"
+#include "nouveau_fence.h"
+#include "nouveau_heap.h"
+#include "nv30/nv30_winsys.h"
+#include "nv30/nv30_resource.h"
 
 struct nv30_context;
 

src/gallium/drivers/nv30/nv30_state.c → src/gallium/drivers/nouveau/nv30/nv30_state.c

@@ -26,11 +26,11 @@
 #include "util/u_helpers.h"
 #include "util/u_inlines.h"
 
-#include "nouveau/nouveau_gldefs.h"
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_winsys.h"
+#include "nouveau_gldefs.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_winsys.h"
 
 #define NV40_3D_MRT_BLEND_ENABLE 0x0000036c
 

src/gallium/drivers/nv30/nv30_state_validate.c → src/gallium/drivers/nouveau/nv30/nv30_state_validate.c

@@ -27,10 +27,10 @@
 #include "util/u_math.h"
 #include "util/u_half.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_format.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_format.h"
 
 static void
 nv30_validate_fb(struct nv30_context *nv30)

src/gallium/drivers/nv30/nv30_texture.c → src/gallium/drivers/nouveau/nv30/nv30_texture.c

@@ -26,10 +26,10 @@
 #include "util/u_inlines.h"
 #include "util/u_format.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_format.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_format.h"
 
 #define NV30_3D_TEX_WRAP_S_MIRROR_REPEAT NV30_3D_TEX_WRAP_S_MIRRORED_REPEAT
 #define NV30_WRAP(n) \

src/gallium/drivers/nv30/nv30_transfer.c → src/gallium/drivers/nouveau/nv30/nv30_transfer.c

@@ -29,13 +29,13 @@
 
 #include "util/u_math.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nouveau/nv_m2mf.xml.h"
-#include "nv01_2d.xml.h"
-#include "nv30-40_3d.xml.h"
+#include "nv_object.xml.h"
+#include "nv_m2mf.xml.h"
+#include "nv30/nv01_2d.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
 
-#include "nv30_context.h"
-#include "nv30_transfer.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_transfer.h"
 
 /* Various helper functions to transfer different types of data in a number
  * of different ways.

src/gallium/drivers/nv30/nv30_vbo.c → src/gallium/drivers/nouveau/nv30/nv30_vbo.c

@@ -27,11 +27,11 @@
 #include "util/u_inlines.h"
 #include "translate/translate.h"
 
-#include "nouveau/nouveau_fence.h"
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_format.h"
+#include "nouveau_fence.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_format.h"
 
 static void
 nv30_emit_vtxattr(struct nv30_context *nv30, struct pipe_vertex_buffer *vb,

src/gallium/drivers/nv30/nv30_vertprog.c → src/gallium/drivers/nouveau/nv30/nv30_vertprog.c

@@ -26,10 +26,10 @@
 #include "util/u_dynarray.h"
 #include "tgsi/tgsi_parse.h"
 
-#include "nouveau/nv_object.xml.h"
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_state.h"
+#include "nv_object.xml.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_state.h"
 
 static void
 nv30_vertprog_destroy(struct nv30_vertprog *vp)

src/gallium/drivers/nv30/nv30_vertprog.h → src/gallium/drivers/nouveau/nv30/nv30_vertprog.h

@@ -171,6 +171,6 @@
 #define NV30_VP_SRC_REG_TYPE_INPUT  2
 #define NV30_VP_SRC_REG_TYPE_CONST  3 /* guess */
 
-#include "nvfx_shader.h"
+#include "nv30/nvfx_shader.h"
 
 #endif

src/gallium/drivers/nv30/nv30_winsys.h → src/gallium/drivers/nouveau/nv30/nv30_winsys.h

@@ -2,8 +2,8 @@
 #define __NV30_WINSYS_H__
 
 #include <string.h>
-#include "nouveau/nouveau_winsys.h"
-#include "nouveau/nouveau_buffer.h"
+#include "nouveau_winsys.h"
+#include "nouveau_buffer.h"
 
 /*XXX: rnn */
 #define NV40_3D_VTXTEX_OFFSET(i) (0x0900 + ((i) * 0x20)) // 401e80

src/gallium/drivers/nv30/nv40_vertprog.h → src/gallium/drivers/nouveau/nv30/nv40_vertprog.h

@@ -173,6 +173,6 @@
 #    define NV40_VP_SRC_REG_TYPE_INPUT                                         2
 #    define NV40_VP_SRC_REG_TYPE_CONST                                         3
 
-#include "nvfx_shader.h"
+#include "nv30/nvfx_shader.h"
 
 #endif

src/gallium/drivers/nv30/nv40_verttex.c → src/gallium/drivers/nouveau/nv30/nv40_verttex.c

@@ -24,7 +24,7 @@
  */
 
 #include "util/u_inlines.h"
-#include "nv30_context.h"
+#include "nv30/nv30_context.h"
 
 void
 nv40_verttex_validate(struct nv30_context *nv30)

src/gallium/drivers/nv30/nvfx_fragprog.c → src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c

@@ -12,9 +12,9 @@
 #include "tgsi/tgsi_dump.h"
 #include "tgsi/tgsi_ureg.h"
 
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nvfx_shader.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nvfx_shader.h"
 
 struct nvfx_fpc {
    struct nv30_fragprog *fp;

src/gallium/drivers/nv30/nvfx_vertprog.c → src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c

@@ -12,9 +12,9 @@
 
 #include "draw/draw_context.h"
 
-#include "nv30-40_3d.xml.h"
-#include "nv30_context.h"
-#include "nv30_resource.h"
+#include "nv30/nv30-40_3d.xml.h"
+#include "nv30/nv30_context.h"
+#include "nv30/nv30_resource.h"
 
 /* TODO (at least...):
  *  1. Indexed consts  + ARL
@@ -27,8 +27,8 @@
  *  4. bugs
  */
 
-#include "nv30_vertprog.h"
-#include "nv40_vertprog.h"
+#include "nv30/nv30_vertprog.h"
+#include "nv30/nv40_vertprog.h"
 
 struct nvfx_loop_entry {
    unsigned brk_target;

src/gallium/drivers/nv50/nv50_context.c → src/gallium/drivers/nouveau/nv50/nv50_context.c

@@ -27,9 +27,9 @@
 #include "draw/draw_context.h"
 #endif
 
-#include "nv50_context.h"
-#include "nv50_screen.h"
-#include "nv50_resource.h"
+#include "nv50/nv50_context.h"
+#include "nv50/nv50_screen.h"
+#include "nv50/nv50_resource.h"
 
 static void
 nv50_flush(struct pipe_context *pipe,

src/gallium/drivers/nv50/nv50_context.h → src/gallium/drivers/nouveau/nv50/nv50_context.h

@@ -14,20 +14,20 @@
 #include "draw/draw_vertex.h"
 #endif
 
-#include "nv50_debug.h"
-#include "nv50_winsys.h"
-#include "nv50_stateobj.h"
-#include "nv50_screen.h"
-#include "nv50_program.h"
-#include "nv50_resource.h"
-#include "nv50_transfer.h"
-
-#include "nouveau/nouveau_context.h"
-#include "nouveau/nv_object.xml.h"
-#include "nouveau/nv_m2mf.xml.h"
-#include "nv50_3ddefs.xml.h"
-#include "nv50_3d.xml.h"
-#include "nv50_2d.xml.h"
+#include "nv50/nv50_debug.h"
+#include "nv50/nv50_winsys.h"
+#include "nv50/nv50_stateobj.h"
+#include "nv50/nv50_screen.h"
+#include "nv50/nv50_program.h"
+#include "nv50/nv50_resource.h"
+#include "nv50/nv50_transfer.h"
+
+#include "nouveau_context.h"
+#include "nv_object.xml.h"
+#include "nv_m2mf.xml.h"
+#include "nv50/nv50_3ddefs.xml.h"
+#include "nv50/nv50_3d.xml.h"
+#include "nv50/nv50_2d.xml.h"
 
 #define NV50_NEW_BLEND        (1 << 0)
 #define NV50_NEW_RASTERIZER   (1 << 1)

src/gallium/drivers/nv50/nv50_draw.c → src/gallium/drivers/nouveau/nv50/nv50_draw.c

@@ -22,7 +22,7 @@
 
 #include "draw/draw_pipe.h"
 
-#include "nv50_context.h"
+#include "nv50/nv50_context.h"
 
 struct nv50_render_stage {
    struct draw_stage stage;

src/gallium/drivers/nv50/nv50_formats.c → src/gallium/drivers/nouveau/nv50/nv50_formats.c

@@ -21,14 +21,14 @@
  */
 
 #if NOUVEAU_DRIVER == 0xc0
-# include "nvc0_screen.h"
-# include "nvc0_3d.xml.h"
+# include "nvc0/nvc0_screen.h"
+# include "nvc0/nvc0_3d.xml.h"
 #else
-# include "nv50_screen.h"
-# include "nv50_3d.xml.h"
+# include "nv50/nv50_screen.h"
+# include "nv50/nv50_3d.xml.h"
 #endif
-#include "nv50_texture.xml.h"
-#include "nv50_defs.xml.h"
+#include "nv50/nv50_texture.xml.h"
+#include "nv50/nv50_defs.xml.h"
 
 #include "pipe/p_defines.h"
 

src/gallium/drivers/nv50/nv50_miptree.c → src/gallium/drivers/nouveau/nv50/nv50_miptree.c

@@ -25,8 +25,8 @@
 #include "util/u_inlines.h"
 #include "util/u_format.h"
 
-#include "nv50_context.h"
-#include "nv50_resource.h"
+#include "nv50/nv50_context.h"
+#include "nv50/nv50_resource.h"
 
 uint32_t
 nv50_tex_choose_tile_dims_helper(unsigned nx, unsigned ny, unsigned nz)

src/gallium/drivers/nv50/nv50_program.c → src/gallium/drivers/nouveau/nv50/nv50_program.c

@@ -20,8 +20,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_program.h"
-#include "nv50_context.h"
+#include "nv50/nv50_program.h"
+#include "nv50/nv50_context.h"
 
 #include "codegen/nv50_ir_driver.h"
 

src/gallium/drivers/nv50/nv50_push.c → src/gallium/drivers/nouveau/nv50/nv50_push.c

@@ -5,10 +5,10 @@
 #include "util/u_format.h"
 #include "translate/translate.h"
 
-#include "nv50_context.h"
-#include "nv50_resource.h"
+#include "nv50/nv50_context.h"
+#include "nv50/nv50_resource.h"
 
-#include "nv50_3d.xml.h"
+#include "nv50/nv50_3d.xml.h"
 
 struct push_context {
    struct nouveau_pushbuf *push;

src/gallium/drivers/nv50/nv50_query.c → src/gallium/drivers/nouveau/nv50/nv50_query.c

@@ -24,8 +24,8 @@
 
 #define NV50_PUSH_EXPLICIT_SPACE_CHECKING
 
-#include "nv50_context.h"
-#include "nouveau/nv_object.xml.h"
+#include "nv50/nv50_context.h"
+#include "nv_object.xml.h"
 
 /* XXX: Nested queries, and simultaneous queries on multiple gallium contexts
  * (since we use only a single GPU channel per screen) will not work properly.

src/gallium/drivers/nv50/nv50_resource.c → src/gallium/drivers/nouveau/nv50/nv50_resource.c

@@ -3,9 +3,9 @@
 #include "util/u_inlines.h"
 #include "util/u_format.h"
 
-#include "nouveau/nouveau_screen.h"
+#include "nouveau_screen.h"
 
-#include "nv50_resource.h"
+#include "nv50/nv50_resource.h"
 
 static struct pipe_resource *
 nv50_resource_create(struct pipe_screen *screen,

src/gallium/drivers/nv50/nv50_resource.h → src/gallium/drivers/nouveau/nv50/nv50_resource.h

@@ -5,8 +5,8 @@
 #include "util/u_transfer.h"
 #include "util/u_double_list.h"
 
-#include "nouveau/nouveau_winsys.h"
-#include "nouveau/nouveau_buffer.h"
+#include "nouveau_winsys.h"
+#include "nouveau_buffer.h"
 
 #ifndef __NVC0_RESOURCE_H__ /* make sure we don't use these in nvc0: */
 

src/gallium/drivers/nv50/nv50_screen.c → src/gallium/drivers/nouveau/nv50/nv50_screen.c

@@ -24,12 +24,12 @@
 #include "util/u_format_s3tc.h"
 #include "pipe/p_screen.h"
 
-#include "nv50_context.h"
-#include "nv50_screen.h"
+#include "nv50/nv50_context.h"
+#include "nv50/nv50_screen.h"
 
-#include "nouveau/nouveau_vp3_video.h"
+#include "nouveau_vp3_video.h"
 
-#include "nouveau/nv_object.xml.h"
+#include "nv_object.xml.h"
 #include <errno.h>
 
 #ifndef NOUVEAU_GETPARAM_GRAPH_UNITS
@@ -211,7 +211,7 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
    default:
       return 0;
    }
-   
+
    switch (param) {
    case PIPE_SHADER_CAP_MAX_INSTRUCTIONS:
    case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS:

src/gallium/drivers/nv50/nv50_screen.h → src/gallium/drivers/nouveau/nv50/nv50_screen.h

@@ -1,13 +1,13 @@
 #ifndef __NV50_SCREEN_H__
 #define __NV50_SCREEN_H__
 
-#include "nouveau/nouveau_screen.h"
-#include "nouveau/nouveau_fence.h"
-#include "nouveau/nouveau_mm.h"
-#include "nouveau/nouveau_heap.h"
+#include "nouveau_screen.h"
+#include "nouveau_fence.h"
+#include "nouveau_mm.h"
+#include "nouveau_heap.h"
 
-#include "nv50_winsys.h"
-#include "nv50_stateobj.h"
+#include "nv50/nv50_winsys.h"
+#include "nv50/nv50_stateobj.h"
 
 #define NV50_TIC_MAX_ENTRIES 2048
 #define NV50_TSC_MAX_ENTRIES 2048
@@ -50,7 +50,7 @@ struct nv50_screen {
       int next;
       uint32_t lock[NV50_TIC_MAX_ENTRIES / 32];
    } tic;
-   
+
    struct {
       void **entries;
       int next;

src/gallium/drivers/nv50/nv50_shader_state.c → src/gallium/drivers/nouveau/nv50/nv50_shader_state.c

@@ -26,7 +26,7 @@
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 
-#include "nv50_context.h"
+#include "nv50/nv50_context.h"
 
 void
 nv50_constbufs_validate(struct nv50_context *nv50)

src/gallium/drivers/nv50/nv50_state.c → src/gallium/drivers/nouveau/nv50/nv50_state.c

@@ -28,13 +28,13 @@
 
 #include "tgsi/tgsi_parse.h"
 
-#include "nv50_stateobj.h"
-#include "nv50_context.h"
+#include "nv50/nv50_stateobj.h"
+#include "nv50/nv50_context.h"
 
-#include "nv50_3d.xml.h"
-#include "nv50_texture.xml.h"
+#include "nv50/nv50_3d.xml.h"
+#include "nv50/nv50_texture.xml.h"
 
-#include "nouveau/nouveau_gldefs.h"
+#include "nouveau_gldefs.h"
 
 /* Caveats:
  *  ! pipe_sampler_state.normalized_coords is ignored - rectangle textures will
@@ -238,7 +238,7 @@ nv50_rasterizer_state_create(struct pipe_context *pipe,
    SB_BEGIN_3D(so, SCISSOR_ENABLE(0), 1);
    SB_DATA    (so, cso->scissor);
 #endif
-    
+
    SB_BEGIN_3D(so, SHADE_MODEL, 1);
    SB_DATA    (so, cso->flatshade ? NV50_3D_SHADE_MODEL_FLAT :
                                     NV50_3D_SHADE_MODEL_SMOOTH);
@@ -399,7 +399,7 @@ nv50_zsa_state_create(struct pipe_context *pipe,
       SB_BEGIN_3D(so, STENCIL_TWO_SIDE_ENABLE, 1);
       SB_DATA    (so, 0);
    }
-    
+
    SB_BEGIN_3D(so, ALPHA_TEST_ENABLE, 1);
    if (cso->alpha.enabled) {
       SB_DATA    (so, 1);
@@ -1076,7 +1076,7 @@ nv50_init_state_functions(struct nv50_context *nv50)
    pipe->set_vertex_sampler_views   = nv50_vp_set_sampler_views;
    pipe->set_fragment_sampler_views = nv50_fp_set_sampler_views;
    pipe->set_geometry_sampler_views = nv50_gp_set_sampler_views;
- 
+
    pipe->create_vs_state = nv50_vp_state_create;
    pipe->create_fs_state = nv50_fp_state_create;
    pipe->create_gs_state = nv50_gp_state_create;

src/gallium/drivers/nv50/nv50_state_validate.c → src/gallium/drivers/nouveau/nv50/nv50_state_validate.c

@@ -1,5 +1,5 @@
 
-#include "nv50_context.h"
+#include "nv50/nv50_context.h"
 #include "os/os_time.h"
 
 static void

src/gallium/drivers/nv50/nv50_stateobj.h → src/gallium/drivers/nouveau/nv50/nv50_stateobj.h

@@ -14,7 +14,7 @@
 
 #define SB_DATA(so, u) (so)->state[(so)->size++] = (u)
 
-#include "nv50_stateobj_tex.h"
+#include "nv50/nv50_stateobj_tex.h"
 
 struct nv50_blend_stateobj {
    struct pipe_blend_state pipe;

src/gallium/drivers/nv50/nv50_surface.c → src/gallium/drivers/nouveau/nv50/nv50_surface.c

@@ -33,11 +33,11 @@
 
 #include "os/os_thread.h"
 
-#include "nv50_context.h"
-#include "nv50_resource.h"
+#include "nv50/nv50_context.h"
+#include "nv50/nv50_resource.h"
 
-#include "nv50_defs.xml.h"
-#include "nv50_texture.xml.h"
+#include "nv50/nv50_defs.xml.h"
+#include "nv50/nv50_texture.xml.h"
 
 /* these are used in nv50_blit.h */
 #define NV50_ENG2D_SUPPORTED_FORMATS 0xff0843e080608409ULL
@@ -47,7 +47,7 @@
 #define NV50_ENG2D_OPERATION_FORMATS 0x060001c000608000ULL
 
 #define NOUVEAU_DRIVER 0x50
-#include "nv50_blit.h"
+#include "nv50/nv50_blit.h"
 
 static INLINE uint8_t
 nv50_2d_format(enum pipe_format format, boolean dst, boolean dst_src_equal)
@@ -1351,5 +1351,3 @@ nv50_init_surface_functions(struct nv50_context *nv50)
    pipe->clear_render_target = nv50_clear_render_target;
    pipe->clear_depth_stencil = nv50_clear_depth_stencil;
 }
-
-

src/gallium/drivers/nv50/nv50_tex.c → src/gallium/drivers/nouveau/nv50/nv50_tex.c

@@ -20,10 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "nv50_context.h"
-#include "nv50_resource.h"
-#include "nv50_texture.xml.h"
-#include "nv50_defs.xml.h"
+#include "nv50/nv50_context.h"
+#include "nv50/nv50_resource.h"
+#include "nv50/nv50_texture.xml.h"
+#include "nv50/nv50_defs.xml.h"
 
 #include "util/u_format.h"