Permalink
Browse files

Take out GRIFFIN macro hacks

  • Loading branch information...
1 parent a4850c1 commit 627c30b10cc748061cc1757082c42d553bb78500 @twinaphex twinaphex committed Jul 18, 2013
Showing with 0 additions and 134 deletions.
  1. +0 −91 driver_funcs.h
  2. +0 −5 gfx/gl_common.h
  3. +0 −38 griffin/hook_context.h
View
91 driver_funcs.h
@@ -28,8 +28,6 @@
#define audio_write_avail_func() driver.audio->write_avail(driver.audio_data)
#define audio_buffer_size_func() driver.audio->buffer_size(driver.audio_data)
-#if !defined(RARCH_CONSOLE) /* Normal */
-
#define video_init_func(video_info, input, input_data) \
driver.video->init(video_info, input, input_data)
#define video_frame_func(data, width, height, pitch, msg) \
@@ -69,93 +67,4 @@ static inline bool input_key_pressed_func(int key)
return ret;
}
-#else
-
-/*============================================================
- VIDEO
- ============================================================ */
-
-#define CONCAT2(A, B) A##B
-
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) /* GL */
-#define MAKENAME_VIDEO(A) CONCAT2(gl, A)
-
-#define video_set_aspect_ratio_func(aspectratio_idx) gfx_ctx_set_aspect_ratio(driver.video_data, aspectratio_idx)
-
-#define gfx_ctx_window_has_focus() (true)
-
-#elif defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9)) /* D3D */
-#define MAKENAME_VIDEO(A) CONCAT2(xdk_d3d, A)
-
-#elif defined(XENON) /* XENON */
-#define MAKENAME_VIDEO(A) CONCAT2(xenon360_gfx, A)
-
-#define video_set_aspect_ratio_func(aspectratio_idx) gfx_ctx_set_aspect_ratio(driver.video_data, aspectratio_idx)
-
-#define gfx_ctx_window_has_focus() (true)
-
-#elif defined(GEKKO) /* Gamecube, Wii */
-#define MAKENAME_VIDEO(A) CONCAT2(gx, A)
-
-#define video_set_aspect_ratio_func(aspectratio_idx) gx_set_aspect_ratio(driver.video_data, aspectratio_idx)
-#define video_viewport_size_func(width, height) ((void)0)
-#define video_read_viewport_func(buffer) (false)
-
-//#elif defined(PSP) /* PSP1 */
-//#define MAKENAME_VIDEO(A) CONCAT2(psp, A)
-//#define video_set_aspect_ratio_func(aspectratio_idx) (true)
-
-#else /* NULL */
-#define MAKENAME_VIDEO(A) CONCAT2(nullvideo, A)
-
-#define video_set_aspect_ratio_func(aspectratio_idx) (true)
-
-#endif
-
-#define video_viewport_info_func(info) driver.video->viewport_info(driver.video_data, info)
-
-#define video_init_func(video_info, input, input_data) MAKENAME_VIDEO(_init)(video_info, input, input_data)
-#define video_frame_func(data, width, height, pitch, msg) \
- MAKENAME_VIDEO(_frame)(driver.video_data, data, width, height, pitch, msg)
-#define video_alive_func() MAKENAME_VIDEO(_alive)(driver.video_data)
-#define video_focus_func() MAKENAME_VIDEO(_focus)(driver.video_data)
-#define video_free_func() MAKENAME_VIDEO(_free)(driver.video_data)
-#define video_set_nonblock_state_func(state) MAKENAME_VIDEO(_set_nonblock_state)(driver.video_data, state)
-#define video_set_rotation_func(rotation) MAKENAME_VIDEO(_set_rotation)(driver.video_data, rotation)
-#define video_start_func() MAKENAME_VIDEO(_start)()
-#define video_set_shader_func(type, path) MAKENAME_VIDEO(_set_shader)(driver.video_data, type, path)
-#define video_xml_shader_func(path) driver.video->xml_shader(driver.video_data, path)
-
-/*============================================================
- INPUT
- ============================================================ */
-
-#if defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9)) /* D3D */
-#define MAKENAME_INPUT(A) CONCAT2(xdk, A)
-#elif defined(GEKKO) /* Gamecube, Wii */
-#define MAKENAME_INPUT(A) CONCAT2(gx, A)
-#define gfx_ctx_window_has_focus() (true)
-#elif defined(__CELLOS_LV2__) /* PS3 */
-#define MAKENAME_INPUT(A) CONCAT2(ps3, A)
-#elif defined(ANDROID) /* ANDROID */
-#define MAKENAME_INPUT(A) CONCAT2(android, A)
-#elif defined(XENON) /* XENON */
-#define MAKENAME_INPUT(A) CONCAT2(xenon360, A)
-#else
-#define MAKENAME_INPUT(A) CONCAT2(nullinput, A)
-#endif
-
-#define gfx_ctx_window_has_focus() (true)
-
-#define input_init_func() MAKENAME_INPUT(_input_init)()
-#define input_poll_func() MAKENAME_INPUT(_input_poll)(driver.input_data)
-#define input_input_state_func(retro_keybinds, port, device, index, id) \
- MAKENAME_INPUT(_input_state)(driver.input_data, retro_keybinds, port, device, index, id)
-#define input_key_pressed_func(key) MAKENAME_INPUT(_input_key_pressed)(driver.input_data, key)
-#define input_free_func() MAKENAME_INPUT(_input_free_input)(driver.input_data)
-
-#define video_overlay_interface_func(iface) driver.video->overlay_interface(driver.video_data, iface)
-
-#endif
-
#endif /* _RARCH_DRIVER_FUNCS_H */
View
5 gfx/gl_common.h
@@ -60,10 +60,6 @@
#include <GL/glext.h>
#endif
-
-#if defined(ANDROID) && defined(HAVE_GRIFFIN)
-#include "../griffin/hook_context.h"
-#else
#define context_get_video_size_func(win, height) gl->ctx_driver->get_video_size(win, height)
#define context_update_window_title_func() gl->ctx_driver->update_window_title()
#define context_destroy_func() gl->ctx_driver->destroy()
@@ -84,7 +80,6 @@
#define context_write_egl_image_func(frame, width, height, pitch, base_size, tex_index, img) \
gl->ctx_driver->write_egl_image(frame, width, height, pitch, base_size, tex_index,img)
#endif
-#endif
static inline bool gl_query_extension(const char *ext)
{
View
38 griffin/hook_context.h
@@ -1,38 +0,0 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2010-2013 - Hans-Kristian Arntzen
- * Copyright (C) 2011-2013 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#if defined(ANDROID)
-#define context_get_video_size_func(win, height) gfx_ctx_get_video_size(win, height)
-#define context_update_window_title_func() gfx_ctx_update_window_title()
-#define context_destroy_func() gfx_ctx_destroy()
-
-#define context_translate_aspect_func(width, height) (device_aspect)
-#define context_set_resize_func(width, height) gl->ctx_driver->set_resize(width, height)
-#define context_swap_buffers_func() eglSwapBuffers(g_egl_dpy, g_egl_surf)
-#define context_swap_interval_func(var) eglSwapInterval(g_egl_dpy, var)
-#define context_has_focus_func() (true)
-#define context_check_window_func(quit, resize, width, height, frame_count) gfx_ctx_check_window(quit, resize, width, height, frame_count)
-#define context_set_video_mode_func(width, height, fullscreen) gfx_ctx_set_video_mode(width, height, fullscreen)
-#define context_input_driver_func(input, input_data) gl->ctx_driver->input_driver(input, input_data)
-#endif
-
-#ifdef HAVE_EGL
-#define context_init_egl_image_buffer_func(video) gl->ctx_driver->init_egl_image_buffer(video)
-
-#define context_write_egl_image_func(frame, width, height, pitch, base_size, tex_index, img) gl->ctx_driver->write_egl_image(frame, width, height, pitch, base_size, tex_index,img)
-#endif
-
-#define context_post_render_func(gl) ((void)0)

0 comments on commit 627c30b

Please sign in to comment.