Move image files to gfx/image/

Makefile

@@ -33,7 +33,7 @@ OBJ = frontend/frontend.o \
 		gfx/scaler/pixconv.o \
 		gfx/scaler/scaler_int.o \
 		gfx/scaler/filter.o \
-		gfx/image.o \
+		gfx/image/image.o \
 		gfx/fonts/fonts.o \
 		gfx/fonts/bitmapfont.o \
 		audio/resampler.o \

Makefile.emscripten

@@ -35,7 +35,7 @@ OBJ = frontend/platform/platform_emscripten.o \
 		gfx/shader_parse.o \
 		gfx/fonts/fonts.o \
 		gfx/fonts/bitmapfont.o \
-		gfx/image.o \
+		gfx/image/image.o \
 		audio/resampler.o \
 		audio/sinc.o \
 		audio/null.o \

Makefile.win

@@ -40,7 +40,7 @@ OBJ = frontend/frontend.o \
 		gfx/shader_parse.o \
 		gfx/fonts/fonts.o \
 		gfx/fonts/bitmapfont.o \
-		gfx/image.o \
+		gfx/image/image.o \
 		audio/resampler.o \
 		audio/sinc.o \
 		performance.o

driver.h

@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "msvc/msvc_compat.h"
 #include "gfx/scaler/scaler.h"
-#include "gfx/image.h"
+#include "gfx/image/image.h"
 #include "input/overlay.h"
 
 #ifdef HAVE_CONFIG_H

gfx/context/androidegl_ctx.c

@@ -22,7 +22,7 @@
 #include <EGL/egl.h>
 
 #include "../../frontend/platform/platform_android.h"
-#include "../image.h"
+#include "../image/image.h"
 
 #include "../fonts/gl_font.h"
 #include <stdint.h>

gfx/context/apple_gl_ctx.c

@@ -17,7 +17,7 @@
 #include "../../driver.h"
 #include "../gfx_common.h"
 #include "../gl_common.h"
-#include "../image.h"
+#include "../image/image.h"
 
 #include "../fonts/gl_font.h"
 #include <stdint.h>

gfx/context/bbqnx_ctx.c

@@ -27,7 +27,7 @@
 #include <sys/platform.h>
 #include <GLES2/gl2.h>
 
-#include "../image.h"
+#include "../image/image.h"
 
 #include "../fonts/gl_font.h"
 #include <stdint.h>

gfx/context/ps3_ctx.c

@@ -37,7 +37,6 @@
 #endif
 
 #include "../gl_common.h"
-#include "../image.h"
 
 #include "../gfx_context.h"
 #include "../fonts/gl_font.h"

gfx/context/x11_common.c

@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
-#include "../image.h"
+#include "../image/image.h"
 #include "../../general.h"
 #include "../../input/input_common.h"
 #include "../../input/keyboard_line.h"

gfx/gl.c

@@ -22,7 +22,7 @@
 #include "../driver.h"
 #include "../performance.h"
 #include "scaler/scaler.h"
-#include "image.h"
+#include "image/image.h"
 #include "../file.h"
 
 #include <stdint.h>

gfx/image/image.c

@@ -14,17 +14,17 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
 #include "image.h"
-#include "../file.h"
+#include "../../file.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
-#include "../general.h"
+#include "../../general.h"
-#include "rpng/rpng.h"
+#include "../rpng/rpng.h"
 
 #ifdef HAVE_SDL_IMAGE
 

gfx/image/image.h

@@ -17,11 +17,11 @@
 #define __RARCH_IMAGE_H
 
 #include <stdint.h>
-#include "../boolean.h"
+#include "../../boolean.h"
 
 #ifdef _XBOX1
 #include <xtl.h>
-#include "../xdk/xdk_defines.h"
+#include "../../xdk/xdk_defines.h"
 #endif
 
 struct texture_image

gfx/image/image_ps3.c

@@ -15,17 +15,17 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
-#include "../gfx/image.h"
+#include "image.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
-#include "../general.h"
+#include "../../general.h"
 
-#include "sdk_defines.h"
+#include "../../ps3/sdk_defines.h"
 
 #ifdef __PSL1GHT__
 #include <ppu-asm.h>

gfx/image/image_xdk1.c

@@ -14,8 +14,8 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../gfx/image.h"
+#include "image.h"
-#include "xdk_d3d.h"
+#include "../../xdk/xdk_d3d.h"
 
 bool texture_image_load(const char *path, struct texture_image *out_img)
 {
@@ -62,4 +62,3 @@ void texture_image_free(struct texture_image *img)
       img->pixels->Release();
    memset(img, 0, sizeof(*img));
 }
-

gfx/shader_cg.c

@@ -26,7 +26,7 @@
 #include <string.h>
 #include "../compat/strl.h"
 #include "../conf/config_file.h"
-#include "image.h"
+#include "image/image.h"
 #include "../dynamic.h"
 #include "../compat/posix_string.h"
 #include "../file.h"

gfx/shader_glsl.c

@@ -55,7 +55,7 @@
 #include <stdlib.h>
 
 #include "gl_common.h"
-#include "image.h"
+#include "image/image.h"
 
 #ifdef HAVE_OPENGLES2
 #define BORDER_FUNC GL_CLAMP_TO_EDGE

griffin/griffin.c

@@ -159,11 +159,11 @@ VIDEO IMAGE
 ============================================================ */
 
 #if defined(__CELLOS_LV2__)
-#include "../ps3/image.c"
+#include "../gfx/image/image_ps3.c"
 #elif defined(_XBOX1)
-#include "../xdk/image.c"
+#include "../gfx/image/image_xdk1.c"
 #else
-#include "../gfx/image.c"
+#include "../gfx/image/image.c"
 #endif
 
 #if defined(WANT_RPNG) || defined(RARCH_MOBILE)

input/overlay.c

@@ -17,7 +17,7 @@
 #include "../general.h"
 #include "../driver.h"
 #include "../libretro.h"
-#include "../gfx/image.h"
+#include "../gfx/image/image.h"
 #include "../conf/config_file.h"
 #include "../compat/posix_string.h"
 #include "input_common.h"

xdk/xdk_d3d.h

@@ -21,7 +21,7 @@
 #ifdef _XBOX1
 #include <xfont.h>
 #endif
-#include "../gfx/image.h"
+#include "../gfx/image/image.h"
 #include "../gfx/fonts/d3d_font.h"
 
 #include "../gfx/gfx_context.h"