vk: rename vk_textures to r_textures

ref/vk/infotool.c

@@ -1,7 +1,7 @@
 #include "camera.h"
 #include "vk_math.h"
 #include "vk_common.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_brush.h"
 #include "vk_light.h"
 

ref/vk/r_textures.c

@@ -1,4 +1,4 @@
-#include "vk_textures.h"
+#include "r_textures.h"
 
 #include "vk_common.h"
 #include "vk_core.h"

ref/vk/vk_beams.c

@@ -3,7 +3,7 @@
 #include "camera.h"
 #include "vk_render.h"
 #include "vk_geometry.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_sprite.h"
 #include "vk_scene.h"
 #include "vk_math.h"

ref/vk/vk_brush.c

@@ -6,7 +6,7 @@
 #include "vk_pipeline.h"
 #include "vk_framectl.h"
 #include "vk_math.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_lightmap.h"
 #include "vk_scene.h"
 #include "vk_render.h"

ref/vk/vk_core.c

@@ -1,7 +1,7 @@
 #include "vk_core.h"
 
 #include "vk_common.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_overlay.h"
 #include "vk_renderstate.h"
 #include "vk_staging.h"

ref/vk/vk_light.c

@@ -1,7 +1,7 @@
 #include "vk_light.h"
 #include "vk_buffer.h"
 #include "vk_mapents.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_lightmap.h"
 #include "vk_cvar.h"
 #include "vk_common.h"

ref/vk/vk_lightmap.c

@@ -1,6 +1,6 @@
 #include "vk_lightmap.h"
 #include "vk_common.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_cvar.h"
 
 #include "com_strings.h"

ref/vk/vk_mapents.c

@@ -1,7 +1,7 @@
 #include "vk_common.h"
 #include "vk_mapents.h"
 #include "vk_core.h" // TODO we need only pool from there, not the entire vulkan garbage
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_logs.h"
 
 #include "eiface.h" // ARRAYSIZE

ref/vk/vk_materials.c

@@ -1,5 +1,5 @@
 #include "vk_materials.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_mapents.h"
 #include "vk_const.h"
 #include "profiler.h"

ref/vk/vk_overlay.c

@@ -3,7 +3,7 @@
 #include "vk_buffer.h"
 #include "vk_core.h"
 #include "vk_common.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_framectl.h"
 #include "vk_renderstate.h"
 #include "vk_pipeline.h"

ref/vk/vk_ray_model.c

@@ -1,7 +1,7 @@
 #include "vk_ray_internal.h"
 
 #include "vk_rtx.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_materials.h"
 #include "vk_geometry.h"
 #include "vk_render.h"

ref/vk/vk_render.c

@@ -7,7 +7,7 @@
 #include "vk_const.h"
 #include "vk_common.h"
 #include "vk_pipeline.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_math.h"
 #include "vk_rtx.h"
 #include "vk_descriptor.h"

ref/vk/vk_rmain.c

@@ -1,7 +1,7 @@
 #include "vk_core.h"
 #include "vk_cvar.h"
 #include "vk_common.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_renderstate.h"
 #include "vk_overlay.h"
 #include "vk_scene.h"

ref/vk/vk_rpart.c

@@ -16,7 +16,7 @@ GNU General Public License for more details.
 #include "vk_rpart.h"
 #include "vk_triapi.h"
 #include "camera.h"
-#include "vk_textures.h" // tglob.particleTexture
+#include "r_textures.h" // tglob.particleTexture
 #include "vk_common.h"
 #include "vk_sprite.h" // R_GetSpriteTexture
 

ref/vk/vk_rtx.c

@@ -14,7 +14,7 @@
 #include "vk_pipeline.h"
 #include "vk_ray_internal.h"
 #include "vk_staging.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_combuf.h"
 #include "vk_logs.h"
 

ref/vk/vk_scene.c

@@ -13,7 +13,7 @@
 #include "vk_beams.h"
 #include "vk_light.h"
 #include "vk_rtx.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_cvar.h"
 #include "vk_materials.h"
 #include "camera.h"
@@ -257,7 +257,7 @@ void R_NewMap( void ) {
 
 	// Make sure that we're not rendering anything before starting to mess with GPU objects
 	XVK_CHECK(vkDeviceWaitIdle(vk_core.device));
-R_TextureSetupSky( gEngine.pfnGetMoveVars()->skyName );
+	R_TextureSetupSky( gEngine.pfnGetMoveVars()->skyName );
 
 	loadMap(map);
 

ref/vk/vk_sprite.c

@@ -1,5 +1,5 @@
 #include "vk_sprite.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "camera.h"
 #include "vk_render.h"
 #include "vk_geometry.h"

ref/vk/vk_studio.c

@@ -1,7 +1,7 @@
 #include "vk_studio.h"
 #include "com_model.h"
 #include "vk_common.h"
-#include "vk_textures.h"
+#include "r_textures.h"
 #include "vk_render.h"
 #include "vk_geometry.h"
 #include "vk_renderstate.h"

ref/vk/vk_triapi.c

@@ -4,8 +4,6 @@
 #include "vk_sprite.h" // R_GetSpriteTexture
 #include "vk_logs.h"
 
-#include "vk_textures.h" // FIXME temp
-
 #include "xash3d_mathlib.h"
 
 #define MAX_TRIAPI_VERTICES 1024