nv2a: Remove nv2a_ prefix on files in nv2a dir

hw/xbox/nv2a/Makefile.objs

@@ -1,26 +1,24 @@
-obj-y += lru.o
-obj-y += swizzle.o
-
 obj-y += nv2a.o
-obj-y += nv2a_debug.o
-obj-y += nv2a_pbus.o
-obj-y += nv2a_pcrtc.o
-obj-y += nv2a_pfb.o
-obj-y += nv2a_pfifo.o
-obj-y += nv2a_pgraph.o
-obj-y += nv2a_pmc.o
-obj-y += nv2a_pramdac.o
-obj-y += nv2a_prmcio.o
-obj-y += nv2a_prmvio.o
-obj-y += nv2a_psh.o
-obj-y += nv2a_ptimer.o
-obj-y += nv2a_pvideo.o
-obj-y += nv2a_shaders.o
-obj-y += nv2a_stubs.o
-obj-y += nv2a_user.o
-obj-y += nv2a_vsh.o
+obj-y += debug.o
+obj-y += pbus.o
+obj-y += pcrtc.o
+obj-y += pfb.o
+obj-y += pfifo.o
+obj-y += pgraph.o
+obj-y += pmc.o
+obj-y += pramdac.o
+obj-y += prmcio.o
+obj-y += prmvio.o
+obj-y += psh.o
+obj-y += ptimer.o
+obj-y += pvideo.o
+obj-y += shaders.o
+obj-y += stubs.o
+obj-y += user.o
+obj-y += vsh.o
 
 obj-y += gl/
-
+obj-y += lru.o
+obj-y += swizzle.o
 obj-y += xxhash.o
 xxhash.o-cflags := -O3 -DXXH_FORCE_MEMORY_ACCESS=2

hw/xbox/nv2a/debug.c

@@ -18,7 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nv2a_debug.h"
+#include "debug.h"
 
 #ifdef DEBUG_NV2A_GL
 

hw/xbox/nv2a/nv2a_int.h

@@ -44,9 +44,8 @@
 #include "gl/gloffscreen.h"
 
 #include "nv2a.h"
-#include "nv2a_debug.h"
-#include "nv2a_shaders.h"
-#include "nv2a_debug.h"
+#include "debug.h"
+#include "shaders.h"
 #include "nv2a_regs.h"
 
 #define USE_TEXTURE_CACHE 1

hw/xbox/nv2a/psh.c

@@ -35,8 +35,8 @@
 
 #include "qapi/qmp/qstring.h"
 
-#include "nv2a_shaders_common.h"
-#include "nv2a_psh.h"
+#include "shaders_common.h"
+#include "psh.h"
 
 /*
  * This implements translation of register combiners into glsl

hw/xbox/nv2a/shaders.c

@@ -21,8 +21,9 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "nv2a_shaders_common.h"
-#include "nv2a_shaders.h"
+
+#include "shaders_common.h"
+#include "shaders.h"
 
 void qstring_append_fmt(QString *qstring, const char *fmt, ...)
 {

hw/xbox/nv2a/shaders.h

@@ -24,9 +24,9 @@
 #include "qapi/qmp/qstring.h"
 #include "gl/gloffscreen.h"
 
-#include "nv2a_vsh.h"
-#include "nv2a_psh.h"
 #include "nv2a_regs.h"
+#include "vsh.h"
+#include "psh.h"
 
 enum ShaderPrimitiveMode {
     PRIM_TYPE_NONE,

hw/xbox/nv2a/shaders_common.h

@@ -21,7 +21,7 @@
 #ifndef HW_NV2A_SHADERS_COMMON_H
 #define HW_NV2A_SHADERS_COMMON_H
 
-#include "nv2a_debug.h"
+#include "debug.h"
 
 #define STRUCT_VERTEX_DATA "struct VertexData {\n" \
                            "  float inv_w;\n" \