From 32c92a9a22b584fa5123b2febb38cfe55de416ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 23 Apr 2018 15:04:19 +0200 Subject: [PATCH] Rename d3dxbuffer_release --- gfx/common/d3d9_common.c | 2 +- gfx/common/d3d9_common.h | 2 +- gfx/drivers_font/xdk360_fonts.cpp | 6 +++--- gfx/drivers_shader/shader_hlsl.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c index cc0ae1739a..61876b4c5a 100644 --- a/gfx/common/d3d9_common.c +++ b/gfx/common/d3d9_common.c @@ -502,7 +502,7 @@ bool d3d9x_create_font_indirect(void *_dev, return false; } -void d3dxbuffer_release(void *data) +void d3d9x_buffer_release(void *data) { #ifdef HAVE_D3DX LPD3DXBUFFER p = (LPD3DXBUFFER)data; diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h index 6709636932..1873a49161 100644 --- a/gfx/common/d3d9_common.h +++ b/gfx/common/d3d9_common.h @@ -598,7 +598,7 @@ void d3d9x_font_draw_text(void *data, void *sprite_data, void *string_data, void d3d9x_font_get_text_metrics(void *data, void *metrics); -void d3dxbuffer_release(void *data); +void d3d9x_buffer_release(void *data); void d3d9x_font_release(void *data); diff --git a/gfx/drivers_font/xdk360_fonts.cpp b/gfx/drivers_font/xdk360_fonts.cpp index 71d0b82fbd..71da31402f 100644 --- a/gfx/drivers_font/xdk360_fonts.cpp +++ b/gfx/drivers_font/xdk360_fonts.cpp @@ -451,7 +451,7 @@ static bool xdk360_video_font_create_shaders(xdk360_video_font_t * font, void *d (void**)&font->s_FontLocals.m_pFontVertexShader )) goto error; - d3dxbuffer_release(pShaderCode); + d3d9x_buffer_release(pShaderCode); if (!d3dx_compile_shader(font_hlsl_d3d9_program, sizeof(font_hlsl_d3d9_program)-1 , NULL, NULL, "main_fragment", "ps.2.0", 0,&pShaderCode, NULL, NULL )) @@ -461,13 +461,13 @@ static bool xdk360_video_font_create_shaders(xdk360_video_font_t * font, void *d (void**)&font->s_FontLocals.m_pFontPixelShader)) goto error; - d3dxbuffer_release(pShaderCode); + d3d9x_buffer_release(pShaderCode); return true; error: if (pShaderCode) - d3dxbuffer_release(pShaderCode); + d3d9x_buffer_release(pShaderCode); d3d9_free_pixel_shader(font->d3d->dev, font->s_FontLocals.m_pFontPixelShader); d3d9_free_vertex_shader(font->d3d->dev, font->s_FontLocals.m_pFontVertexShader); d3d9_vertex_declaration_free(font->s_FontLocals.m_pFontVertexDecl); diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c index 2b73a92f89..77fe7ff883 100644 --- a/gfx/drivers_shader/shader_hlsl.c +++ b/gfx/drivers_shader/shader_hlsl.c @@ -273,8 +273,8 @@ static bool hlsl_compile_program( d3d_create_pixel_shader(d3dr, (const DWORD*)d3dx_get_buffer_ptr(code_f), (void**)&program->fprg); d3d_create_vertex_shader(d3dr, (const DWORD*)d3dx_get_buffer_ptr(code_v), (void**)&program->vprg); - d3dxbuffer_release((void*)code_f); - d3dxbuffer_release((void*)code_v); + d3d9x_buffer_release((void*)code_f); + d3d9x_buffer_release((void*)code_v); return true; @@ -284,8 +284,8 @@ error: RARCH_ERR("Fragment:\n%s\n", (char*)d3dx_get_buffer_ptr(listing_f)); if (listing_v) RARCH_ERR("Vertex:\n%s\n", (char*)d3dx_get_buffer_ptr(listing_v)); - d3dxbuffer_release((void*)listing_f); - d3dxbuffer_release((void*)listing_v); + d3d9x_buffer_release((void*)listing_f); + d3d9x_buffer_release((void*)listing_v); return false; }