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

Fix d3d9_cg_renderchain.cpp

Browse Source
This commit is contained in:
twinaphex 2017-09-05 03:27:00 +02:00
parent 374b6115e1
commit 3eecbd7135
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/drivers/d3d.h
View File

@ -55,7 +55,6 @@ typedef struct
void *vert_buf;
} overlay_t;
#if defined(HAVE_D3D9) || defined(HAVE_D3D8)
typedef struct Vertex
{
float x, y;
@ -65,7 +64,6 @@ typedef struct Vertex
#endif
float u, v;
} Vertex;
#endif
typedef struct d3d_video
{

16
gfx/drivers_renderchain/d3d9_cg_renderchain.cpp
View File

@ -52,7 +52,7 @@ namespace
bool smooth;
};
struct Vertex
struct CGVertex
{
float x, y, z;
float u, v;
@ -461,7 +461,7 @@ static void renderchain_bind_orig(cg_renderchain_t *chain, void *pass_data)
index = pass->attrib_map[cgGetParameterResourceIndex(param)];
d3d_set_stream_source(chain->dev, index, vert_buf, 0, sizeof(Vertex));
d3d_set_stream_source(chain->dev, index, vert_buf, 0, sizeof(CGVertex));
chain->bound_vert.push_back(index);
}
}
@ -536,7 +536,7 @@ static void renderchain_bind_prev(void *data, void *pass_data)
index = pass->attrib_map[cgGetParameterResourceIndex(param)];
d3d_set_stream_source(chain->dev, index, vert_buf, 0, sizeof(Vertex));
d3d_set_stream_source(chain->dev, index, vert_buf, 0, sizeof(CGVertex));
chain->bound_vert.push_back(index);
}
}
@ -615,7 +615,7 @@ static void renderchain_bind_pass(cg_renderchain_t *chain,
index = pass->attrib_map[cgGetParameterResourceIndex(param)];
d3d_set_stream_source(chain->dev, index, chain->passes[i].vertex_buf,
0, sizeof(Vertex));
0, sizeof(CGVertex));
chain->bound_vert.push_back(index);
}
}
@ -813,7 +813,7 @@ static bool renderchain_create_first_pass(cg_renderchain_t *chain,
chain->prev.last_width[i] = 0;
chain->prev.last_height[i] = 0;
chain->prev.vertex_buf[i] = d3d_vertex_buffer_new(
chain->dev, 4 * sizeof(Vertex), 0, 0, D3DPOOL_DEFAULT, NULL);
chain->dev, 4 * sizeof(CGVertex), 0, 0, D3DPOOL_DEFAULT, NULL);
if (!chain->prev.vertex_buf[i])
return false;
@ -1039,7 +1039,7 @@ static bool cg_d3d9_renderchain_add_pass(
if (!cg_d3d9_renderchain_init_shader_fvf(chain, &pass))
return false;
pass.vertex_buf = d3d_vertex_buffer_new(chain->dev, 4 * sizeof(Vertex),
pass.vertex_buf = d3d_vertex_buffer_new(chain->dev, 4 * sizeof(CGVertex),
0, 0, D3DPOOL_DEFAULT, NULL);
if (!pass.vertex_buf)
@ -1174,7 +1174,7 @@ static void renderchain_set_vertices(
if (pass->last_width != width || pass->last_height != height)
{
Vertex vert[4];
CGVertex vert[4];
unsigned i;
void *verts = NULL;
float _u = float(width) / info->tex_w;
@ -1330,7 +1330,7 @@ static void renderchain_render_pass(
d3d_set_vertex_declaration(chain->dev, pass->vertex_decl);
for (i = 0; i < 4; i++)
d3d_set_stream_source(chain->dev, i,
pass->vertex_buf, 0, sizeof(Vertex));
pass->vertex_buf, 0, sizeof(CGVertex));
/* Set orig texture. */
renderchain_bind_orig(chain, pass);