CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 22:38:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename gl_font.c and d3d_font.c

Browse Source
This commit is contained in:
twinaphex 2015-01-12 23:19:21 +01:00
parent 6cdaa4e282
commit 09b25e54c5
14 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -376,7 +376,7 @@ ifeq ($(HAVE_OPENGL), 1)
gfx/gl_common.o \
gfx/video_context_driver.o \
gfx/drivers_context/gfx_null_ctx.o \
gfx/fonts/gl_font.o \
gfx/font_gl_driver.o \
gfx/fonts/gl_raster_font.o \
libretro-sdk/gfx/math/matrix_4x4.o \
gfx/video_state_tracker.o \
@ -512,7 +512,7 @@ ifeq ($(HAVE_D3D9), 1)
OBJ += gfx/d3d/d3d.o \
gfx/d3d/render_chain.o \
gfx/d3d/d3d_wrapper.o \
gfx/fonts/d3d_font.o \
gfx/font_d3d_driver.o \
gfx/fonts/d3d_w32_font.o \
gfx/drivers_context/d3d_ctx.o
DEFINES += -DHAVE_WIN32_D3D9

2
gfx/d3d/d3d.h
View File

@ -49,7 +49,7 @@
#include "../video_shader_driver.h"
#endif
#include "../fonts/d3d_font.h"
#include "../font_d3d_driver.h"
#include "../video_context_driver.h"
#include "../gfx_common.h"

1
gfx/drivers_context/bbqnx_ctx.c
View File

@ -29,7 +29,6 @@
#include "../image/image.h"
#include "../fonts/gl_font.h"
#include <stdint.h>
#ifdef HAVE_GLSL

4
gfx/fonts/d3d_font.c → gfx/font_d3d_driver.c
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "d3d_font.h"
#include "../../general.h"
#include "font_d3d_driver.h"
#include "../general.h"
static const d3d_font_renderer_t *d3d_font_backends[] = {
#if defined(_XBOX1)

6
gfx/fonts/d3d_font.h → gfx/font_d3d_driver.h
View File

@ -14,12 +14,12 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef D3D_FONT_H__
#define D3D_FONT_H__
#ifndef __FONT_D3D_DRIVER_H__
#define __FONT_D3D_DRIVER_H__
#include <stdint.h>
#include <boolean.h>
#include "../../driver.h"
#include "../driver.h"
#ifdef __cplusplus
extern "C" {

4
gfx/fonts/gl_font.c → gfx/font_gl_driver.c
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "gl_font.h"
#include "../../general.h"
#include "font_gl_driver.h"
#include "../general.h"
static const gl_font_renderer_t *gl_font_backends[] = {
#if defined(HAVE_LIBDBGFONT)

7
gfx/fonts/gl_font.h → gfx/font_gl_driver.h
View File

@ -14,10 +14,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GL_FONT_H__
#define GL_FONT_H__
#ifndef __FONT_GL_DRIVER_H__
#define __FONT_GL_DRIVER_H__
#include "../../driver.h"
#include "../driver.h"
#include <boolean.h>
struct font_glyph;
@ -41,4 +41,3 @@ bool gl_font_init_first(const gl_font_renderer_t **font_driver,
const char *font_path, float font_size);
#endif

2
gfx/fonts/d3d_w32_font.cpp
View File

@ -15,7 +15,7 @@
*/
#include "../d3d/d3d.h"
#include "d3d_font.h"
#include "../font_d3d_driver.h"
#include "../gfx_common.h"
#include "../../general.h"

1
gfx/fonts/fonts.c
View File

@ -64,4 +64,3 @@ bool font_renderer_create_default(
*handle = NULL;
return false;
}

2
gfx/fonts/xdk1_xfonts.c
View File

@ -15,7 +15,7 @@
*/
#include <xtl.h>
#include "d3d_font.h"
#include "../font_d3d_driver.h"
#include "../gfx_common.h"
#include "../../general.h"

2
gfx/fonts/xdk360_fonts.cpp
View File

@ -15,7 +15,7 @@
*/
#include <xtl.h>
#include "d3d_font.h"
#include "../font_d3d_driver.h"
#include "../d3d/d3d.h"
#include "../gfx_common.h"
#include "../../general.h"

2
gfx/gl_common.h
View File

@ -21,7 +21,7 @@
#include "fonts/fonts.h"
#include <gfx/math/matrix_4x4.h>
#include <gfx/scaler/scaler.h>
#include "fonts/gl_font.h"
#include "font_gl_driver.h"
#include "image/image.h"
#include "video_shader_driver.h"

2
gfx/video_thread_wrapper.h
View File

@ -21,7 +21,7 @@
#include "../general.h"
#include <boolean.h>
#include <rthreads/rthreads.h>
#include "fonts/gl_font.h"
#include "font_gl_driver.h"
enum thread_cmd
{

4
griffin/griffin.c
View File

@ -249,11 +249,11 @@ FONTS
#endif
#ifdef HAVE_OPENGL
#include "../gfx/fonts/gl_font.c"
#include "../gfx/font_gl_driver.c"
#endif
#if defined(_XBOX) || defined(HAVE_WIN32_D3D9)
#include "../gfx/fonts/d3d_font.c"
#include "../gfx/font_d3d_driver.c"
#endif
#if defined(HAVE_WIN32_D3D9)