From bde5a6dc19ef60b95a2d04456ea184ea8178cede Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 5 Sep 2017 04:21:40 +0200 Subject: [PATCH] Rename renderchain_driver_t to d3d_renderchain_driver_t --- gfx/drivers/d3d.h | 2 +- gfx/drivers_renderchain/d3d8_renderchain.cpp | 2 +- gfx/drivers_renderchain/d3d9_cg_renderchain.cpp | 2 +- gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp | 2 +- gfx/drivers_renderchain/null_renderchain.c | 2 +- gfx/video_driver.c | 4 ++-- gfx/video_driver.h | 14 +++++++------- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gfx/drivers/d3d.h b/gfx/drivers/d3d.h index 882d24b296..91a14167bd 100644 --- a/gfx/drivers/d3d.h +++ b/gfx/drivers/d3d.h @@ -97,7 +97,7 @@ typedef struct d3d_video #if defined(HAVE_MENU) overlay_t *menu; #endif - const renderchain_driver_t *renderchain_driver; + const d3d_renderchain_driver_t *renderchain_driver; void *renderchain_data; /* TODO - refactor this away properly. */ diff --git a/gfx/drivers_renderchain/d3d8_renderchain.cpp b/gfx/drivers_renderchain/d3d8_renderchain.cpp index 0a86eb46a7..0c58b52a84 100644 --- a/gfx/drivers_renderchain/d3d8_renderchain.cpp +++ b/gfx/drivers_renderchain/d3d8_renderchain.cpp @@ -384,7 +384,7 @@ static void d3d8_renderchain_viewport_info(void *data, struct video_viewport *vp vp->full_height = height; } -renderchain_driver_t d3d8_d3d_renderchain = { +d3d_renderchain_driver_t d3d8_d3d_renderchain = { d3d8_renderchain_free, d3d8_renderchain_new, d3d8_renderchain_reinit, diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp b/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp index 267658bae5..22c6d849e8 100644 --- a/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp +++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp @@ -1629,7 +1629,7 @@ static void d3d9_cg_renderchain_viewport_info( vp->full_height = height; } -renderchain_driver_t cg_d3d9_renderchain = { +d3d_renderchain_driver_t cg_d3d9_renderchain = { d3d9_cg_renderchain_free, d3d9_cg_renderchain_new, NULL, diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp index 0971d5b3b7..d89a681cf1 100644 --- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp +++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp @@ -473,7 +473,7 @@ static void hlsl_d3d9_renderchain_viewport_info(void *data, struct video_viewpor vp->full_height = height; } -renderchain_driver_t hlsl_d3d9_renderchain = { +d3d_renderchain_driver_t hlsl_d3d9_renderchain = { hlsl_d3d9_renderchain_free, hlsl_d3d9_renderchain_new, hlsl_d3d9_renderchain_reinit, diff --git a/gfx/drivers_renderchain/null_renderchain.c b/gfx/drivers_renderchain/null_renderchain.c index a9ccdaf7cb..2bad39d720 100644 --- a/gfx/drivers_renderchain/null_renderchain.c +++ b/gfx/drivers_renderchain/null_renderchain.c @@ -118,7 +118,7 @@ static void null_renderchain_convert_geometry( (void)final_viewport_data; } -renderchain_driver_t null_renderchain = { +d3d_renderchain_driver_t null_renderchain = { null_renderchain_free, null_renderchain_new, NULL, diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 716d2b7baf..fddfa8740c 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -391,7 +391,7 @@ static const shader_backend_t *shader_ctx_drivers[] = { NULL }; -static const renderchain_driver_t *renderchain_drivers[] = { +static const d3d_renderchain_driver_t *renderchain_drivers[] = { #if defined(_WIN32) && defined(HAVE_D3D9) && defined(HAVE_CG) &cg_d3d9_renderchain, #endif @@ -3381,7 +3381,7 @@ bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap) return true; } -bool renderchain_init_first(const renderchain_driver_t **renderchain_driver, +bool renderchain_init_first(const d3d_renderchain_driver_t **renderchain_driver, void **renderchain_handle) { unsigned i; diff --git a/gfx/video_driver.h b/gfx/video_driver.h index 31e9a4f2d4..7ba151cc35 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -793,7 +793,7 @@ typedef struct video_driver unsigned (*wrap_type_to_enum)(enum gfx_wrap_type type); } video_driver_t; -typedef struct renderchain_driver +typedef struct d3d_renderchain_driver { void (*chain_free)(void *data); void *(*chain_new)(void); @@ -821,7 +821,7 @@ typedef struct renderchain_driver bool (*read_viewport)(void *data, uint8_t *buffer, bool is_idle); void (*viewport_info)(void *data, struct video_viewport *vp); const char *ident; -} renderchain_driver_t; +} d3d_renderchain_driver_t; extern struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END]; @@ -1234,7 +1234,7 @@ bool video_shader_driver_compile_program(struct shader_program_info *program_inf bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap); -bool renderchain_init_first(const renderchain_driver_t **renderchain_driver, +bool renderchain_init_first(const d3d_renderchain_driver_t **renderchain_driver, void **renderchain_handle); extern bool (*video_driver_cb_has_focus)(void); @@ -1294,10 +1294,10 @@ extern const shader_backend_t hlsl_backend; extern const shader_backend_t gl_cg_backend; extern const shader_backend_t shader_null_backend; -extern renderchain_driver_t d3d8_renderchain; -extern renderchain_driver_t cg_d3d9_renderchain; -extern renderchain_driver_t hlsl_d3d9_renderchain; -extern renderchain_driver_t null_renderchain; +extern d3d_renderchain_driver_t d3d8_renderchain; +extern d3d_renderchain_driver_t cg_d3d9_renderchain; +extern d3d_renderchain_driver_t hlsl_d3d9_renderchain; +extern d3d_renderchain_driver_t null_renderchain; RETRO_END_DECLS