mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move D3D9_DECL_FVF_TEXCOORD to d3d9_common.h

Browse Source
This commit is contained in:
twinaphex 2018-05-14 03:17:26 +02:00
parent 86c7e7c69f
commit d1c1e4e2aa
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/common/d3d9_common.h
View File

@ -27,6 +27,10 @@
#include "../video_driver.h" #include "../video_driver.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#define D3D9_DECL_FVF_TEXCOORD(stream, offset, index) \
{ (WORD)(stream), (WORD)(offset * sizeof(float)), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, \
D3DDECLUSAGE_TEXCOORD, (BYTE)(index) }
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
typedef struct d3d9_video d3d9_video_t; typedef struct d3d9_video d3d9_video_t;

9
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -290,9 +290,6 @@ static void d3d9_cg_renderchain_set_shader_params(
set_cg_param(pass->vPrg, "IN.frame_count", frame_cnt); set_cg_param(pass->vPrg, "IN.frame_count", frame_cnt);
} }
#define DECL_FVF_TEXCOORD(stream, offset, index) \
{ (WORD)(stream), (WORD)(offset * sizeof(float)), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, \
D3DDECLUSAGE_TEXCOORD, (BYTE)(index) }
#define DECL_FVF_COLOR(stream, offset, index) \ #define DECL_FVF_COLOR(stream, offset, index) \
{ (WORD)(stream), (WORD)(offset * sizeof(float)), D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, \ { (WORD)(stream), (WORD)(offset * sizeof(float)), D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, \
D3DDECLUSAGE_COLOR, (BYTE)(index) } \ D3DDECLUSAGE_COLOR, (BYTE)(index) } \
@ -362,7 +359,7 @@ static bool d3d9_cg_renderchain_init_shader_fvf(void *data, void *pass_data)
if (param) if (param)
{ {
static const D3DVERTEXELEMENT9 tex_coord0 = DECL_FVF_TEXCOORD(1, 3, 0); static const D3DVERTEXELEMENT9 tex_coord0 = D3D9_DECL_FVF_TEXCOORD(1, 3, 0);
stream_taken[1] = true; stream_taken[1] = true;
texcoord0_taken = true; texcoord0_taken = true;
RARCH_LOG("[D3D9 Cg]: FVF TEXCOORD0 semantic found.\n"); RARCH_LOG("[D3D9 Cg]: FVF TEXCOORD0 semantic found.\n");
@ -374,7 +371,7 @@ static bool d3d9_cg_renderchain_init_shader_fvf(void *data, void *pass_data)
param = d3d9_cg_find_param_from_semantic(cgGetFirstParameter(pass->vPrg, CG_PROGRAM), "TEXCOORD1"); param = d3d9_cg_find_param_from_semantic(cgGetFirstParameter(pass->vPrg, CG_PROGRAM), "TEXCOORD1");
if (param) if (param)
{ {
static const D3DVERTEXELEMENT9 tex_coord1 = DECL_FVF_TEXCOORD(2, 5, 1); static const D3DVERTEXELEMENT9 tex_coord1 = D3D9_DECL_FVF_TEXCOORD(2, 5, 1);
stream_taken[2] = true; stream_taken[2] = true;
texcoord1_taken = true; texcoord1_taken = true;
RARCH_LOG("[D3D9 Cg]: FVF TEXCOORD1 semantic found.\n"); RARCH_LOG("[D3D9 Cg]: FVF TEXCOORD1 semantic found.\n");
@ -418,7 +415,7 @@ static bool d3d9_cg_renderchain_init_shader_fvf(void *data, void *pass_data)
unsigned_vector_list_append(pass->attrib_map, 0); unsigned_vector_list_append(pass->attrib_map, 0);
else else
{ {
D3DVERTEXELEMENT9 elem = DECL_FVF_TEXCOORD(index, 3, tex_index); D3DVERTEXELEMENT9 elem = D3D9_DECL_FVF_TEXCOORD(index, 3, tex_index);
unsigned_vector_list_append(pass->attrib_map, index); unsigned_vector_list_append(pass->attrib_map, index);

2
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -71,7 +71,7 @@ static bool hlsl_d3d9_renderchain_init_shader_fvf(LPDIRECT3DDEVICE9 dev,
static const D3DVERTEXELEMENT9 VertexElements[] = static const D3DVERTEXELEMENT9 VertexElements[] =
{ {
{ 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, { 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
{ 0, 2 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 }, D3D9_DECL_FVF_TEXCOORD(0, 2, 0),
D3DDECL_END() D3DDECL_END()
}; };